You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/09/26 20:35:15 UTC
svn commit: r1390647 [1/3] - in /airavata/sandbox/airavata-registry-rest: ./
src/main/java/org/apache/airavata/services/registry/rest/
src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/
src/main/java/org/apache/airavata/services...
Author: lahiru
Date: Wed Sep 26 18:35:14 2012
New Revision: 1390647
URL: http://svn.apache.org/viewvc?rev=1390647&view=rev
Log:
applying AIRAVATA-556.2.patch
Added:
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/Experiment.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java
- copied, changed from r1389477, airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceURLList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java
Removed:
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceURLList.java
Modified:
airavata/sandbox/airavata-registry-rest/README.txt
airavata/sandbox/airavata-registry-rest/pom.xml
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/User.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resources/RegistryApplication.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resources/RegistryResource.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/security/AuthenticationFilter.java
airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java
airavata/sandbox/airavata-registry-rest/src/main/resources/ServiceMessage.xsd
airavata/sandbox/airavata-registry-rest/src/main/resources/log4j.xml
airavata/sandbox/airavata-registry-rest/src/main/resources/service.properties
airavata/sandbox/airavata-registry-rest/src/main/webapp/WEB-INF/web.xml
airavata/sandbox/airavata-registry-rest/src/main/webapp/index.jsp
airavata/sandbox/airavata-registry-rest/src/test/resources/service.properties
Modified: airavata/sandbox/airavata-registry-rest/README.txt
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/README.txt?rev=1390647&r1=1390646&r2=1390647&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/README.txt (original)
+++ airavata/sandbox/airavata-registry-rest/README.txt Wed Sep 26 18:35:14 2012
@@ -4,22 +4,6 @@ mvn clean install
For development run
mvn cargo:start
-Update Message beans
-xjc src/main/resources/ServiceMessage.xsd -p org.apache.airavata.services.message -d src/main/java/
-To build
-mvn clean install
-
-For development run
-mvn cargo:start
-
-Update Message beans
-xjc src/main/resources/ServiceMessage.xsd -p org.apache.airavata.services.message -d src/main/java/
-To build
-mvn clean install
-
-For development run
-mvn cargo:start
-
To test
* Start jackrabbit on port 8081
* for simple methods you can use curl for testing. For example, if you want to get the usename, you can run the command
Modified: airavata/sandbox/airavata-registry-rest/pom.xml
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/pom.xml?rev=1390647&r1=1390646&r2=1390647&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/pom.xml (original)
+++ airavata/sandbox/airavata-registry-rest/pom.xml Wed Sep 26 18:35:14 2012
@@ -7,13 +7,6 @@
<version>1.0-SNAPSHOT</version>
<name>airavata-registry-rest-services</name>
<build>
- <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
- <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
- <testResources>
- <testResource>
- <directory>${project.basedir}/src/test/resources</directory>
- </testResource>
- </testResources>
<finalName>airavata-registry-rest-services</finalName>
<plugins>
<plugin>
@@ -62,11 +55,6 @@
</build>
<dependencies>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.6</version>
- </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
@@ -99,11 +87,6 @@
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.3.168</version>
- </dependency>
<dependency>
@@ -124,12 +107,22 @@
<artifactId>airavata-client-api</artifactId>
<version>${airavata.version}</version>
</dependency-->
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-api</artifactId>
<version>${airavata.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-jpa-registry</artifactId>
+ <version>${airavata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-registry-service</artifactId>
+ <version>${airavata.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
<version>2.2.7</version>
@@ -166,18 +159,18 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-security</artifactId>
<version>0.5-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency-->
</dependencies>
<properties>
<jersey.version>1.13</jersey.version>
<grizzly.version>2.0.0-M3</grizzly.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
<log4j.version>1.2.16</log4j.version>
- <airavata.version>0.4-incubating</airavata.version>
+ <airavata.version>0.5-SNAPSHOT</airavata.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cargo.version>1.2.1</cargo.version>
<!-- if you want a remote debugging on a different a address override on
@@ -225,221 +218,3 @@
</repository>
</repositories>
</project>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
- the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may
- obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
- in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
- the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.airavata.services</groupId>
- <artifactId>airavata-registry-rest-services</artifactId>
- <packaging>war</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>airavata-registry-rest-services</name>
- <build>
- <finalName>airavata-registry-rest-services</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>${cargo.version}</version>
- <configuration>
- <wait>true</wait>
- <configuration>
- <properties>
- <cargo.servlet.port>9080</cargo.servlet.port>
- <cargo.tomcat.ajp.port>9009</cargo.tomcat.ajp.port>
- <cargo.rmi.port>9099</cargo.rmi.port>
- <cargo.jvmargs>
- <![CDATA[-Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend} -noverify ${javaagent}]]>
- </cargo.jvmargs>
- <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
- </properties>
- <home>${project.build.directory}/tomcat6x</home>
- <deployables>
- <deployable>
- <groupId>org.apache.airavata.services</groupId>
- <artifactId>airavata-registry-rest-services</artifactId>
- <type>war</type>
- <properties>
- <context>/airavata-services</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
- <container>
- <containerId>tomcat6x</containerId>
- <timeout>180000</timeout>
- <zipUrlInstaller>
- <url>
- http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.tar.gz
- </url>
- </zipUrlInstaller>
- <systemProperties>
-
- </systemProperties>
- </container>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- </plugins>
-
- </build>
- <dependencies>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-servlet</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.jersey-test-framework</groupId>
- <artifactId>jersey-test-framework-grizzly2</artifactId>
- <version>${jersey.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- </dependency>
-
- <!-- Airavata -->
- <!--dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-client-api</artifactId>
- <version>${airavata.version}</version> </dependency -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-registry-api</artifactId>
- <version>${airavata.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-rmi</artifactId>
- <version>2.2.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>2.2.7</version>
- </dependency>
-
- <!-- Logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <!--dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-security</artifactId>
- <version>0.5-incubating-SNAPSHOT</version> </dependency -->
- </dependencies>
- <properties>
- <jersey.version>1.13</jersey.version>
- <grizzly.version>2.0.0-M3</grizzly.version>
- <org.slf4j.version>1.6.1</org.slf4j.version>
- <log4j.version>1.2.16</log4j.version>
- <airavata.version>0.4-incubating</airavata.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cargo.version>1.2.1</cargo.version>
- <!-- if you want a remote debugging on a different a address override on
- command line with -Dcargo.debug.addres=xxxx -->
- <cargo.debug.address>8000</cargo.debug.address>
- <!-- if you want to start remote debugging session suspended override on
- command line with -Dcargo.debug.suspend=y -->
- <cargo.debug.suspend>n</cargo.debug.suspend>
- <javaagent />
- </properties>
- <repositories>
- <repository>
- <id>central</id>
- <name>Maven Central</name>
- <url>http://repo1.maven.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <name>ogce.m2.all</name>
- <id>ogce.m2.all</id>
- <url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
- <snapshots>
- <!--updatePolicy>daily</updatePolicy -->
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>m2-snapshot-repository</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>OW2</id>
- <name>OW2 Repository</name>
- <url>http://maven.ow2.org/maven2</url>
- </repository>
- </repositories>
-</project>
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/User.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/User.java?rev=1390647&r1=1390646&r2=1390647&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/User.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/User.java Wed Sep 26 18:35:14 2012
@@ -31,49 +31,3 @@ public class User {
this.password = password;
}
}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.airavata.services.registry.rest;
-
-public class User {
-
- private String userName;
- private String password;
-
- public User() {
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-}
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java?rev=1390647&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ApplicationDescriptorList.java Wed Sep 26 18:35:14 2012
@@ -0,0 +1,30 @@
+package org.apache.airavata.services.registry.rest.resourcemappings;
+
+import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.HashMap;
+import java.util.Map;
+
+@XmlRootElement
+public class ApplicationDescriptorList {
+ private Map<String, ApplicationDeploymentDescription> map = new HashMap<String, ApplicationDeploymentDescription>();
+ private Map<String[], ApplicationDeploymentDescription> applicationDeploymentDescriptionMap = new HashMap<String[], ApplicationDeploymentDescription>();
+
+ public Map<String[], ApplicationDeploymentDescription> getApplicationDeploymentDescriptionMap() {
+ return applicationDeploymentDescriptionMap;
+ }
+
+ public void setApplicationDeploymentDescriptionMap(Map<String[], ApplicationDeploymentDescription> applicationDeploymentDescriptionMap) {
+ this.applicationDeploymentDescriptionMap = applicationDeploymentDescriptionMap;
+ }
+
+ public Map<String, ApplicationDeploymentDescription> getMap() {
+ return map;
+ }
+
+ public void setMap(Map<String, ApplicationDeploymentDescription> map) {
+ this.map = map;
+ }
+}
+
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java?rev=1390647&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ConfigurationList.java Wed Sep 26 18:35:14 2012
@@ -0,0 +1,16 @@
+package org.apache.airavata.services.registry.rest.resourcemappings;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class ConfigurationList {
+ private Object[] configValList = null;
+
+ public Object[] getConfigValList() {
+ return configValList;
+ }
+
+ public void setConfigValList(Object[] configValList) {
+ this.configValList = configValList;
+ }
+}
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/Experiment.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/Experiment.java?rev=1390647&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/Experiment.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/Experiment.java Wed Sep 26 18:35:14 2012
@@ -0,0 +1,7 @@
+package org.apache.airavata.services.registry.rest.resourcemappings;
+
+import org.apache.airavata.registry.api.AiravataExperiment;
+
+public class Experiment extends AiravataExperiment {
+
+}
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java?rev=1390647&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ExperimentList.java Wed Sep 26 18:35:14 2012
@@ -0,0 +1,19 @@
+package org.apache.airavata.services.registry.rest.resourcemappings;
+
+
+import org.apache.airavata.registry.api.AiravataExperiment;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class ExperimentList {
+ AiravataExperiment[] experiments = null;
+
+ public AiravataExperiment[] getExperiments() {
+ return experiments;
+ }
+
+ public void setExperiments(AiravataExperiment[] experiments) {
+ this.experiments = experiments;
+ }
+}
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java?rev=1390647&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceDescriptionList.java Wed Sep 26 18:35:14 2012
@@ -0,0 +1,18 @@
+package org.apache.airavata.services.registry.rest.resourcemappings;
+
+import org.apache.airavata.commons.gfac.type.ServiceDescription;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class ServiceDescriptionList {
+ private ServiceDescription[] serviceDescriptions = null;
+
+ public ServiceDescription[] getServiceDescriptions() {
+ return serviceDescriptions;
+ }
+
+ public void setServiceDescriptions(ServiceDescription[] serviceDescriptions) {
+ this.serviceDescriptions = serviceDescriptions;
+ }
+}
Copied: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java (from r1389477, airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceURLList.java)
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java?p2=airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java&p1=airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceURLList.java&r1=1389477&r2=1390647&rev=1390647&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/ServiceURLList.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/URLList.java Wed Sep 26 18:35:14 2012
@@ -23,7 +23,7 @@ package org.apache.airavata.services.reg
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement
-public class ServiceURLList {
+public class URLList {
private String[] uris = null;
public String[] getUris() {
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java?rev=1390647&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowInstancesList.java Wed Sep 26 18:35:14 2012
@@ -0,0 +1,18 @@
+package org.apache.airavata.services.registry.rest.resourcemappings;
+
+import org.apache.airavata.registry.api.workflow.WorkflowInstance;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class WorkflowInstancesList {
+ WorkflowInstance[] workflowInstances = null;
+
+ public WorkflowInstance[] getWorkflowInstances() {
+ return workflowInstances;
+ }
+
+ public void setWorkflowInstances(WorkflowInstance[] workflowInstances) {
+ this.workflowInstances = workflowInstances;
+ }
+}
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java?rev=1390647&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkflowNodeIODataList.java Wed Sep 26 18:35:14 2012
@@ -0,0 +1,19 @@
+package org.apache.airavata.services.registry.rest.resourcemappings;
+
+
+import org.apache.airavata.registry.api.workflow.WorkflowNodeIOData;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class WorkflowNodeIODataList {
+ WorkflowNodeIOData[] workflowNodeIODatas = null;
+
+ public WorkflowNodeIOData[] getWorkflowNodeIODatas() {
+ return workflowNodeIODatas;
+ }
+
+ public void setWorkflowNodeIODatas(WorkflowNodeIOData[] workflowNodeIODatas) {
+ this.workflowNodeIODatas = workflowNodeIODatas;
+ }
+}
Added: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java?rev=1390647&view=auto
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java (added)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/WorkspaceProjectList.java Wed Sep 26 18:35:14 2012
@@ -0,0 +1,18 @@
+package org.apache.airavata.services.registry.rest.resourcemappings;
+
+import org.apache.airavata.registry.api.WorkspaceProject;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class WorkspaceProjectList {
+ WorkspaceProject[] workspaceProjects = null;
+
+ public WorkspaceProject[] getWorkspaceProjects() {
+ return workspaceProjects;
+ }
+
+ public void setWorkspaceProjects(WorkspaceProject[] workspaceProjects) {
+ this.workspaceProjects = workspaceProjects;
+ }
+}
Modified: airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resources/RegistryApplication.java
URL: http://svn.apache.org/viewvc/airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resources/RegistryApplication.java?rev=1390647&r1=1390646&r2=1390647&view=diff
==============================================================================
--- airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resources/RegistryApplication.java (original)
+++ airavata/sandbox/airavata-registry-rest/src/main/java/org/apache/airavata/services/registry/rest/resources/RegistryApplication.java Wed Sep 26 18:35:14 2012
@@ -19,65 +19,3 @@ public class RegistryApplication extends
}
}
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.airavata.services.registry.rest.resources;
-
-import javax.ws.rs.core.Application;
-import java.util.HashSet;
-import java.util.Set;
-
-public class RegistryApplication extends Application {
- @Override
- public Set<Class<?>> getClasses() {
- final Set<Class<?>> classes = new HashSet<Class<?>>();
- // register root resource
- classes.add(RegistryResource.class);
- return classes;
- }
-
- @Override
- public Set<Object> getSingletons() {
- return super.getSingletons();
- }
-
-}
-package org.apache.airavata.services.registry.rest.resources;
-
-import javax.ws.rs.core.Application;
-import java.util.HashSet;
-import java.util.Set;
-
-public class RegistryApplication extends Application {
- @Override
- public Set<Class<?>> getClasses() {
- final Set<Class<?>> classes = new HashSet<Class<?>>();
- // register root resource
- classes.add(RegistryResource.class);
- return classes;
- }
-
- @Override
- public Set<Object> getSingletons() {
- return super.getSingletons();
- }
-
-}