svn commit: r1515693 - in /airavata/trunk/modules: airavata-client/src/main/java/org/apache/airavata/client/impl/ commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/

[samindaw]

Author: samindaw
Date: Tue Aug 20 03:08:37 2013
New Revision: 1515693

URL: http://svn.apache.org/r1515693
Log:
fixing context header loading issue + scheduling context object improvements

Modified:
    
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/NodeSettingsImpl.java
    
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowSchedulingSettingsImpl.java
    
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java

Modified: 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/NodeSettingsImpl.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/NodeSettingsImpl.java?rev=1515693&r1=1515692&r2=1515693&view=diff
==============================================================================
--- 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/NodeSettingsImpl.java
 (original)
+++ 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/NodeSettingsImpl.java
 Tue Aug 20 03:08:37 2013
@@ -21,6 +21,7 @@
 
 package org.apache.airavata.client.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.airavata.client.api.HPCSettings;
@@ -92,6 +93,9 @@ public class NodeSettingsImpl implements
 
        @Override
        public List<NameValuePairType> getNameValuePair() {
+               if (nameValuePair==null){
+                       nameValuePair=new ArrayList<NameValuePairType>();
+               }
                return nameValuePair;
        }
 

Modified: 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowSchedulingSettingsImpl.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowSchedulingSettingsImpl.java?rev=1515693&r1=1515692&r2=1515693&view=diff
==============================================================================
--- 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowSchedulingSettingsImpl.java
 (original)
+++ 
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowSchedulingSettingsImpl.java
 Tue Aug 20 03:08:37 2013
@@ -57,6 +57,7 @@ public class WorkflowSchedulingSettingsI
                NodeSettingsImpl nodeSettings = new NodeSettingsImpl(nodeId, 
serviceId);
                nodeSettings.getHPCSettings().setCPUCount(cpuCount);
                nodeSettings.getHPCSettings().setNodeCount(nodeCount);
+               addNewNodeSettings(nodeSettings);
                return nodeSettings;
        }
 

Modified: 
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java?rev=1515693&r1=1515692&r2=1515693&view=diff
==============================================================================
--- 
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
 (original)
+++ 
airavata/trunk/modules/commons/workflow-execution-context/src/main/java/org/apache/airavata/common/workflow/execution/context/WorkflowContextHeaderBuilder.java
 Tue Aug 20 03:08:37 2013
@@ -61,6 +61,11 @@ public class WorkflowContextHeaderBuilde
         this.contextHeader = document;
         if (contextHeader!=null) {
                        this.securityContext = 
contextHeader.getSecurityContext();
+                       
this.workflowSchedulingContext=contextHeader.getWorkflowSchedulingContext();
+                       this.soaServiceEprs=contextHeader.getSoaServiceEprs();
+                       
this.workflowMonitoringContext=contextHeader.getWorkflowMonitoringContext();
+                       
this.workflowOutputDataHandling=contextHeader.getWorkflowOutputDataHandling();
+                       this.userIdentifier=contextHeader.getUserIdentifier();
                }
     }