svn commit: r1490739 - in /airavata/trunk: modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/ modules/rest/client/src/main/java/org/apache/airavata/rest/client/ tools/registry-tool/src/main/resources/db-s...

[ch...@apache.org]

Author: chathuri
Date: Fri Jun  7 17:24:52 2013
New Revision: 1490739

URL: http://svn.apache.org/r1490739
Log:
updating erroneous paths

Modified:
    airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java
    airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
    airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql
    airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java?rev=1490739&r1=1490738&r2=1490739&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/GFacJobDataResourceTest.java Fri Jun  7 17:24:52 2013
@@ -78,5 +78,6 @@ public class GFacJobDataResourceTest ext
         resource.setJobData("testJobData");
         resource.save();
         assertTrue("GFac job data saved successfully", workerResource.isGFacJobExists("testJobID"));
+        workflowDataResource.remove(ResourceType.GFAC_JOB_DATA, "testJobID");
     }
 }

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=1490739&r1=1490738&r2=1490739&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 Jun  7 17:24:52 2013
@@ -2601,7 +2601,7 @@ public class ProvenanceResourceClient {
                                                    String hostDescriptionId,
                                                    String applicationDescriptionId){
         webResource = getProvenanceRegistryBaseResource().path(
-                ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOB);
+                ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOBS_FOR_DESCRIPTORS);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
         queryParams.add("serviceDescriptionId", serviceDescriptionId);
         queryParams.add("hostDescriptionId", hostDescriptionId);
@@ -2651,7 +2651,7 @@ public class ProvenanceResourceClient {
                                      String workflowExecutionId,
                                      String nodeId) {
         webResource = getProvenanceRegistryBaseResource().path(
-                ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOB);
+                ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOBS);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
         queryParams.add("experimentId", experimentId);
         queryParams.add("workflowExecutionId", workflowExecutionId);

Modified: airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql?rev=1490739&r1=1490738&r2=1490739&view=diff
==============================================================================
--- airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql (original)
+++ airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_derby.sql Fri Jun  7 17:24:52 2013
@@ -61,4 +61,4 @@ create table GFac_Job_Data
 
 INSERT INTO GFac_Job_Data(experiment_ID, workflow_instanceID, node_id, application_descriptor_ID, host_descriptor_ID, service_descriptor_ID,
 job_data, local_Job_ID, submitted_time, statusUpdateTime, status, metadata) SELECT null, workflow_instanceID, node_id, null, invoked_host,
-null, null, local_Job_ID, null, null, null, null FROM Gram_Data;
\ No newline at end of file
+null, null, local_Job_ID, null, null, 'UNKNOWN', null FROM Gram_Data;
\ No newline at end of file

Modified: airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql?rev=1490739&r1=1490738&r2=1490739&view=diff
==============================================================================
--- airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql (original)
+++ airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.8/migrate_mysql.sql Fri Jun  7 17:24:52 2013
@@ -61,4 +61,4 @@ create table GFac_Job_Data
 
 INSERT INTO GFac_Job_Data(experiment_ID, workflow_instanceID, node_id, application_descriptor_ID, host_descriptor_ID, service_descriptor_ID,
 job_data, local_Job_ID, submitted_time, status_update_time, status, metadata) SELECT null, workflow_instanceID, node_id, null, invoked_host,
-null, null, local_Job_ID, null, null, null, null FROM Gram_Data;
\ No newline at end of file
+null, null, local_Job_ID, null, null, 'UNKNOWN', null FROM Gram_Data;
\ No newline at end of file