You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2014/12/08 19:32:33 UTC
[5/6] airavata git commit: Updated RegisterSampleData class and
remove test debug lines from local provider
Updated RegisterSampleData class and remove test debug lines from local provider
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/09668d33
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/09668d33
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/09668d33
Branch: refs/heads/master
Commit: 09668d33905b4ec0f111cc0dfe40f64567471ddc
Parents: a61b37f
Author: shamrath <sh...@gmail.com>
Authored: Mon Dec 8 00:15:28 2014 -0500
Committer: shamrath <sh...@gmail.com>
Committed: Mon Dec 8 00:15:28 2014 -0500
----------------------------------------------------------------------
.../airavata/client/samples/RegisterSampleData.java | 14 +++++++-------
.../gfac/local/provider/impl/LocalProvider.java | 2 --
2 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/09668d33/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
index 1fa62ab..28f01f5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
@@ -176,7 +176,7 @@ public class RegisterSampleData {
appModules.add(echoModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "Hello World",
- DataType.STRING, null, false, "A test string to Echo", null);
+ DataType.STRING, null, 1, false, "A test string to Echo", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -205,9 +205,9 @@ public class RegisterSampleData {
appModules.add(addModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "2",
- DataType.STRING, null, false, "Add operation input_1", null);
+ DataType.STRING, null, 1, false, "Add operation input_1", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "3",
- DataType.STRING, null, false, "Add operation input_2", null);
+ DataType.STRING, null, 2, false, "Add operation input_2", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -237,9 +237,9 @@ public class RegisterSampleData {
appModules.add(multiplyModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "4",
- DataType.STRING, null, false, "Multiply operation input_1", null);
+ DataType.STRING, null, 1, false, "Multiply operation input_1", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "5",
- DataType.STRING, null, false, "Multiply operation input_2", null);
+ DataType.STRING, null, 2, false, "Multiply operation input_2", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
@@ -269,9 +269,9 @@ public class RegisterSampleData {
appModules.add(subtractModuleId);
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("x", "6",
- DataType.STRING, null, false, "Subtract operation input_1", null);
+ DataType.STRING, null, 1, false, "Subtract operation input_1", null);
InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("y", "7",
- DataType.STRING, null, false, "Subtract operation input_2", null);
+ DataType.STRING, null, 2, false, "Subtract operation input_2", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
http://git-wip-us.apache.org/repos/asf/airavata/blob/09668d33/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
index 8f034ae..9f055e9 100644
--- a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
+++ b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/provider/impl/LocalProvider.java
@@ -261,7 +261,6 @@ public class LocalProvider extends AbstractProvider {
Comparator<InputDataObjectType> inputOrderComparator = new Comparator<InputDataObjectType>() {
@Override
public int compare(InputDataObjectType inputDataObjectType, InputDataObjectType t1) {
- log.info(" $$$$$$$$$$$$ inpput object order " + inputDataObjectType.getInputOrder() + " , t1 order " + t1.getInputOrder() + "$$$$$$$$$$$$$$$$" );
return inputDataObjectType.getInputOrder() - t1.getInputOrder();
}
};
@@ -272,7 +271,6 @@ public class LocalProvider extends AbstractProvider {
sortedInputSet.add(inputDOT);
}
}
- log.info("$$$$$$$$$$$ size of sorted set = " + sortedInputSet.size() + "$$$$$$$$$$$$$$$$$$$");
for (InputDataObjectType inputDataObjectType : sortedInputSet) {
if (inputDataObjectType.getApplicationArgument() != null
&& !inputDataObjectType.getApplicationArgument().equals("")) {