svn commit: r1447775 - in /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya: XBayaConfiguration.java invoker/EmbeddedGFacInvoker.java

[lahiru]

Author: lahiru
Date: Tue Feb 19 15:58:25 2013
New Revision: 1447775

URL: http://svn.apache.org/r1447775
Log:
adding workflowcontext header processing.

Modified:
    
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
    
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java

Modified: 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java?rev=1447775&r1=1447774&r2=1447775&view=diff
==============================================================================
--- 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
 (original)
+++ 
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConfiguration.java
 Tue Feb 19 15:58:25 2013
@@ -29,6 +29,7 @@ import java.util.Observable;
 import java.util.Observer;
 
 import org.apache.airavata.client.api.AiravataAPI;
+import org.apache.airavata.schemas.wec.ContextHeaderDocument;
 import 
org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
 import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
 import org.apache.airavata.xbaya.file.XBayaPathConstants;
@@ -36,6 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import xsul.lead.LeadDeploymentConfig;
+import xsul.lead.types.context.ContextDocument;
 
 public class XBayaConfiguration extends Observable implements Observer {
 
@@ -145,7 +147,8 @@ public class XBayaConfiguration extends 
     private List<XBayaExecutionModeListener> 
xbayaExecutionModeChangeListners=new ArrayList<XBayaExecutionModeListener>();
 
     private boolean regURLSetByCMD = false;
-    
+
+    private ContextHeaderDocument.ContextHeader contextHeader;
     public enum XBayaExecutionMode{
        IDE,
        MONITOR
@@ -941,4 +944,12 @@ public class XBayaConfiguration extends 
 //        }
 //        return airavataAPI;
 //    }
+
+    public ContextHeaderDocument.ContextHeader getContextHeader() {
+        return contextHeader;
+    }
+
+    public void setContextHeader(ContextHeaderDocument.ContextHeader 
contextHeader) {
+        this.contextHeader = contextHeader;
+    }
 }
\ No newline at end of file

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=1447775&r1=1447774&r2=1447775&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 Feb 19 15:58:25 2013
@@ -33,15 +33,14 @@ import javax.xml.stream.XMLStreamReader;
 import org.apache.airavata.client.api.AiravataAPI;
 import org.apache.airavata.client.api.AiravataAPIInvocationException;
 import org.apache.airavata.common.utils.ServerSettings;
+import 
org.apache.airavata.common.workflow.execution.context.WorkflowContextHeaderBuilder;
 import org.apache.airavata.commons.gfac.type.*;
-import org.apache.airavata.core.gfac.exception.ProviderException;
 import org.apache.airavata.gfac.Constants;
 import org.apache.airavata.gfac.GFacAPI;
 import org.apache.airavata.gfac.GFacConfiguration;
 import org.apache.airavata.gfac.context.ApplicationContext;
 import org.apache.airavata.gfac.context.JobExecutionContext;
 import org.apache.airavata.gfac.context.MessageContext;
-import org.apache.airavata.gfac.provider.GFacProviderException;
 import org.apache.airavata.gfac.utils.GFacUtils;
 import org.apache.airavata.registry.api.exception.RegistryException;
 import org.apache.airavata.common.utils.XMLUtil;
@@ -257,6 +256,8 @@ public class EmbeddedGFacInvoker impleme
             this.notifier.invokingService(new WSIFMessageElement((XmlElement) 
wsifMessageElement));
             GFacConfiguration gFacConfiguration = GFacConfiguration.create(new 
File(resource.getPath()), airavataAPI, ServerSettings.getProperties());
             JobExecutionContext jobExecutionContext = new 
JobExecutionContext(gFacConfiguration, serviceName);
+            //Here we get only the contextheader information sent specific for 
this node
+            
jobExecutionContext.setContextHeader(WorkflowContextHeaderBuilder.removeOtherSchedulingConfig(nodeID,configuration.getContextHeader()));
 
             
jobExecutionContext.setProperty(Constants.PROP_WORKFLOW_NODE_ID,this.nodeID);
             
jobExecutionContext.setProperty(Constants.PROP_TOPIC,this.configuration.getTopic());