airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1487952 - in /airavata/trunk/modules: airavata-client/src/main/java/org/apache/airavata/client/api/ airavata-client/src/main/java/org/apache/airavata/client/impl/ registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance...
Date Thu, 30 May 2013 18:14:07 GMT
Author: samindaw
Date: Thu May 30 18:14:06 2013
New Revision: 1487952

URL: http://svn.apache.org/r1487952
Log:
refactoring to have the name application instead of gfac in the API

Added:
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java   (contents, props changed)
      - copied, changed from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobAlreadyExistsException.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java   (contents, props changed)
      - copied, changed from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobDoesNotExistsException.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java   (contents, props changed)
      - copied, changed from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidGFacJobIDException.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java   (contents, props changed)
      - copied, changed from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJob.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJobExecutionError.java   (contents, props changed)
      - copied, changed from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJobExecutionError.java
Removed:
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobAlreadyExistsException.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobDoesNotExistsException.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidGFacJobIDException.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJob.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJobExecutionError.java
Modified:
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
    airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ExecutionErrors.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.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/RegistryClient.java
    airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacErrorsList.java
    airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacJobList.java
    airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ExecutionManager.java Thu May 30 18:14:06 2013
@@ -27,7 +27,7 @@ import org.apache.airavata.client.api.ex
 import org.apache.airavata.registry.api.ExecutionErrors;
 import org.apache.airavata.registry.api.workflow.ExecutionError;
 import org.apache.airavata.registry.api.workflow.ExperimentExecutionError;
-import org.apache.airavata.registry.api.workflow.GFacJobExecutionError;
+import org.apache.airavata.registry.api.workflow.ApplicationJobExecutionError;
 import org.apache.airavata.registry.api.workflow.NodeExecutionError;
 import org.apache.airavata.registry.api.workflow.WorkflowExecutionError;
 import org.apache.airavata.workflow.model.wf.Workflow;
@@ -148,35 +148,35 @@ public interface ExecutionManager {
     public List<NodeExecutionError> getNodeExecutionErrors(String experimentId, String workflowInstanceId, String nodeId) throws AiravataAPIInvocationException;
     
     /**
-     * Return errors defined for a GFac job 
+     * Return errors defined for a Application job 
      * @param experimentId
      * @param workflowInstanceId
      * @param nodeId
-     * @param gfacJobId
+     * @param jobId
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public List<GFacJobExecutionError> getGFacJobErrors(String experimentId, String workflowInstanceId, String nodeId, String gfacJobId) throws AiravataAPIInvocationException;
+    public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId) throws AiravataAPIInvocationException;
 
     /**
-     * Return errors defined for a GFac job 
-     * @param gfacJobId
+     * Return errors defined for a Application job 
+     * @param jobId
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public List<GFacJobExecutionError> getGFacJobErrors(String gfacJobId) throws AiravataAPIInvocationException;
+    public List<ApplicationJobExecutionError> getApplicationJobErrors(String jobId) throws AiravataAPIInvocationException;
 
     /**
      * Return errors filtered by the parameters
      * @param experimentId 
      * @param workflowInstanceId
      * @param nodeId
-     * @param gfacJobId
+     * @param jobId
      * @param filterBy - what type of source types the results should contain
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public List<ExecutionError> getExecutionErrors(String experimentId, String workflowInstanceId, String nodeId, String gfacJobId, ExecutionErrors.Source...filterBy) throws AiravataAPIInvocationException;
+    public List<ExecutionError> getExecutionErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId, ExecutionErrors.Source...filterBy) throws AiravataAPIInvocationException;
 
     /**
      * Adds an experiment execution error 
@@ -203,11 +203,11 @@ public interface ExecutionManager {
     public int addNodeExecutionError(NodeExecutionError error) throws AiravataAPIInvocationException;
 
     /**
-     * Adds an GFac job execution error 
+     * Adds an Application job execution error 
      * @param error
      * @return
      * @throws AiravataAPIInvocationException
      */
-    public int addGFacJobExecutionError(GFacJobExecutionError error) throws AiravataAPIInvocationException;
+    public int addApplicationJobExecutionError(ApplicationJobExecutionError error) throws AiravataAPIInvocationException;
 
 }

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java Thu May 30 18:14:06 2013
@@ -31,8 +31,8 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.workflow.ExperimentMetadata;
 import org.apache.airavata.registry.api.workflow.ExperimentName;
 import org.apache.airavata.registry.api.workflow.ExperimentUser;
-import org.apache.airavata.registry.api.workflow.GFacJob;
-import org.apache.airavata.registry.api.workflow.GFacJob.GFacJobStatus;
+import org.apache.airavata.registry.api.workflow.ApplicationJob;
+import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus;
 import org.apache.airavata.registry.api.workflow.NodeExecutionStatus;
 import org.apache.airavata.registry.api.workflow.WorkflowExecution;
 import org.apache.airavata.registry.api.workflow.WorkflowExecutionData;
@@ -357,98 +357,104 @@ public interface ProvenanceManager {
 
     public void saveWorkflowExecutionOutput(String experimentId, String outputNodeName, String output) throws AiravataAPIInvocationException;
 
-     public void updateWorkflowNodeGramData(WorkflowNodeGramData data) throws AiravataAPIInvocationException;
+    /**
+     * @deprecated - Will be removed from 0.9 release onwards. Use {@see #addApplicationJob #updateApplicationJob(ApplucationJob) etc.} functions instead.
+     * This will store the gram specific data in to repository, this can be called before submitting the workflow in to Grid
+     * @param data
+     * @throws AiravataAPIInvocationException
+     */
+    public void updateWorkflowNodeGramData(WorkflowNodeGramData data) throws AiravataAPIInvocationException;
      
- 	/*---------------------------------------  Managing Data for GFac Jobs ------------------------------------------*/
+ 	/*---------------------------------------  Managing Data for Application Jobs ------------------------------------------*/
 
      /**
-      * Returns <code>true</code> if a gfac job data is existing in Airavata
-      * @param gfacJobId
+      * Returns <code>true</code> if a Application job data is existing in Airavata
+      * @param jobId
       * @return
       * @throws RegistryException
       */
-     public boolean isGFacJobExists(String gfacJobId) throws AiravataAPIInvocationException;
+     public boolean isApplicationJobExists(String jobId) throws AiravataAPIInvocationException;
      
      /**
-      * Adding data related to a new GFac job submission
+      * Adding data related to a new Application job submission
       * @param job - the <code>jobId</code> cannot be <code>null</code>.
       * @throws AiravataAPIInvocationException
       */
-     public void addGFacJob(GFacJob job) throws AiravataAPIInvocationException;
+     public void addApplicationJob(ApplicationJob job) throws AiravataAPIInvocationException;
      
      /**
-      * Update data related to a existing GFac job record in Airavata
+      * Update data related to a existing Application job record in Airavata
       * @param job - the <code>jobId</code> cannot be <code>null</code> and should already exist in Airavata
       * @throws AiravataAPIInvocationException
       */
-     public void updateGFacJob(GFacJob job) throws AiravataAPIInvocationException;
+     public void updateApplicationJob(ApplicationJob job) throws AiravataAPIInvocationException;
      
      /**
       * Update the status of the job
-      * @param gfacJobId
+      * @param jobId
       * @param status
       * @throws AiravataAPIInvocationException
       */
-     public void updateGFacJobStatus(String gfacJobId, GFacJobStatus status) throws AiravataAPIInvocationException;
+     public void updateApplicationJobStatus(String jobId, ApplicationJobStatus status) throws AiravataAPIInvocationException;
      
      /**
       * Update the job data. GFacProvider implementation should decide the job data. Typically it'll 
       * be a serialization of the submitted job query (eg: rsl for a GRAM job) 
-      * @param gfacJobId
+      * @param jobId
       * @param jobdata
       * @throws AiravataAPIInvocationException
       */
-     public void updateGFacJobData(String gfacJobId, String jobdata) throws AiravataAPIInvocationException;
+     public void updateApplicationJobData(String jobId, String jobdata) throws AiravataAPIInvocationException;
      
      /**
       * Update the time of job submission or job started executing
-      * @param gfacJobId
+      * @param jobId
       * @param submitted
       * @throws AiravataAPIInvocationException
       */
-     public void updateGFacJobSubmittedTime(String gfacJobId, Date submitted) throws AiravataAPIInvocationException;
+     public void updateApplicationJobSubmittedTime(String jobId, Date submitted) throws AiravataAPIInvocationException;
      
      /**
       * Update the time of job finished executing.
-      * @param gfacJobId
+      * @param jobId
       * @param completed
       * @throws AiravataAPIInvocationException
       */
-     public void updateGFacJobCompletedTime(String gfacJobId, Date completed) throws AiravataAPIInvocationException;
+     public void updateApplicationJobCompletedTime(String jobId, Date completed) throws AiravataAPIInvocationException;
      
      /**
       * Custom data field for users
-      * @param gfacJobId
+      * @param jobId
       * @param metadata
       * @throws AiravataAPIInvocationException
       */
-     public void updateGFacJobMetadata(String gfacJobId, String metadata) throws AiravataAPIInvocationException;
+     public void updateApplicationJobMetadata(String jobId, String metadata) throws AiravataAPIInvocationException;
      
      /**
-      * Retrieve the GFac Job for the given job id
-      * @param gfacJobId
+      * Retrieve the Application Job for the given job id
+      * @param jobId
       * @return
       * @throws AiravataAPIInvocationException
       */
-     public GFacJob getGFacJob(String gfacJobId) throws AiravataAPIInvocationException;
+     public ApplicationJob getApplicationJob(String jobId) throws AiravataAPIInvocationException;
      
      /**
-      * Retrieve a list of GFac jobs executed for the given descriptors
+      * Retrieve a list of Application jobs executed for the given descriptors
       * @param serviceDescriptionId - should be <code>null</code> if user does not care what service description the job corresponds to
       * @param hostDescriptionId - should be <code>null</code> if user does not care what host description the job corresponds to
       * @param applicationDescriptionId - should be <code>null</code> if user does not care what application description the job corresponds to
       * @return
       * @throws AiravataAPIInvocationException
       */
-     public List<GFacJob> getGFacJobsForDescriptors(String serviceDescriptionId, String hostDescriptionId, String applicationDescriptionId) throws AiravataAPIInvocationException;
+     public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId, String hostDescriptionId, String applicationDescriptionId) throws AiravataAPIInvocationException;
      
      /**
-      * Retrieve a list of GFac jobs executed for the given experiment credentials
+      * Retrieve a list of Application jobs executed for the given experiment credentials
       * @param experimentId - should be <code>null</code> if user does not care what experiment the job corresponds to
       * @param workflowExecutionId -  - should be <code>null</code> if user does not care what workflow execution the job corresponds to
       * @param nodeId  - should be <code>null</code> if user does not care what node id the job corresponds to
       * @return
       * @throws AiravataAPIInvocationException
       */
-     public List<GFacJob> getGFacJobs(String experimentId, String workflowExecutionId, String nodeId) throws AiravataAPIInvocationException;
+     public List<ApplicationJob> getApplicationJobs(String experimentId, String workflowExecutionId, String nodeId) throws AiravataAPIInvocationException;
 }

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ExecutionManagerImpl.java Thu May 30 18:14:06 2013
@@ -44,7 +44,7 @@ import org.apache.airavata.common.workfl
 import org.apache.airavata.registry.api.ExecutionErrors.Source;
 import org.apache.airavata.registry.api.workflow.ExecutionError;
 import org.apache.airavata.registry.api.workflow.ExperimentExecutionError;
-import org.apache.airavata.registry.api.workflow.GFacJobExecutionError;
+import org.apache.airavata.registry.api.workflow.ApplicationJobExecutionError;
 import org.apache.airavata.registry.api.workflow.NodeExecutionError;
 import org.apache.airavata.registry.api.workflow.WorkflowExecutionError;
 import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
@@ -396,11 +396,11 @@ public class ExecutionManagerImpl implem
 	}
 
 	@Override
-	public List<GFacJobExecutionError> getGFacJobErrors(String experimentId,
+	public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId,
 			String workflowInstanceId, String nodeId, String gfacJobId)
 			throws AiravataAPIInvocationException {
 		try {
-			return getClient().getRegistryClient().getGFacJobErrors(experimentId, 
+			return getClient().getRegistryClient().getApplicationJobErrors(experimentId, 
 					workflowInstanceId, nodeId, gfacJobId);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
@@ -408,10 +408,10 @@ public class ExecutionManagerImpl implem
 	}
 
 	@Override
-	public List<GFacJobExecutionError> getGFacJobErrors(String gfacJobId)
+	public List<ApplicationJobExecutionError> getApplicationJobErrors(String gfacJobId)
 			throws AiravataAPIInvocationException {
 		try {
-			return getClient().getRegistryClient().getGFacJobErrors(gfacJobId);
+			return getClient().getRegistryClient().getApplicationJobErrors(gfacJobId);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
@@ -460,10 +460,10 @@ public class ExecutionManagerImpl implem
 	}
 
 	@Override
-	public int addGFacJobExecutionError(GFacJobExecutionError error)
+	public int addApplicationJobExecutionError(ApplicationJobExecutionError error)
 			throws AiravataAPIInvocationException {
 		try {
-			return getClient().getRegistryClient().addGFacJobExecutionError(error);
+			return getClient().getRegistryClient().addApplicationJobExecutionError(error);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}

Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java (original)
+++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java Thu May 30 18:14:06 2013
@@ -33,7 +33,7 @@ import org.apache.airavata.common.except
 import org.apache.airavata.registry.api.AiravataExperiment;
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.workflow.*;
-import org.apache.airavata.registry.api.workflow.GFacJob.GFacJobStatus;
+import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus;
 import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
 
 public class ProvenanceManagerImpl implements ProvenanceManager {
@@ -492,111 +492,111 @@ public class ProvenanceManagerImpl imple
     }
 
 	@Override
-	public boolean isGFacJobExists(String gfacJobId)
+	public boolean isApplicationJobExists(String gfacJobId)
 			throws AiravataAPIInvocationException {
 		try {
-			return client.getRegistryClient().isGFacJobExists(gfacJobId);
+			return client.getRegistryClient().isApplicationJobExists(gfacJobId);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 	
 	@Override
-	public void addGFacJob(GFacJob job) throws AiravataAPIInvocationException {
+	public void addApplicationJob(ApplicationJob job) throws AiravataAPIInvocationException {
 		try {
-			client.getRegistryClient().addGFacJob(job);
+			client.getRegistryClient().addApplicationJob(job);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public void updateGFacJob(GFacJob job)
+	public void updateApplicationJob(ApplicationJob job)
 			throws AiravataAPIInvocationException {
 		try {
-			client.getRegistryClient().updateGFacJob(job);
+			client.getRegistryClient().updateApplicationJob(job);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public void updateGFacJobStatus(String gfacJobId, GFacJobStatus status)
+	public void updateApplicationJobStatus(String gfacJobId, ApplicationJobStatus status)
 			throws AiravataAPIInvocationException {
 		try {
-			client.getRegistryClient().updateGFacJobStatus(gfacJobId, status);
+			client.getRegistryClient().updateApplicationJobStatus(gfacJobId, status);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public void updateGFacJobData(String gfacJobId, String jobdata)
+	public void updateApplicationJobData(String gfacJobId, String jobdata)
 			throws AiravataAPIInvocationException {
 		try {
-			client.getRegistryClient().updateGFacJobData(gfacJobId, jobdata);
+			client.getRegistryClient().updateApplicationJobData(gfacJobId, jobdata);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public void updateGFacJobSubmittedTime(String gfacJobId, Date submitted)
+	public void updateApplicationJobSubmittedTime(String gfacJobId, Date submitted)
 			throws AiravataAPIInvocationException {
 		try {
-			client.getRegistryClient().updateGFacJobSubmittedTime(gfacJobId, submitted);
+			client.getRegistryClient().updateApplicationJobSubmittedTime(gfacJobId, submitted);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public void updateGFacJobCompletedTime(String gfacJobId, Date completed)
+	public void updateApplicationJobCompletedTime(String gfacJobId, Date completed)
 			throws AiravataAPIInvocationException {
 		try {
-			client.getRegistryClient().updateGFacJobCompletedTime(gfacJobId, completed);
+			client.getRegistryClient().updateApplicationJobCompletedTime(gfacJobId, completed);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public void updateGFacJobMetadata(String gfacJobId, String metadata)
+	public void updateApplicationJobMetadata(String gfacJobId, String metadata)
 			throws AiravataAPIInvocationException {
 		try {
-			client.getRegistryClient().updateGFacJobMetadata(gfacJobId, metadata);
+			client.getRegistryClient().updateApplicationJobMetadata(gfacJobId, metadata);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public GFacJob getGFacJob(String gfacJobId)
+	public ApplicationJob getApplicationJob(String gfacJobId)
 			throws AiravataAPIInvocationException {
 		try {
-			return client.getRegistryClient().getGFacJob(gfacJobId);
+			return client.getRegistryClient().getApplicationJob(gfacJobId);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public List<GFacJob> getGFacJobsForDescriptors(String serviceDescriptionId,
+	public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId,
 			String hostDescriptionId, String applicationDescriptionId)
 			throws AiravataAPIInvocationException {
 		try {
-			return client.getRegistryClient().getGFacJobsForDescriptors(serviceDescriptionId, hostDescriptionId, applicationDescriptionId);
+			return client.getRegistryClient().getApplicationJobsForDescriptors(serviceDescriptionId, hostDescriptionId, applicationDescriptionId);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}
 	}
 
 	@Override
-	public List<GFacJob> getGFacJobs(String experimentId,
+	public List<ApplicationJob> getApplicationJobs(String experimentId,
 			String workflowExecutionId, String nodeId)
 			throws AiravataAPIInvocationException {
 		try {
-			return client.getRegistryClient().getGFacJobs(experimentId, workflowExecutionId, nodeId);
+			return client.getRegistryClient().getApplicationJobs(experimentId, workflowExecutionId, nodeId);
 		} catch (Exception e) {
 			throw new AiravataAPIInvocationException(e);
 		}

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Thu May 30 18:14:06 2013
@@ -88,9 +88,9 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.worker.ExperimentDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.worker.ExperimentLazyLoadedException;
-import org.apache.airavata.registry.api.exception.worker.GFacJobAlreadyExistsException;
-import org.apache.airavata.registry.api.exception.worker.GFacJobDoesNotExistsException;
-import org.apache.airavata.registry.api.exception.worker.InvalidGFacJobIDException;
+import org.apache.airavata.registry.api.exception.worker.ApplicationJobAlreadyExistsException;
+import org.apache.airavata.registry.api.exception.worker.ApplicationJobDoesNotExistsException;
+import org.apache.airavata.registry.api.exception.worker.InvalidApplicationJobIDException;
 import org.apache.airavata.registry.api.exception.worker.UserWorkflowAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.worker.UserWorkflowDoesNotExistsException;
 import org.apache.airavata.registry.api.exception.worker.WorkflowInstanceAlreadyExistsException;
@@ -104,9 +104,9 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.workflow.ExecutionError;
 import org.apache.airavata.registry.api.workflow.ExperimentData;
 import org.apache.airavata.registry.api.workflow.ExperimentExecutionError;
-import org.apache.airavata.registry.api.workflow.GFacJob;
-import org.apache.airavata.registry.api.workflow.GFacJob.GFacJobStatus;
-import org.apache.airavata.registry.api.workflow.GFacJobExecutionError;
+import org.apache.airavata.registry.api.workflow.ApplicationJob;
+import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus;
+import org.apache.airavata.registry.api.workflow.ApplicationJobExecutionError;
 import org.apache.airavata.registry.api.workflow.NodeExecutionData;
 import org.apache.airavata.registry.api.workflow.NodeExecutionError;
 import org.apache.airavata.registry.api.workflow.NodeExecutionStatus;
@@ -1807,17 +1807,17 @@ public class AiravataJPARegistry extends
         if (provenanceRegistry != null){
             provenanceRegistry.updateWorkflowNodeGramData(workflowNodeGramData);
         }else {
-        	GFacJob job = new GFacJob();
+        	ApplicationJob job = new ApplicationJob();
         	job.setJobId(workflowNodeGramData.getGramJobID());
         	job.setMetadata(workflowNodeGramData.getInvokedHost());
         	job.setExperimentId(workflowNodeGramData.getWorkflowInstanceId());
         	job.setWorkflowExecutionId(workflowNodeGramData.getWorkflowInstanceId());
         	job.setNodeId(workflowNodeGramData.getNodeID());
         	job.setJobData(workflowNodeGramData.getRsl());
-        	if (isGFacJobExists(job.getJobId())){
-        		updateGFacJob(job);
+        	if (isApplicationJobExists(job.getJobId())){
+        		updateApplicationJob(job);
         	}else{
-        		addGFacJob(job);
+        		addApplicationJob(job);
         	}
         }
 	}
@@ -2082,19 +2082,19 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public List<GFacJobExecutionError> getGFacJobErrors(String experimentId,
+	public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId,
 			String workflowInstanceId, String nodeId, String gfacJobId)
 			throws RegistryException {
 		if (provenanceRegistry != null){
-            return provenanceRegistry.getGFacJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId);
+            return provenanceRegistry.getApplicationJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId);
         }
-		List<GFacJobExecutionError> result=new ArrayList<GFacJobExecutionError>();
-		List<ExecutionErrorResource> executionErrors = jpa.getWorker().getExperiment(experimentId).getData().getExecutionErrors(Source.GFAC.toString(), experimentId, workflowInstanceId, nodeId, gfacJobId);
+		List<ApplicationJobExecutionError> result=new ArrayList<ApplicationJobExecutionError>();
+		List<ExecutionErrorResource> executionErrors = jpa.getWorker().getExperiment(experimentId).getData().getExecutionErrors(Source.APPLICATION.toString(), experimentId, workflowInstanceId, nodeId, gfacJobId);
 		for (ExecutionErrorResource errorResource : executionErrors) {
-			GFacJobExecutionError error = new GFacJobExecutionError();
+			ApplicationJobExecutionError error = new ApplicationJobExecutionError();
 			setupValues(errorResource, error);
 			error.setExperimentId(errorResource.getExperimentDataResource().getExperimentID());
-			error.setGfacJobId(errorResource.getGfacJobID());
+			error.setJobId(errorResource.getGfacJobID());
 			error.setNodeId(errorResource.getNodeID());
 			error.setWorkflowInstanceId(errorResource.getWorkflowDataResource().getWorkflowInstanceID());
 			result.add(error);
@@ -2116,12 +2116,12 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public List<GFacJobExecutionError> getGFacJobErrors(String gfacJobId)
+	public List<ApplicationJobExecutionError> getApplicationJobErrors(String gfacJobId)
 			throws RegistryException {
 		if (provenanceRegistry != null){
-            return provenanceRegistry.getGFacJobErrors(gfacJobId);
+            return provenanceRegistry.getApplicationJobErrors(gfacJobId);
         }
-		return getGFacJobErrors(null, null, null, gfacJobId);
+		return getApplicationJobErrors(null, null, null, gfacJobId);
 	}
 
 	@Override
@@ -2137,7 +2137,7 @@ public class AiravataJPARegistry extends
 				errors.addAll(getExperimentExecutionErrors(experimentId));
 				errors.addAll(getWorkflowExecutionErrors(experimentId, workflowInstanceId));
 				errors.addAll(getNodeExecutionErrors(experimentId, workflowInstanceId, nodeId));
-				errors.addAll(getGFacJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId));
+				errors.addAll(getApplicationJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId));
 				break;
 			} else if (sourceType==Source.EXPERIMENT){
 				errors.addAll(getExperimentExecutionErrors(experimentId));
@@ -2145,8 +2145,8 @@ public class AiravataJPARegistry extends
 				errors.addAll(getWorkflowExecutionErrors(experimentId, workflowInstanceId));
 			} else if (sourceType==Source.NODE){
 				errors.addAll(getNodeExecutionErrors(experimentId, workflowInstanceId, nodeId));
-			} else if (sourceType==Source.GFAC){
-				errors.addAll(getGFacJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId));
+			} else if (sourceType==Source.APPLICATION){
+				errors.addAll(getApplicationJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId));
 			}
 		}
 		return errors;
@@ -2230,29 +2230,29 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public int addGFacJobExecutionError(GFacJobExecutionError error)
+	public int addApplicationJobExecutionError(ApplicationJobExecutionError error)
 			throws RegistryException {
 		if (provenanceRegistry != null){
-            return provenanceRegistry.addGFacJobExecutionError(error);
+            return provenanceRegistry.addApplicationJobExecutionError(error);
         }
-		ExecutionErrorResource executionError = createNewExecutionErrorResource(error.getExperimentId(),error, Source.GFAC);
+		ExecutionErrorResource executionError = createNewExecutionErrorResource(error.getExperimentId(),error, Source.APPLICATION);
 		executionError.setWorkflowDataResource(jpa.getWorker().getExperiment(error.getExperimentId()).getData().getWorkflowInstance(error.getWorkflowInstanceId()));
 		executionError.setNodeID(error.getNodeId());
-		executionError.setGfacJobID(error.getGfacJobId());
+		executionError.setGfacJobID(error.getJobId());
 		executionError.save();
 		return executionError.getErrorID();
 	}
 
 	@Override
-	public void addGFacJob(GFacJob job) throws RegistryException {
+	public void addApplicationJob(ApplicationJob job) throws RegistryException {
 		if (provenanceRegistry != null){
-            provenanceRegistry.addGFacJob(job);
+            provenanceRegistry.addApplicationJob(job);
         }
 		if (job.getJobId()==null || job.getJobId().equals("")){
-			throw new InvalidGFacJobIDException();
+			throw new InvalidApplicationJobIDException();
 		}
-		if (isGFacJobExists(job.getJobId())){
-			throw new GFacJobAlreadyExistsException(job.getJobId());
+		if (isApplicationJobExists(job.getJobId())){
+			throw new ApplicationJobAlreadyExistsException(job.getJobId());
 		}
 		if (!isWorkflowInstanceNodePresent(job.getWorkflowExecutionId(), job.getNodeId())){
 			throw new WorkflowInstanceNodeDoesNotExistsException(job.getWorkflowExecutionId(), job.getNodeId());
@@ -2266,7 +2266,7 @@ public class AiravataJPARegistry extends
 		gfacJob.save();
 	}
 
-	private void setupValues(GFacJob job, GFacJobDataResource gfacJob) {
+	private void setupValues(ApplicationJob job, GFacJobDataResource gfacJob) {
 		gfacJob.setApplicationDescID(job.getApplicationDescriptionId());
 		gfacJob.setCompletedTime(new Timestamp(job.getCompletedTime().getTime()));
 		gfacJob.setHostDescID(job.getHostDescriptionId());
@@ -2278,27 +2278,27 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public void updateGFacJob(GFacJob job) throws RegistryException {
+	public void updateApplicationJob(ApplicationJob job) throws RegistryException {
 		GFacJobDataResource gFacJob = validateAndGetGFacJob(job.getJobId());
 		setupValues(job, gFacJob);
 		gFacJob.save();
 	}
 
 	private GFacJobDataResource validateAndGetGFacJob(String jobId)
-			throws InvalidGFacJobIDException, RegistryException,
-			GFacJobDoesNotExistsException {
+			throws InvalidApplicationJobIDException, RegistryException,
+			ApplicationJobDoesNotExistsException {
 		if (jobId==null || jobId.equals("")){
-			throw new InvalidGFacJobIDException();
+			throw new InvalidApplicationJobIDException();
 		}
-		if (!isGFacJobExists(jobId)){
-			throw new GFacJobDoesNotExistsException(jobId);
+		if (!isApplicationJobExists(jobId)){
+			throw new ApplicationJobDoesNotExistsException(jobId);
 		}
 		GFacJobDataResource gFacJob = jpa.getWorker().getGFacJob(jobId);
 		return gFacJob;
 	}
 
 	@Override
-	public void updateGFacJobStatus(String gfacJobId, GFacJobStatus status)
+	public void updateApplicationJobStatus(String gfacJobId, ApplicationJobStatus status)
 			throws RegistryException {
 		GFacJobDataResource gFacJob = validateAndGetGFacJob(gfacJobId);
 		gFacJob.setStatus(status.toString());
@@ -2306,7 +2306,7 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public void updateGFacJobData(String gfacJobId, String jobdata)
+	public void updateApplicationJobData(String gfacJobId, String jobdata)
 			throws RegistryException {
 		GFacJobDataResource gFacJob = validateAndGetGFacJob(gfacJobId);
 		gFacJob.setJobData(jobdata);
@@ -2314,7 +2314,7 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public void updateGFacJobSubmittedTime(String gfacJobId, Date submitted)
+	public void updateApplicationJobSubmittedTime(String gfacJobId, Date submitted)
 			throws RegistryException {
 		GFacJobDataResource gFacJob = validateAndGetGFacJob(gfacJobId);
 		gFacJob.setSubmittedTime(new Timestamp(submitted.getTime()));
@@ -2322,7 +2322,7 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public void updateGFacJobCompletedTime(String gfacJobId, Date completed)
+	public void updateApplicationJobCompletedTime(String gfacJobId, Date completed)
 			throws RegistryException {
 		GFacJobDataResource gFacJob = validateAndGetGFacJob(gfacJobId);
 		gFacJob.setCompletedTime(new Timestamp(completed.getTime()));
@@ -2330,7 +2330,7 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public void updateGFacJobMetadata(String gfacJobId, String metadata)
+	public void updateApplicationJobMetadata(String gfacJobId, String metadata)
 			throws RegistryException {
 		GFacJobDataResource gFacJob = validateAndGetGFacJob(gfacJobId);
 		gFacJob.setMetadata(metadata);
@@ -2338,21 +2338,21 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public GFacJob getGFacJob(String gfacJobId) throws RegistryException {
+	public ApplicationJob getApplicationJob(String gfacJobId) throws RegistryException {
 		GFacJobDataResource gfacJob = validateAndGetGFacJob(gfacJobId);
-		GFacJob job = new GFacJob();
+		ApplicationJob job = new ApplicationJob();
 		setupValues(gfacJob, job);
 		return job;
 	}
 
-	private void setupValues(GFacJobDataResource gfacJob, GFacJob job) {
+	private void setupValues(GFacJobDataResource gfacJob, ApplicationJob job) {
 		job.setApplicationDescriptionId(gfacJob.getApplicationDescID());
 		job.setCompletedTime(gfacJob.getCompletedTime());
 		job.setExperimentId(gfacJob.getExperimentDataResource().getExperimentID());
 		job.setHostDescriptionId(gfacJob.getHostDescID());
 		job.setJobData(gfacJob.getJobData());
 		job.setJobId(gfacJob.getLocalJobID());
-		job.setJobStatus(GFacJobStatus.valueOf(gfacJob.getStatus()));
+		job.setJobStatus(ApplicationJobStatus.valueOf(gfacJob.getStatus()));
 		job.setMetadata(gfacJob.getMetadata());
 		job.setNodeId(gfacJob.getNodeID());
 		job.setServiceDescriptionId(gfacJob.getServiceDescID());
@@ -2361,13 +2361,13 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public List<GFacJob> getGFacJobsForDescriptors(String serviceDescriptionId,
+	public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId,
 			String hostDescriptionId, String applicationDescriptionId)
 			throws RegistryException {
-		List<GFacJob> jobs=new ArrayList<GFacJob>();
+		List<ApplicationJob> jobs=new ArrayList<ApplicationJob>();
 		List<GFacJobDataResource> gFacJobs = jpa.getWorker().getGFacJobs(serviceDescriptionId,hostDescriptionId,applicationDescriptionId);
 		for (GFacJobDataResource resource : gFacJobs) {
-			GFacJob job = new GFacJob();
+			ApplicationJob job = new ApplicationJob();
 			setupValues(resource, job);
 			jobs.add(job);
 		}
@@ -2375,15 +2375,15 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public List<GFacJob> getGFacJobs(String experimentId,
+	public List<ApplicationJob> getApplicationJobs(String experimentId,
 			String workflowExecutionId, String nodeId) throws RegistryException {
 		if (!isWorkflowInstanceNodePresent(workflowExecutionId, nodeId)){
 			throw new WorkflowInstanceNodeDoesNotExistsException(workflowExecutionId, nodeId);
 		}
-		List<GFacJob> jobs=new ArrayList<GFacJob>();
+		List<ApplicationJob> jobs=new ArrayList<ApplicationJob>();
 		List<Resource> gFacJobs = jpa.getWorker().getExperiment(experimentId).getData().getWorkflowInstance(workflowExecutionId).getNodeData(nodeId).getGFacJobs();
 		for (Resource resource : gFacJobs) {
-			GFacJob job = new GFacJob();
+			ApplicationJob job = new ApplicationJob();
 			setupValues((GFacJobDataResource)resource, job);
 			jobs.add(job);
 		}
@@ -2391,7 +2391,7 @@ public class AiravataJPARegistry extends
 	}
 
 	@Override
-	public boolean isGFacJobExists(String gfacJobId) throws RegistryException {
+	public boolean isApplicationJobExists(String gfacJobId) throws RegistryException {
 		return jpa.getWorker().isGFacJobExists(gfacJobId);
 	}
 

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ExecutionErrors.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ExecutionErrors.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ExecutionErrors.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ExecutionErrors.java Thu May 30 18:14:06 2013
@@ -27,7 +27,7 @@ public class ExecutionErrors {
 		EXPERIMENT,
 		WORKFLOW,
 		NODE,
-		GFAC
+		APPLICATION
 	}
 	
 }

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java Thu May 30 18:14:06 2013
@@ -26,7 +26,7 @@ import java.util.List;
 
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.registry.api.workflow.*;
-import org.apache.airavata.registry.api.workflow.GFacJob.GFacJobStatus;
+import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus;
 import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus.State;
 
 public interface ProvenanceRegistry extends AiravataSubRegistry{
@@ -307,7 +307,7 @@ public interface ProvenanceRegistry exte
     public Date getWorkflowStartTime(WorkflowExecution workflowInstance)throws RegistryException;
     
     /**
-     * @deprecated - Will be removed from 0.9 release onwards. Use {@see #addGFacJob #updateGFacJob(GFacJob) etc.} functions instead.
+     * @deprecated - Will be removed from 0.9 release onwards. Use {@see #addApplicationJob #updateApplicationJob(ApplicationJob) etc.} functions instead.
      * This will store the gram specific data in to repository, this can be called before submitting the workflow in to Grid
      * @param workflowNodeGramData
      * @return
@@ -359,36 +359,35 @@ public interface ProvenanceRegistry exte
     public List<NodeExecutionError> getNodeExecutionErrors(String experimentId, String workflowInstanceId, String nodeId) throws RegistryException;
     
     /**
-     * Return errors defined for a GFac job 
+     * Return errors defined for a Application job 
      * @param experimentId
      * @param workflowInstanceId
      * @param nodeId
-     * @param gfacJobId
+     * @param jobId
      * @return
      * @throws RegistryException
      */
-    public List<GFacJobExecutionError> getGFacJobErrors(String experimentId, String workflowInstanceId, String nodeId, String gfacJobId) throws RegistryException;
+    public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId) throws RegistryException;
 
     /**
-     * Return errors defined for a GFac job 
-     * @param gfacJobId
+     * Return errors defined for a Application job 
+     * @param jobId
      * @return
      * @throws RegistryException
      */
-    public List<GFacJobExecutionError> getGFacJobErrors(String gfacJobId) throws RegistryException;
+    public List<ApplicationJobExecutionError> getApplicationJobErrors(String jobId) throws RegistryException;
 
     /**
      * Return errors filtered by the parameters
      * @param experimentId 
      * @param workflowInstanceId
      * @param nodeId
-     * @param gfacJobId
+     * @param jobId
      * @param filterBy - what type of source types the results should contain
      * @return
      * @throws RegistryException
      */
-    public List<ExecutionError> getExecutionErrors(String experimentId, String workflowInstanceId, String nodeId, String gfacJobId, ExecutionErrors.Source...filterBy) throws RegistryException;
-
+    public List<ExecutionError> getExecutionErrors(String experimentId, String workflowInstanceId, String nodeId, String jobId, ExecutionErrors.Source...filterBy) throws RegistryException;
     /**
      * Adds an experiment execution error 
      * @param error
@@ -414,104 +413,104 @@ public interface ProvenanceRegistry exte
     public int addNodeExecutionError(NodeExecutionError error) throws RegistryException;
 
     /**
-     * Adds an GFac job execution error 
+     * Adds an Application job execution error 
      * @param error
      * @return
      * @throws RegistryException
      */
-    public int addGFacJobExecutionError(GFacJobExecutionError error) throws RegistryException;
+    public int addApplicationJobExecutionError(ApplicationJobExecutionError error) throws RegistryException;
     
     
-	/*---------------------------------------  Managing Data for GFac Jobs ------------------------------------------*/
+	/*---------------------------------------  Managing Data for Application Jobs ------------------------------------------*/
 
     /**
-     * Returns <code>true</code> if a gfac job data is existing in the registry
-     * @param gfacJobId
+     * Returns <code>true</code> if a Application job data is existing in the registry
+     * @param jobId
      * @return
      * @throws RegistryException
      */
-    public boolean isGFacJobExists(String gfacJobId) throws RegistryException;
+    public boolean isApplicationJobExists(String jobId) throws RegistryException;
     
     /**
-     * Adding data related to a new GFac job submission
+     * Adding data related to a new Application job submission
      * @param job - the <code>jobId</code> cannot be <code>null</code>.
      * @throws RegistryException
      */
-    public void addGFacJob(GFacJob job) throws RegistryException;
+    public void addApplicationJob(ApplicationJob job) throws RegistryException;
     
     /**
-     * update data related to a existing GFac job record in the registry
+     * update data related to a existing Application job record in the registry
      * @param job - the <code>jobId</code> cannot be <code>null</code> and should already exist in registry
      * @throws RegistryException
      */
-    public void updateGFacJob(GFacJob job) throws RegistryException;
+    public void updateApplicationJob(ApplicationJob job) throws RegistryException;
     
     /**
      * Update the status of the job
-     * @param gfacJobId
+     * @param jobId
      * @param status
      * @throws RegistryException
      */
-    public void updateGFacJobStatus(String gfacJobId, GFacJobStatus status) throws RegistryException;
+    public void updateApplicationJobStatus(String jobId, ApplicationJobStatus status) throws RegistryException;
     
     /**
      * Update the job data. GFacProvider implementation should decide the job data. Typically it'll 
      * be a serialization of the submitted job query (eg: rsl for a GRAM job) 
-     * @param gfacJobId
+     * @param jobId
      * @param jobdata
      * @throws RegistryException
      */
-    public void updateGFacJobData(String gfacJobId, String jobdata) throws RegistryException;
+    public void updateApplicationJobData(String jobId, String jobdata) throws RegistryException;
     
     /**
      * Update the time of job submission or job started executing
-     * @param gfacJobId
+     * @param jobId
      * @param submitted
      * @throws RegistryException
      */
-    public void updateGFacJobSubmittedTime(String gfacJobId, Date submitted) throws RegistryException;
+    public void updateApplicationJobSubmittedTime(String jobId, Date submitted) throws RegistryException;
     
     /**
      * Update the time of job finished executing.
-     * @param gfacJobId
+     * @param jobId
      * @param completed
      * @throws RegistryException
      */
-    public void updateGFacJobCompletedTime(String gfacJobId, Date completed) throws RegistryException;
+    public void updateApplicationJobCompletedTime(String jobId, Date completed) throws RegistryException;
     
     /**
      * Custom data field for users
-     * @param gfacJobId
+     * @param jobId
      * @param metadata
      * @throws RegistryException
      */
-    public void updateGFacJobMetadata(String gfacJobId, String metadata) throws RegistryException;
+    public void updateApplicationJobMetadata(String jobId, String metadata) throws RegistryException;
     
     /**
-     * Retrieve the GFac Job for the given job id
-     * @param gfacJobId
+     * Retrieve the Application Job for the given job id
+     * @param jobId
      * @return
      * @throws RegistryException
      */
-    public GFacJob getGFacJob(String gfacJobId) throws RegistryException;
+    public ApplicationJob getApplicationJob(String jobId) throws RegistryException;
     
     /**
-     * Retrieve a list of GFac jobs executed for the given descriptors
+     * Retrieve a list of Application jobs executed for the given descriptors
      * @param serviceDescriptionId - should be <code>null</code> if user does not care what service description the job corresponds to
      * @param hostDescriptionId - should be <code>null</code> if user does not care what host description the job corresponds to
      * @param applicationDescriptionId - should be <code>null</code> if user does not care what application description the job corresponds to
      * @return
      * @throws RegistryException
      */
-    public List<GFacJob> getGFacJobsForDescriptors(String serviceDescriptionId, String hostDescriptionId, String applicationDescriptionId) throws RegistryException;
+    public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId, String hostDescriptionId, String applicationDescriptionId) throws RegistryException;
     
     /**
-     * Retrieve a list of GFac jobs executed for the given experiment credentials
+     * Retrieve a list of Application jobs executed for the given experiment credentials
      * @param experimentId - should be <code>null</code> if user does not care what experiment the job corresponds to
      * @param workflowExecutionId -  - should be <code>null</code> if user does not care what workflow execution the job corresponds to
      * @param nodeId  - should be <code>null</code> if user does not care what node id the job corresponds to
      * @return
      * @throws RegistryException
      */
-    public List<GFacJob> getGFacJobs(String experimentId, String workflowExecutionId, String nodeId) throws RegistryException;
+    public List<ApplicationJob> getApplicationJobs(String experimentId, String workflowExecutionId, String nodeId) throws RegistryException;
 }
\ No newline at end of file

Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java (from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobAlreadyExistsException.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobAlreadyExistsException.java&r1=1487929&r2=1487952&rev=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobAlreadyExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java Thu May 30 18:14:06 2013
@@ -23,12 +23,12 @@ package org.apache.airavata.registry.api
 
 import org.apache.airavata.registry.api.exception.RegistryException;
 
-public class GFacJobAlreadyExistsException extends RegistryException {
+public class ApplicationJobAlreadyExistsException extends RegistryException {
 
 	private static final long serialVersionUID = -8006347245307495767L;
 
-	public GFacJobAlreadyExistsException(String jobId) {
-		super("A GFac job from the ID '"+jobId+"' is already present in the registry!!!");
+	public ApplicationJobAlreadyExistsException(String jobId) {
+		super("A Application job from the ID '"+jobId+"' is already present in the registry!!!");
 	}
 
 }

Propchange: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobAlreadyExistsException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java (from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobDoesNotExistsException.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobDoesNotExistsException.java&r1=1487929&r2=1487952&rev=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/GFacJobDoesNotExistsException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java Thu May 30 18:14:06 2013
@@ -23,12 +23,12 @@ package org.apache.airavata.registry.api
 
 import org.apache.airavata.registry.api.exception.RegistryException;
 
-public class GFacJobDoesNotExistsException extends RegistryException {
+public class ApplicationJobDoesNotExistsException extends RegistryException {
 
 	private static final long serialVersionUID = -8006347245307495767L;
 
-	public GFacJobDoesNotExistsException(String jobId) {
-		super("There is no GFac job corresponding to ID '"+jobId+"' present in the registry!!!");
+	public ApplicationJobDoesNotExistsException(String jobId) {
+		super("There is no Application job corresponding to ID '"+jobId+"' present in the registry!!!");
 	}
 
 }

Propchange: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/ApplicationJobDoesNotExistsException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java (from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidGFacJobIDException.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidGFacJobIDException.java&r1=1487929&r2=1487952&rev=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidGFacJobIDException.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java Thu May 30 18:14:06 2013
@@ -23,12 +23,12 @@ package org.apache.airavata.registry.api
 
 import org.apache.airavata.registry.api.exception.RegistryException;
 
-public class InvalidGFacJobIDException extends RegistryException {
+public class InvalidApplicationJobIDException extends RegistryException {
 
 	private static final long serialVersionUID = -8006347245307495767L;
 
-	public InvalidGFacJobIDException() {
-		super("The GFac job ID cannot be null or empty!!!");
+	public InvalidApplicationJobIDException() {
+		super("The Application job ID cannot be null or empty!!!");
 	}
 
 }

Propchange: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/exception/worker/InvalidApplicationJobIDException.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java (from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJob.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJob.java&r1=1487929&r2=1487952&rev=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJob.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java Thu May 30 18:14:06 2013
@@ -28,8 +28,8 @@ import java.util.Date;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
-public class GFacJob {
-	public static enum GFacJobStatus{
+public class ApplicationJob {
+	public static enum ApplicationJobStatus{
 		SUBMITTED, //job is submitted, possibly waiting to start executing
 		EXECUTING, //submitted job is being executed
 		CANCELLED, //job was cancelled
@@ -53,7 +53,7 @@ public class GFacJob {
 	
 	private Date submittedTime;
 	private Date completedTime;
-	private GFacJobStatus jobStatus;
+	private ApplicationJobStatus jobStatus;
 	
 	private String metadata;
 
@@ -137,11 +137,11 @@ public class GFacJob {
 		this.completedTime = completedTime;
 	}
 
-	public GFacJobStatus getJobStatus() {
+	public ApplicationJobStatus getJobStatus() {
 		return jobStatus;
 	}
 
-	public void setJobStatus(GFacJobStatus jobStatus) {
+	public void setJobStatus(ApplicationJobStatus jobStatus) {
 		this.jobStatus = jobStatus;
 	}
 

Propchange: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJobExecutionError.java (from r1487929, airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJobExecutionError.java)
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJobExecutionError.java?p2=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJobExecutionError.java&p1=airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJobExecutionError.java&r1=1487929&r2=1487952&rev=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/GFacJobExecutionError.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJobExecutionError.java Thu May 30 18:14:06 2013
@@ -27,11 +27,11 @@ import javax.xml.bind.annotation.XmlRoot
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
-public class GFacJobExecutionError extends ExecutionError {
+public class ApplicationJobExecutionError extends ExecutionError {
 	private String experimentId;
 	private String workflowInstanceId;
 	private String nodeId;
-	private String gfacJobId;
+	private String jobId;
 
 	public String getExperimentId() {
 		return experimentId;
@@ -57,11 +57,11 @@ public class GFacJobExecutionError exten
 		this.nodeId = nodeId;
 	}
 
-	public String getGfacJobId() {
-		return gfacJobId;
+	public String getJobId() {
+		return jobId;
 	}
 
-	public void setGfacJobId(String gfacJobId) {
-		this.gfacJobId = gfacJobId;
+	public void setJobId(String jobId) {
+		this.jobId = jobId;
 	}
 }

Propchange: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJobExecutionError.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=1487952&r1=1487951&r2=1487952&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 Thu May 30 18:14:06 2013
@@ -1949,7 +1949,7 @@ public class ProvenanceResourceClient {
         return nodeErrorsList.getNodeExecutionErrorList();
     }
 
-    public List<GFacJobExecutionError> getGFacJobErrors(String experimentId,
+    public List<ApplicationJobExecutionError> getGFacJobErrors(String experimentId,
                                                         String workflowInstanceId,
                                                         String nodeId,
                                                         String gfacJobId){
@@ -2002,7 +2002,7 @@ public class ProvenanceResourceClient {
         return gFacErrorsList.getgFacJobExecutionErrorList();
     }
 
-    public List<GFacJobExecutionError> getGFacJobErrors(String gfacJobId){
+    public List<ApplicationJobExecutionError> getGFacJobErrors(String gfacJobId){
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.GET_ALL_GFAC_ERRORS);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
@@ -2229,7 +2229,7 @@ public class ProvenanceResourceClient {
         return 0;
     }
 
-    public int addGFacJobExecutionError(GFacJobExecutionError error){
+    public int addGFacJobExecutionError(ApplicationJobExecutionError error){
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.ADD_GFAC_ERROR);
         builder = BasicAuthHeaderUtil.getBuilder(
@@ -2269,7 +2269,7 @@ public class ProvenanceResourceClient {
         return 0;
     }
 
-    public void addGFacJob(GFacJob job) {
+    public void addGFacJob(ApplicationJob job) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.ADD_GFAC_JOB);
         builder = BasicAuthHeaderUtil.getBuilder(
@@ -2306,7 +2306,7 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public void updateGFacJob(GFacJob job) {
+    public void updateGFacJob(ApplicationJob job) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB);
         builder = BasicAuthHeaderUtil.getBuilder(
@@ -2343,7 +2343,7 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public void updateGFacJobStatus(String gfacJobId, GFacJob.GFacJobStatus status) {
+    public void updateGFacJobStatus(String gfacJobId, ApplicationJob.ApplicationJobStatus status) {
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB_STATUS);
         MultivaluedMap formParams = new MultivaluedMapImpl();
@@ -2548,7 +2548,7 @@ public class ProvenanceResourceClient {
         }
     }
 
-    public GFacJob getGFacJob(String gfacJobId){
+    public ApplicationJob getGFacJob(String gfacJobId){
         webResource = getProvenanceRegistryBaseResource().path(
                 ResourcePathConstants.ProvenanceResourcePathConstants.GET_GFAC_JOB);
         MultivaluedMap queryParams = new MultivaluedMapImpl();
@@ -2590,11 +2590,11 @@ public class ProvenanceResourceClient {
                     + status);
         }
 
-        GFacJob gFacJob = response.getEntity(GFacJob.class);
+        ApplicationJob gFacJob = response.getEntity(ApplicationJob.class);
         return gFacJob;
     }
 
-    public List<GFacJob> getGFacJobsForDescriptors(String serviceDescriptionId,
+    public List<ApplicationJob> getGFacJobsForDescriptors(String serviceDescriptionId,
                                                    String hostDescriptionId,
                                                    String applicationDescriptionId){
         webResource = getProvenanceRegistryBaseResource().path(
@@ -2644,7 +2644,7 @@ public class ProvenanceResourceClient {
         return gFacJobList.getJobList();
     }
 
-    public List<GFacJob> getGFacJobs(String experimentId,
+    public List<ApplicationJob> getGFacJobs(String experimentId,
                                      String workflowExecutionId,
                                      String nodeId) {
         webResource = getProvenanceRegistryBaseResource().path(

Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java (original)
+++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java Thu May 30 18:14:06 2013
@@ -40,7 +40,7 @@ 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.workflow.*;
-import org.apache.airavata.registry.api.workflow.GFacJob.GFacJobStatus;
+import org.apache.airavata.registry.api.workflow.ApplicationJob.ApplicationJobStatus;
 import org.apache.airavata.rest.utils.CookieManager;
 
 public class RegistryClient extends AiravataRegistry2 {
@@ -858,14 +858,14 @@ public class RegistryClient extends Aira
 	}
 
 	@Override
-	public List<GFacJobExecutionError> getGFacJobErrors(String experimentId,
+	public List<ApplicationJobExecutionError> getApplicationJobErrors(String experimentId,
 			String workflowInstanceId, String nodeId, String gfacJobId)
 			throws RegistryException {
 		return getProvenanceResourceClient().getGFacJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId);
 	}
 
 	@Override
-	public List<GFacJobExecutionError> getGFacJobErrors(String gfacJobId)
+	public List<ApplicationJobExecutionError> getApplicationJobErrors(String gfacJobId)
 			throws RegistryException {
 		return getProvenanceResourceClient().getGFacJobErrors(gfacJobId);
 	}
@@ -896,78 +896,78 @@ public class RegistryClient extends Aira
 	}
 
 	@Override
-	public int addGFacJobExecutionError(GFacJobExecutionError error)
+	public int addApplicationJobExecutionError(ApplicationJobExecutionError error)
 			throws RegistryException {
 		return getProvenanceResourceClient().addGFacJobExecutionError(error);
 	}
 
 	@Override
-	public void addGFacJob(GFacJob job) throws RegistryException {
+	public void addApplicationJob(ApplicationJob job) throws RegistryException {
 		getProvenanceResourceClient().addGFacJob(job);
 		
 	}
 
 	@Override
-	public void updateGFacJob(GFacJob job) throws RegistryException {
+	public void updateApplicationJob(ApplicationJob job) throws RegistryException {
         getProvenanceResourceClient().updateGFacJob(job);
 		
 	}
 
 	@Override
-	public void updateGFacJobStatus(String gfacJobId, GFacJobStatus status)
+	public void updateApplicationJobStatus(String gfacJobId, ApplicationJobStatus status)
 			throws RegistryException {
         getProvenanceResourceClient().updateGFacJobStatus(gfacJobId, status);
 		
 	}
 
 	@Override
-	public void updateGFacJobData(String gfacJobId, String jobdata)
+	public void updateApplicationJobData(String gfacJobId, String jobdata)
 			throws RegistryException {
         getProvenanceResourceClient().updateGFacJobData(gfacJobId, jobdata);
 		
 	}
 
 	@Override
-	public void updateGFacJobSubmittedTime(String gfacJobId, Date submitted)
+	public void updateApplicationJobSubmittedTime(String gfacJobId, Date submitted)
 			throws RegistryException {
         getProvenanceResourceClient().updateGFacJobSubmittedTime(gfacJobId, submitted);
 		
 	}
 
 	@Override
-	public void updateGFacJobCompletedTime(String gfacJobId, Date completed)
+	public void updateApplicationJobCompletedTime(String gfacJobId, Date completed)
 			throws RegistryException {
         getProvenanceResourceClient().updateGFacJobCompletedTime(gfacJobId, completed);
 		
 	}
 
 	@Override
-	public void updateGFacJobMetadata(String gfacJobId, String metadata)
+	public void updateApplicationJobMetadata(String gfacJobId, String metadata)
 			throws RegistryException {
         getProvenanceResourceClient().updateGFacJobMetadata(gfacJobId, metadata);
 		
 	}
 
 	@Override
-	public GFacJob getGFacJob(String gfacJobId) throws RegistryException {
+	public ApplicationJob getApplicationJob(String gfacJobId) throws RegistryException {
 		return getProvenanceResourceClient().getGFacJob(gfacJobId);
 	}
 
 	@Override
-	public List<GFacJob> getGFacJobsForDescriptors(String serviceDescriptionId,
+	public List<ApplicationJob> getApplicationJobsForDescriptors(String serviceDescriptionId,
 			String hostDescriptionId, String applicationDescriptionId)
 			throws RegistryException {
 		return getProvenanceResourceClient().getGFacJobsForDescriptors(serviceDescriptionId, hostDescriptionId, applicationDescriptionId);
 	}
 
 	@Override
-	public List<GFacJob> getGFacJobs(String experimentId,
+	public List<ApplicationJob> getApplicationJobs(String experimentId,
 			String workflowExecutionId, String nodeId) throws RegistryException {
 		return getProvenanceResourceClient().getGFacJobs(experimentId, workflowExecutionId, nodeId);
 	}
 
 	@Override
-	public boolean isGFacJobExists(String gfacJobId) throws RegistryException {
+	public boolean isApplicationJobExists(String gfacJobId) throws RegistryException {
 		return getProvenanceResourceClient().isGFacJobExists(gfacJobId);
 	}
 }

Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacErrorsList.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacErrorsList.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacErrorsList.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacErrorsList.java Thu May 30 18:14:06 2013
@@ -1,6 +1,6 @@
 package org.apache.airavata.rest.mappings.resourcemappings;
 
-import org.apache.airavata.registry.api.workflow.GFacJobExecutionError;
+import org.apache.airavata.registry.api.workflow.ApplicationJobExecutionError;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
@@ -8,13 +8,13 @@ import java.util.List;
 
 @XmlRootElement
 public class GFacErrorsList {
-    private List<GFacJobExecutionError> gFacJobExecutionErrorList = new ArrayList<GFacJobExecutionError>();
+    private List<ApplicationJobExecutionError> gFacJobExecutionErrorList = new ArrayList<ApplicationJobExecutionError>();
 
-    public List<GFacJobExecutionError> getgFacJobExecutionErrorList() {
+    public List<ApplicationJobExecutionError> getgFacJobExecutionErrorList() {
         return gFacJobExecutionErrorList;
     }
 
-    public void setgFacJobExecutionErrorList(List<GFacJobExecutionError> gFacJobExecutionErrorList) {
+    public void setgFacJobExecutionErrorList(List<ApplicationJobExecutionError> gFacJobExecutionErrorList) {
         this.gFacJobExecutionErrorList = gFacJobExecutionErrorList;
     }
 }

Modified: airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacJobList.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacJobList.java?rev=1487952&r1=1487951&r2=1487952&view=diff
==============================================================================
--- airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacJobList.java (original)
+++ airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/GFacJobList.java Thu May 30 18:14:06 2013
@@ -20,7 +20,7 @@
  */
 package org.apache.airavata.rest.mappings.resourcemappings;
 
-import org.apache.airavata.registry.api.workflow.GFacJob;
+import org.apache.airavata.registry.api.workflow.ApplicationJob;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.ArrayList;
@@ -28,13 +28,13 @@ import java.util.List;
 
 @XmlRootElement
 public class GFacJobList {
-    List<GFacJob> jobList = new ArrayList<GFacJob>();
+    List<ApplicationJob> jobList = new ArrayList<ApplicationJob>();
 
-    public List<GFacJob> getJobList() {
+    public List<ApplicationJob> getJobList() {
         return jobList;
     }
 
-    public void setJobList(List<GFacJob> jobList) {
+    public void setJobList(List<ApplicationJob> jobList) {
         this.jobList = jobList;
     }
 }

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=1487952&r1=1487951&r2=1487952&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 Thu May 30 18:14:06 2013
@@ -1438,7 +1438,7 @@ public class ProvenanceRegistryResource 
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
             GFacErrorsList gFacErrorsList = new GFacErrorsList();
-            List<GFacJobExecutionError> gFacJobErrors = airavataRegistry.getGFacJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId);
+            List<ApplicationJobExecutionError> gFacJobErrors = airavataRegistry.getApplicationJobErrors(experimentId, workflowInstanceId, nodeId, gfacJobId);
             if (gFacJobErrors.size() != 0) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
                 gFacErrorsList.setgFacJobExecutionErrorList(gFacJobErrors);
@@ -1464,7 +1464,7 @@ public class ProvenanceRegistryResource 
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
             GFacErrorsList gFacErrorsList = new GFacErrorsList();
-            List<GFacJobExecutionError> gFacJobErrors = airavataRegistry.getGFacJobErrors(gfacJobId);
+            List<ApplicationJobExecutionError> gFacJobErrors = airavataRegistry.getApplicationJobErrors(gfacJobId);
             if (gFacJobErrors.size() != 0) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
                 gFacErrorsList.setgFacJobExecutionErrorList(gFacJobErrors);
@@ -1598,10 +1598,10 @@ public class ProvenanceRegistryResource 
     @Path(ResourcePathConstants.ProvenanceResourcePathConstants.ADD_GFAC_ERROR)
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Produces(MediaType.TEXT_PLAIN)
-    public Response addGFacJobExecutionError(GFacJobExecutionError error) {
+    public Response addGFacJobExecutionError(ApplicationJobExecutionError error) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            int errorID = airavataRegistry.addGFacJobExecutionError(error);
+            int errorID = airavataRegistry.addApplicationJobExecutionError(error);
             if (errorID != 0){
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
                 builder.entity(errorID);
@@ -1623,10 +1623,10 @@ public class ProvenanceRegistryResource 
     @Path(ResourcePathConstants.ProvenanceResourcePathConstants.ADD_GFAC_JOB)
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Produces(MediaType.TEXT_PLAIN)
-    public Response addGFacJob(GFacJob job) {
+    public Response addGFacJob(ApplicationJob job) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            airavataRegistry.addGFacJob(job);
+            airavataRegistry.addApplicationJob(job);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("GFac Job added successfully");
             return builder.build();
@@ -1643,10 +1643,10 @@ public class ProvenanceRegistryResource 
     @Path(ResourcePathConstants.ProvenanceResourcePathConstants.UPDATE_GFAC_JOB)
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     @Produces(MediaType.TEXT_PLAIN)
-    public Response updateGFacJob(GFacJob job) {
+    public Response updateGFacJob(ApplicationJob job) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            airavataRegistry.updateGFacJob(job);
+            airavataRegistry.updateApplicationJob(job);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("GFac Job updated successfully");
             return builder.build();
@@ -1667,8 +1667,8 @@ public class ProvenanceRegistryResource 
                                         @FormParam("gfacJobStatus") String gfacJobStatus ) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            GFacJob.GFacJobStatus status = GFacJob.GFacJobStatus.valueOf(gfacJobStatus);
-            airavataRegistry.updateGFacJobStatus(gfacJobID, status);
+            ApplicationJob.ApplicationJobStatus status = ApplicationJob.ApplicationJobStatus.valueOf(gfacJobStatus);
+            airavataRegistry.updateApplicationJobStatus(gfacJobID, status);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("GFac Job status updated successfully");
             return builder.build();
@@ -1689,7 +1689,7 @@ public class ProvenanceRegistryResource 
                                       @FormParam("jobdata") String jobdata ) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            airavataRegistry.updateGFacJobData(gfacJobID, jobdata);
+            airavataRegistry.updateApplicationJobData(gfacJobID, jobdata);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("GFac Job data updated successfully");
             return builder.build();
@@ -1712,7 +1712,7 @@ public class ProvenanceRegistryResource 
         try {
             DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date formattedDate = dateFormat.parse(submittedDate);
-            airavataRegistry.updateGFacJobSubmittedTime(gfacJobID, formattedDate);
+            airavataRegistry.updateApplicationJobSubmittedTime(gfacJobID, formattedDate);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("GFac Job data submitted date updated successfully");
             return builder.build();
@@ -1735,7 +1735,7 @@ public class ProvenanceRegistryResource 
         try {
             DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date formattedDate = dateFormat.parse(completedDate);
-            airavataRegistry.updateGFacJobCompletedTime(gfacJobID, formattedDate);
+            airavataRegistry.updateApplicationJobCompletedTime(gfacJobID, formattedDate);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("GFac Job data completed date updated successfully");
             return builder.build();
@@ -1756,7 +1756,7 @@ public class ProvenanceRegistryResource 
                                           @FormParam("metadata") String metadata ) {
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            airavataRegistry.updateGFacJobMetadata(gfacJobID, metadata);
+            airavataRegistry.updateApplicationJobMetadata(gfacJobID, metadata);
             Response.ResponseBuilder builder = Response.status(Response.Status.OK);
             builder.entity("GFac Job metadata updated successfully");
             return builder.build();
@@ -1775,7 +1775,7 @@ public class ProvenanceRegistryResource 
     public Response getGFacJob(@QueryParam("gfacJobId") String gfacJobId){
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            GFacJob gFacJob = airavataRegistry.getGFacJob(gfacJobId);
+            ApplicationJob gFacJob = airavataRegistry.getApplicationJob(gfacJobId);
             if (gFacJob != null) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
                 builder.entity(gFacJob);
@@ -1802,7 +1802,7 @@ public class ProvenanceRegistryResource 
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
             GFacJobList gFacJobList = new GFacJobList();
-            List<GFacJob> gFacJobsForDescriptors = airavataRegistry.getGFacJobsForDescriptors(serviceDescriptionId, hostDescriptionId, applicationDescriptionId);
+            List<ApplicationJob> gFacJobsForDescriptors = airavataRegistry.getApplicationJobsForDescriptors(serviceDescriptionId, hostDescriptionId, applicationDescriptionId);
             gFacJobList.setJobList(gFacJobsForDescriptors);
             if (gFacJobsForDescriptors.size() != 0) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -1830,7 +1830,7 @@ public class ProvenanceRegistryResource 
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
             GFacJobList gFacJobList = new GFacJobList();
-            List<GFacJob> gFacJobsForDescriptors = airavataRegistry.getGFacJobsForDescriptors(experimentID, workflowInstanceID, nodeID);
+            List<ApplicationJob> gFacJobsForDescriptors = airavataRegistry.getApplicationJobsForDescriptors(experimentID, workflowInstanceID, nodeID);
             gFacJobList.setJobList(gFacJobsForDescriptors);
             if (gFacJobsForDescriptors.size() != 0) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
@@ -1855,7 +1855,7 @@ public class ProvenanceRegistryResource 
     public Response isGFacJobExists(@QueryParam("gfacJobId") String gfacJobId){
         AiravataRegistry2 airavataRegistry = RegPoolUtils.acquireRegistry(context);
         try {
-            boolean gFacJobExists = airavataRegistry.isGFacJobExists(gfacJobId);
+            boolean gFacJobExists = airavataRegistry.isApplicationJobExists(gfacJobId);
             if (gFacJobExists) {
                 Response.ResponseBuilder builder = Response.status(Response.Status.OK);
                 builder.entity("true");



Mime
View raw message