svn commit: r1558189 - in /airavata/trunk/modules: gfac/gfac-core/src/main/java/org/apache/airavata/gfac/ registry/registry-api/src/main/java/org/apache/airavata/registry/api/ xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/

[la...@apache.org]

Author: lahiru
Date: Tue Jan 14 20:58:52 2014
New Revision: 1558189

URL: http://svn.apache.org/r1558189
Log:
gfac changes to incorporate orchestrator integration.

Modified:
    airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java
    airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/JobRequest.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java

Modified: airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java?rev=1558189&r1=1558188&r2=1558189&view=diff
==============================================================================
--- airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java (original)
+++ airavata/trunk/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacAPI.java Tue Jan 14 20:58:52 2014
@@ -23,6 +23,8 @@ package org.apache.airavata.gfac;
 
 import java.util.List;
 
+import org.apache.airavata.client.AiravataClient;
+import org.apache.airavata.common.utils.AiravataJobState;
 import org.apache.airavata.gfac.context.JobExecutionContext;
 import org.apache.airavata.gfac.handler.GFacHandler;
 import org.apache.airavata.gfac.handler.GFacHandlerConfig;
@@ -32,6 +34,7 @@ import org.apache.airavata.gfac.notifica
 import org.apache.airavata.gfac.notification.listeners.WorkflowTrackingListener;
 import org.apache.airavata.gfac.provider.GFacProvider;
 import org.apache.airavata.gfac.provider.GFacProviderException;
+import org.apache.airavata.registry.api.AiravataRegistry2;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,11 +60,14 @@ public class GFacAPI {
     private void schedule(JobExecutionContext jobExecutionContext) throws GFacException {
         // Scheduler will decide the execution flow of handlers and provider which handles
         // the job.
+        String experimentID = jobExecutionContext.getExperimentID();
         try {
+            AiravataRegistry2 registry2 = ((AiravataClient)jobExecutionContext.getGFacConfiguration().getAiravataAPI()).getRegistryClient();
             Scheduler.schedule(jobExecutionContext);
 
             // Executing in handlers in the order as they have configured in GFac configuration
             invokeInFlowHandlers(jobExecutionContext);
+            registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.INHANDLERSDONE);
 
 
             // After executing the in handlers provider instance should be set to job execution context.
@@ -73,6 +79,7 @@ public class GFacAPI {
                 disposeProvider(provider, jobExecutionContext);
             }
             invokeOutFlowHandlers(jobExecutionContext);
+            registry2.changeStatus(jobExecutionContext.getExperimentID(),AiravataJobState.State.OUTHANDLERSDONE);
         }catch (Exception e){
             jobExecutionContext.setProperty(ERROR_SENT,"true");
             jobExecutionContext.getNotifier().publish(new ExecutionFailEvent(e.getCause()));

Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/JobRequest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/JobRequest.java?rev=1558189&r1=1558188&r2=1558189&view=diff
==============================================================================
--- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/JobRequest.java (original)
+++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/JobRequest.java Tue Jan 14 20:58:52 2014
@@ -50,6 +50,16 @@ public class JobRequest {
 
     private ContextHeaderDocument.ContextHeader contextHeader;
 
+    private String serviceName;
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
     public Map<String, Object> getInputParameters() {
         return inputParameters;
     }

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1558189&r1=1558188&r2=1558189&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Tue Jan 14 20:58:52 2014
@@ -84,7 +84,8 @@ import xsul.wsif.WSIFMessage;
 import xsul.wsif.impl.WSIFMessageElement;
 import xsul.xwsif_runtime.WSIFClient;
 
-public class EmbeddedGFacInvoker implements Invoker {
+public class
+        EmbeddedGFacInvoker implements Invoker {
 
     private static final Logger logger = LoggerFactory.getLogger(EmbeddedGFacInvoker.class);