airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1410401 - in /airavata/trunk: ./ modules/rest/ modules/rest/client/ modules/rest/client/src/main/java/org/apache/airavata/rest/ modules/rest/client/src/main/java/org/apache/airavata/rest/client/ modules/rest/client/src/main/java/org/apache...
Date Fri, 16 Nov 2012 15:38:04 GMT
Author: chathuri
Date: Fri Nov 16 15:38:01 2012
New Revision: 1410401

URL: http://svn.apache.org/viewvc?rev=1410401&view=rev
Log:
adding new module for all the REST related sub modules

Added:
    airavata/trunk/modules/rest/
    airavata/trunk/modules/rest/client/
      - copied from r1410014, airavata/trunk/modules/airavata-rest-client/
    airavata/trunk/modules/rest/pom.xml
      - copied, changed from r1410014, airavata/trunk/modules/registry/pom.xml
    airavata/trunk/modules/rest/service/
      - copied from r1410014, airavata/trunk/modules/airavata-rest-services/
Removed:
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/resourcemappings/
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ApplicationDescriptorTypes.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/DescriptorUtil.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/HostTypes.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/utils/ResourcePathConstants.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/client/
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resourcemappings/
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/ApplicationDescriptorTypes.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/DescriptorUtil.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/HostTypes.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/ResourcePathConstants.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RestServicesConstants.java
Modified:
    airavata/trunk/modules/rest/client/pom.xml
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
    airavata/trunk/modules/rest/service/pom.xml
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ApplicationRegistration.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java
    airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
    airavata/trunk/pom.xml

Modified: airavata/trunk/modules/rest/client/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/pom.xml?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/pom.xml (original)
+++ airavata/trunk/modules/rest/client/pom.xml Fri Nov 16 15:38:01 2012
@@ -12,9 +12,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.airavata</groupId>
-        <artifactId>airavata</artifactId>
+        <artifactId>rest</artifactId>
         <version>0.6-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -49,6 +49,11 @@
             <artifactId>airavata-registry-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-rest-mappings</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/Test.java Fri
Nov 16 15:38:01 2012
@@ -22,22 +22,7 @@
 package org.apache.airavata.rest;
 
 
-import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.commons.gfac.type.HostDescription;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.registry.api.AiravataExperiment;
-import org.apache.airavata.registry.api.WorkspaceProject;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.workflow.*;
 import org.apache.airavata.rest.client.*;
-import org.apache.airavata.schemas.gfac.*;
-
-import java.sql.*;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.Date;
 
 public class Test {
     public static void main(String[] args) {

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java
(original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/BasicRegistryResourceClient.java
Fri Nov 16 15:38:01 2012
@@ -29,7 +29,7 @@ import com.sun.jersey.api.client.config.
 import com.sun.jersey.api.json.JSONConfiguration;
 import org.apache.airavata.registry.api.AiravataUser;
 import org.apache.airavata.registry.api.Gateway;
-import org.apache.airavata.rest.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
(original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ConfigurationResourceClient.java
Fri Nov 16 15:38:01 2012
@@ -28,9 +28,9 @@ import com.sun.jersey.api.client.config.
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
-import org.apache.airavata.rest.resourcemappings.ConfigurationList;
-import org.apache.airavata.rest.resourcemappings.URLList;
-import org.apache.airavata.rest.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.ConfigurationList;
+import org.apache.airavata.rest.mappings.resourcemappings.URLList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
(original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/DescriptorResourceClient.java
Fri Nov 16 15:38:01 2012
@@ -31,9 +31,9 @@ import com.sun.jersey.core.util.Multival
 import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.rest.resourcemappings.*;
-import org.apache.airavata.rest.utils.DescriptorUtil;
-import org.apache.airavata.rest.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.*;
+import org.apache.airavata.rest.mappings.utils.DescriptorUtil;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
(original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ExperimentResourceClient.java
Fri Nov 16 15:38:01 2012
@@ -29,8 +29,8 @@ import com.sun.jersey.api.client.config.
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 import org.apache.airavata.registry.api.AiravataExperiment;
-import org.apache.airavata.rest.resourcemappings.ExperimentList;
-import org.apache.airavata.rest.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.ExperimentList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
(original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProjectResourceClient.java
Fri Nov 16 15:38:01 2012
@@ -29,8 +29,8 @@ import com.sun.jersey.api.client.config.
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 import org.apache.airavata.registry.api.WorkspaceProject;
-import org.apache.airavata.rest.resourcemappings.WorkspaceProjectList;
-import org.apache.airavata.rest.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.WorkspaceProjectList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
(original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
Fri Nov 16 15:38:01 2012
@@ -30,10 +30,10 @@ import com.sun.jersey.api.json.JSONConfi
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
 import org.apache.airavata.registry.api.workflow.*;
-import org.apache.airavata.rest.resourcemappings.ExperimentDataList;
-import org.apache.airavata.rest.resourcemappings.ExperimentIDList;
-import org.apache.airavata.rest.resourcemappings.WorkflowInstancesList;
-import org.apache.airavata.rest.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.ExperimentDataList;
+import org.apache.airavata.rest.mappings.resourcemappings.ExperimentIDList;
+import org.apache.airavata.rest.mappings.resourcemappings.WorkflowInstancesList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
(original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/PublishedWorkflowResourceClient.java
Fri Nov 16 15:38:01 2012
@@ -28,10 +28,10 @@ import com.sun.jersey.api.client.config.
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
-import org.apache.airavata.rest.resourcemappings.PublishWorkflowNamesList;
-import org.apache.airavata.rest.resourcemappings.Workflow;
-import org.apache.airavata.rest.resourcemappings.WorkflowList;
-import org.apache.airavata.rest.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.PublishWorkflowNamesList;
+import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
+import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
(original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/UserWorkflowResourceClient.java
Fri Nov 16 15:38:01 2012
@@ -28,9 +28,9 @@ import com.sun.jersey.api.client.config.
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
-import org.apache.airavata.rest.resourcemappings.Workflow;
-import org.apache.airavata.rest.resourcemappings.WorkflowList;
-import org.apache.airavata.rest.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
+import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Copied: airavata/trunk/modules/rest/pom.xml (from r1410014, airavata/trunk/modules/registry/pom.xml)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/pom.xml?p2=airavata/trunk/modules/rest/pom.xml&p1=airavata/trunk/modules/registry/pom.xml&r1=1410014&r2=1410401&rev=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/registry/pom.xml (original)
+++ airavata/trunk/modules/rest/pom.xml Fri Nov 16 15:38:01 2012
@@ -18,9 +18,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>registry</artifactId>
+    <artifactId>rest</artifactId>
     <packaging>pom</packaging>
-    <name>Airavata Registry</name>
+    <name>Airavata REST</name>
     <url>http://airavata.apache.org/</url>
     
     <profiles>
@@ -30,10 +30,9 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>registry-api</module>
-                <module>airavata-jpa-registry</module>
-                <module>airavata-registry-service</module>
-                <module>airavata-registry-test</module>
+                <module>mappings</module>
+                <module>service</module>
+                <module>client</module>
             </modules>
         </profile>
     </profiles>

Modified: airavata/trunk/modules/rest/service/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/pom.xml?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/pom.xml (original)
+++ airavata/trunk/modules/rest/service/pom.xml Fri Nov 16 15:38:01 2012
@@ -12,9 +12,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.apache.airavata</groupId>
-        <artifactId>airavata</artifactId>
+        <artifactId>rest</artifactId>
         <version>0.6-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -144,6 +144,11 @@
             <artifactId>airavata-jpa-registry</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-rest-mappings</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <!-- Logging -->
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ApplicationRegistration.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ApplicationRegistration.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ApplicationRegistration.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ApplicationRegistration.java
Fri Nov 16 15:38:01 2012
@@ -35,9 +35,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.services.registry.rest.resourcemappings.ApplicationDescriptor;
-import org.apache.airavata.services.registry.rest.resourcemappings.ServiceDescriptor;
-import org.apache.airavata.services.registry.rest.resourcemappings.ServiceParameters;
+import org.apache.airavata.rest.mappings.resourcemappings.ApplicationDescriptor;
+import org.apache.airavata.rest.mappings.resourcemappings.ServiceDescriptor;
+import org.apache.airavata.rest.mappings.resourcemappings.ServiceParameters;
 
 @Path("/api/application")
 public class ApplicationRegistration {

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/BasicRegistryResouce.java
Fri Nov 16 15:38:01 2012
@@ -24,8 +24,8 @@ package org.apache.airavata.services.reg
 import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.apache.airavata.registry.api.AiravataUser;
 import org.apache.airavata.registry.api.Gateway;
-import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RestServicesConstants;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ConfigurationRegistryResource.java
Fri Nov 16 15:38:01 2012
@@ -22,10 +22,10 @@
 package org.apache.airavata.services.registry.rest.resources;
 
 import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.services.registry.rest.resourcemappings.ConfigurationList;
-import org.apache.airavata.services.registry.rest.resourcemappings.URLList;
-import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RestServicesConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.ConfigurationList;
+import org.apache.airavata.rest.mappings.resourcemappings.URLList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/DescriptorRegistryResource.java
Fri Nov 16 15:38:01 2012
@@ -29,10 +29,10 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
-import org.apache.airavata.services.registry.rest.resourcemappings.*;
-import org.apache.airavata.services.registry.rest.utils.DescriptorUtil;
-import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RestServicesConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.*;
+import org.apache.airavata.rest.mappings.utils.DescriptorUtil;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ExperimentRegistryResource.java
Fri Nov 16 15:38:01 2012
@@ -28,9 +28,9 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.exception.worker.ExperimentDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.worker.WorkspaceProjectDoesNotExistsException;
-import org.apache.airavata.services.registry.rest.resourcemappings.ExperimentList;
-import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RestServicesConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.ExperimentList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProjectRegistryResource.java
Fri Nov 16 15:38:01 2012
@@ -26,9 +26,9 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.exception.worker.WorkspaceProjectAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.worker.WorkspaceProjectDoesNotExistsException;
-import org.apache.airavata.services.registry.rest.resourcemappings.WorkspaceProjectList;
-import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RestServicesConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.WorkspaceProjectList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
Fri Nov 16 15:38:01 2012
@@ -25,11 +25,11 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
 import org.apache.airavata.registry.api.workflow.*;
-import org.apache.airavata.services.registry.rest.resourcemappings.ExperimentDataList;
-import org.apache.airavata.services.registry.rest.resourcemappings.ExperimentIDList;
-import org.apache.airavata.services.registry.rest.resourcemappings.WorkflowInstancesList;
-import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RestServicesConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.ExperimentDataList;
+import org.apache.airavata.rest.mappings.resourcemappings.ExperimentIDList;
+import org.apache.airavata.rest.mappings.resourcemappings.WorkflowInstancesList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/PublishWorkflowRegistryResource.java
Fri Nov 16 15:38:01 2012
@@ -26,11 +26,11 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExistsException;
-import org.apache.airavata.services.registry.rest.resourcemappings.PublishWorkflowNamesList;
-import org.apache.airavata.services.registry.rest.resourcemappings.Workflow;
-import org.apache.airavata.services.registry.rest.resourcemappings.WorkflowList;
-import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RestServicesConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.PublishWorkflowNamesList;
+import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
+import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/UserWorkflowRegistryResource.java
Fri Nov 16 15:38:01 2012
@@ -25,10 +25,10 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.exception.worker.UserWorkflowAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExistsException;
-import org.apache.airavata.services.registry.rest.resourcemappings.Workflow;
-import org.apache.airavata.services.registry.rest.resourcemappings.WorkflowList;
-import org.apache.airavata.services.registry.rest.utils.ResourcePathConstants;
-import org.apache.airavata.services.registry.rest.utils.RestServicesConstants;
+import org.apache.airavata.rest.mappings.resourcemappings.Workflow;
+import org.apache.airavata.rest.mappings.resourcemappings.WorkflowList;
+import org.apache.airavata.rest.mappings.utils.ResourcePathConstants;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.*;

Modified: airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java
(original)
+++ airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/utils/RegistryListener.java
Fri Nov 16 15:38:01 2012
@@ -25,6 +25,7 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.AiravataRegistryFactory;
 import org.apache.airavata.registry.api.AiravataUser;
 import org.apache.airavata.registry.api.Gateway;
+import org.apache.airavata.rest.mappings.utils.RestServicesConstants;
 
 //import org.apache.airavata.client.AiravataClient;
 //import org.apache.airavata.client.AiravataClientUtils;

Modified: airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/test/resources/testdb/test.h2.db?rev=1410401&r1=1410014&r2=1410401&view=diff
==============================================================================
Binary files - no diff available.

Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1410401&r1=1410400&r2=1410401&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Fri Nov 16 15:38:01 2012
@@ -586,8 +586,7 @@
                 <module>modules/registry</module>
                 <module>modules/airavata-client</module>
                 <module>modules/security</module>
-                <module>modules/airavata-rest-services</module>
-                <module>modules/airavata-rest-client</module>
+                <module>modules/rest</module>
                 <module>samples/simple-math-service</module>
                 <module>samples/complex-math-service</module>
                 <module>samples/levenshtein-distance-service</module>



Mime
View raw message