Author: samindaw
Date: Wed Jan 16 21:03:19 2013
New Revision: 1434393
URL: http://svn.apache.org/viewvc?rev=1434393&view=rev
Log:
updating overload method to support nodeId as well
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowOutputDataSettings.java
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationOutputDataSettingsImpl.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/WorkflowOutputDataSettingsImpl.java
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowOutputDataSettings.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowOutputDataSettings.java?rev=1434393&r1=1434392&r2=1434393&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowOutputDataSettings.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/WorkflowOutputDataSettings.java
Wed Jan 16 21:03:19 2013
@@ -43,7 +43,7 @@ public interface WorkflowOutputDataSetti
* @param isDataPersistent
* @return
*/
- public OutputDataSettings addNewOutputDataSettings(String
outputDataDirectory, String dataRegistryURL, boolean isDataPersistent);
+ public OutputDataSettings addNewOutputDataSettings(String nodeId,
String outputDataDirectory, String dataRegistryURL, boolean isDataPersistent);
/**
* Add new application putput data settings
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationOutputDataSettingsImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationOutputDataSettingsImpl.java?rev=1434393&r1=1434392&r2=1434393&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationOutputDataSettingsImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ApplicationOutputDataSettingsImpl.java
Wed Jan 16 21:03:19 2013
@@ -30,10 +30,10 @@ public class ApplicationOutputDataSettin
private Boolean dataPersistent;
public ApplicationOutputDataSettingsImpl(String nodeId) {
- setNodeId(nodeId);
+ this(nodeId, null,null,null);
}
- public ApplicationOutputDataSettingsImpl(String outputDataDirectory,
String dataRegistryUrl, Boolean dataPersistent) {
+ public ApplicationOutputDataSettingsImpl(String nodeId, String
outputDataDirectory, String dataRegistryUrl, Boolean dataPersistent) {
setOutputDataDirectory(outputDataDirectory);
setDataRegistryUrl(dataRegistryUrl);
setDataPersistent(dataPersistent);
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=1434393&r1=1434392&r2=1434393&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
Wed Jan 16 21:03:19 2013
@@ -348,7 +348,7 @@ public class ExecutionManagerImpl implem
}
ApplicationOutputDataHandling[] dataHandlingSettings =
builder.getWorkflowOutputDataHandling().getApplicationOutputDataHandlingArray();
for (ApplicationOutputDataHandling handling :
dataHandlingSettings) {
-
options.getCustomWorkflowOutputDataSettings().addNewOutputDataSettings(handling.getOutputDataDirectory(),handling.getDataRegistryUrl(),handling.getDataPersistance());
+
options.getCustomWorkflowOutputDataSettings().addNewOutputDataSettings(handling.getNodeId(),
handling.getOutputDataDirectory(),handling.getDataRegistryUrl(),handling.getDataPersistance());
}
//TODO rest of the builder configurations as they are added to
the experiment options
return runExperiment(workflowTemplateId, inputs, options);
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowOutputDataSettingsImpl.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowOutputDataSettingsImpl.java?rev=1434393&r1=1434392&r2=1434393&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowOutputDataSettingsImpl.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/WorkflowOutputDataSettingsImpl.java
Wed Jan 16 21:03:19 2013
@@ -45,10 +45,10 @@ public class WorkflowOutputDataSettingsI
}
@Override
- public OutputDataSettings addNewOutputDataSettings(
+ public OutputDataSettings addNewOutputDataSettings(String nodeId,
String outputDataDirectory, String dataRegistryURL,
boolean isDataPersistent) {
- getOutputDataSettingsListArray().add(new
ApplicationOutputDataSettingsImpl(outputDataDirectory, dataRegistryURL,
isDataPersistent));
+ getOutputDataSettingsListArray().add(new
ApplicationOutputDataSettingsImpl(nodeId, outputDataDirectory, dataRegistryURL,
isDataPersistent));
return
getOutputDataSettingsListArray().get(getOutputDataSettingsListArray().size()-1);
}
