Author: samindaw
Date: Wed Jan 16 18:30:05 2013
New Revision: 1434093
URL: http://svn.apache.org/viewvc?rev=1434093&view=rev
Log:
introducing node id to the output data handler settings
Modified:
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/OutputDataSettings.java
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/OutputDataSettings.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/OutputDataSettings.java?rev=1434093&r1=1434092&r2=1434093&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/OutputDataSettings.java
(original)
+++
airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/OutputDataSettings.java
Wed Jan 16 18:30:05 2013
@@ -24,6 +24,12 @@ package org.apache.airavata.client.api;
public interface OutputDataSettings {
/**
+ * Retrieve the id of the node which these output data settings are
relevant
+ * @return
+ */
+ public String getNodeId();
+
+ /**
* Retrieve the pre-specified staging location for output data
* @return
*/
@@ -42,6 +48,11 @@ public interface OutputDataSettings {
public Boolean isDataPersistent();
/**
+ * Setup the id of the node which these output data settings are
relevant
+ */
+ public void setNodeId(String nodeId);
+
+ /**
* Setup a custom pre-specified staging location for output data
* @param outputDataDirectory - Path for output data directory
*/
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=1434093&r1=1434092&r2=1434093&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 18:30:05 2013
@@ -31,9 +31,10 @@ public interface WorkflowOutputDataSetti
/**
* Add a new appliation output data settings
+ * @param nodeId - id of the node which the output data settings will
be specified
* @return
*/
- public OutputDataSettings addNewOutputDataSettings();
+ public OutputDataSettings addNewOutputDataSettings(String nodeId);
/**
* Add a new appliation output 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=1434093&r1=1434092&r2=1434093&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 18:30:05 2013
@@ -24,11 +24,13 @@ package org.apache.airavata.client.impl;
import org.apache.airavata.client.api.OutputDataSettings;
public class ApplicationOutputDataSettingsImpl implements OutputDataSettings {
+ private String nodeId;
private String outputDataDirectory;
private String dataRegistry;
private Boolean dataPersistent;
- public ApplicationOutputDataSettingsImpl() {
+ public ApplicationOutputDataSettingsImpl(String nodeId) {
+ setNodeId(nodeId);
}
public ApplicationOutputDataSettingsImpl(String outputDataDirectory,
String dataRegistryUrl, Boolean dataPersistent) {
@@ -82,4 +84,14 @@ public class ApplicationOutputDataSettin
this.dataPersistent=null;
}
+ @Override
+ public String getNodeId() {
+ return nodeId;
+ }
+
+ @Override
+ public void setNodeId(String nodeId) {
+ this.nodeId=nodeId;
+ }
+
}
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=1434093&r1=1434092&r2=1434093&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 18:30:05 2013
@@ -223,7 +223,7 @@ public class ExecutionManagerImpl implem
}
OutputDataSettings[] outputDataSettingsList =
options.getCustomWorkflowOutputDataSettings().getOutputDataSettingsList();
for (OutputDataSettings outputDataSettings :
outputDataSettingsList) {
-
builder.addApplicationOutputDataHandling(outputDataSettings.getOutputDataDirectory(),
outputDataSettings.getDataRegistryUrl(),
outputDataSettings.isDataPersistent());
+
builder.addApplicationOutputDataHandling(outputDataSettings.getNodeId(),outputDataSettings.getOutputDataDirectory(),
outputDataSettings.getDataRegistryUrl(),
outputDataSettings.isDataPersistent());
}
runPreWorkflowExecutionTasks(experimentID,
executionUser, options.getExperimentMetadata(), options.getExperimentName());
NameValue[] inputVals = inputValues.toArray(new
NameValue[] {});
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=1434093&r1=1434092&r2=1434093&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 18:30:05 2013
@@ -72,8 +72,8 @@ public class WorkflowOutputDataSettingsI
}
@Override
- public OutputDataSettings addNewOutputDataSettings() {
- return new ApplicationOutputDataSettingsImpl();
+ public OutputDataSettings addNewOutputDataSettings(String nodeId) {
+ return new ApplicationOutputDataSettingsImpl(nodeId);
}
}
