You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by he...@apache.org on 2012/10/15 21:48:08 UTC

svn commit: r1398476 - /airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/

Author: heshan
Date: Mon Oct 15 19:48:08 2012
New Revision: 1398476

URL: http://svn.apache.org/viewvc?rev=1398476&view=rev
Log:
Updating the interfaces to have unique method names. If it didn't have unique names, the rest services will start complaining stating media type conflicts.

Modified:
    airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java
    airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java
    airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java
    airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java

Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java?rev=1398476&r1=1398475&r2=1398476&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ConfigurationRegistryService.java Mon Oct 15 19:48:08 2012
@@ -23,10 +23,10 @@ public interface ConfigurationRegistrySe
     public Response setEventingURI(URI uri);
     public Response setMessageBoxURI(URI uri);
 
-    public Response addGFacURI(URI uri, Date expire);
+    public Response addGFacURIByDate(URI uri, Date expire);
     public Response addWorkflowInterpreterURI(URI uri, Date expire);
-    public Response setEventingURI(URI uri, Date expire);
-    public Response setMessageBoxURI(URI uri, Date expire);
+    public Response setEventingURIByDate(URI uri, Date expire);
+    public Response setMessageBoxURIByDate(URI uri, Date expire);
 
     public Response removeGFacURI(URI uri);
     public Response removeAllGFacURI();

Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java?rev=1398476&r1=1398475&r2=1398476&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/DescriptorRegistryService.java Mon Oct 15 19:48:08 2012
@@ -34,7 +34,7 @@ public interface DescriptorRegistryServi
     public Response isApplicationDescriptorExists(String serviceName, String hostName, String descriptorName)throws RegistryException;
     public Response addApplicationDescriptor(String serviceDescription, String hostDescriptor, String descriptor)throws DescriptorAlreadyExistsException, RegistryException;
     public Response addApplicationDesc(String serviceName, String hostName, String descriptor)throws DescriptorAlreadyExistsException, RegistryException;
-    public Response udpateApplicationDescriptor(String serviceDescription, String hostDescriptor, String descriptor)throws DescriptorDoesNotExistsException, RegistryException;
+    public Response udpateApplicationDescriptorByDescriptors(String serviceDescription, String hostDescriptor, String descriptor)throws DescriptorDoesNotExistsException, RegistryException;
     public Response updateApplicationDescriptor(String serviceName, String hostName, String descriptor)throws DescriptorDoesNotExistsException, RegistryException;
     public Response getApplicationDescriptor(String serviceName, String hostname, String applicationName)throws DescriptorDoesNotExistsException, MalformedDescriptorException, RegistryException;
     public Response getApplicationDescriptors(String serviceName, String hostname)throws MalformedDescriptorException, RegistryException;

Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java?rev=1398476&r1=1398475&r2=1398476&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProjectsRegistryService.java Mon Oct 15 19:48:08 2012
@@ -24,7 +24,7 @@ public interface ProjectsRegistryService
     public Response addExperiment(String projectName, AiravataExperiment experiment) throws WorkspaceProjectDoesNotExistsException, ExperimentDoesNotExistsException, RegistryException;
     public Response removeExperiment(String experimentId) throws ExperimentDoesNotExistsException;
     public Response getExperiments() throws RegistryException;
-    public Response getExperiments(String projectName)throws RegistryException;
-    public Response getExperiments(Date from, Date to)throws RegistryException;
-    public Response getExperiments(String projectName, Date from, Date to) throws RegistryException;
+    public Response getExperimentsByProject(String projectName)throws RegistryException;
+    public Response getExperimentsByDate(Date from, Date to)throws RegistryException;
+    public Response getExperimentsByProjectDate(String projectName, Date from, Date to) throws RegistryException;
 }

Modified: airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java?rev=1398476&r1=1398475&r2=1398476&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java (original)
+++ airavata/trunk/modules/registry/airavata-registry-service/src/main/java/org/apache/airavata/registry/services/ProvenanceRegistryService.java Mon Oct 15 19:48:08 2012
@@ -18,7 +18,7 @@ public interface ProvenanceRegistryServi
      */
     public Response isExperimentExists(String experimentId) throws RegistryException;
 
-    public Response isExperimentExists(String experimentId, boolean createIfNotPresent) throws RegistryException;
+    public Response isExperimentExistsThenCreate(String experimentId, boolean createIfNotPresent) throws RegistryException;
 
     /**
      * Save the username of the user who runs this experiment
@@ -93,7 +93,7 @@ public interface ProvenanceRegistryServi
 
     public Response isWorkflowInstanceExists(String instanceId) throws RegistryException;
 
-    public Response isWorkflowInstanceExists(String instanceId, boolean createIfNotPresent) throws RegistryException;
+    public Response isWorkflowInstanceExistsThenCreate(String instanceId, boolean createIfNotPresent) throws RegistryException;
 
     /**
      * Save a status for this workflow execution with the current time at the moment
@@ -102,7 +102,7 @@ public interface ProvenanceRegistryServi
      * @return
      * @throws org.apache.airavata.common.registry.api.exception.RegistryException
      */
-    public Response updateWorkflowInstanceStatus(String instanceId, String executionStatus)throws RegistryException;
+    public Response updateWorkflowInstanceStatusByInstance(String instanceId, String executionStatus)throws RegistryException;
 
     /**
      * Save a status for this workflow execution
@@ -113,7 +113,7 @@ public interface ProvenanceRegistryServi
      * @return
      * @throws org.apache.airavata.common.registry.api.exception.RegistryException
      */
-    public Response updateWorkflowInstanceStatus(String experimentID,
+    public Response updateWorkflowInstanceStatusByExperiment(String experimentID,
                                                  String workflowInstanceID,
                                                  String executionStatus,
                                                  Date statusUpdateTime)throws RegistryException;