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/11/25 18:22:06 UTC
airavata git commit: Resolved compilation error comes with
dc1898dfe054 commit
Repository: airavata
Updated Branches:
refs/heads/master 195f8d74c -> cf18c7dba
Resolved compilation error comes with dc1898dfe054 commit
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cf18c7db
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cf18c7db
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cf18c7db
Branch: refs/heads/master
Commit: cf18c7dba3bc25dd73e59263338bc5ecf790d433
Parents: 195f8d7
Author: shamrath <sh...@gmail.com>
Authored: Tue Nov 25 12:22:07 2014 -0500
Committer: shamrath <sh...@gmail.com>
Committed: Tue Nov 25 12:22:07 2014 -0500
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 28 ++------------------
.../tools/RegisterSampleApplications.java | 13 +++------
2 files changed, 5 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf18c7db/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index c5cbc79..34d419c 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -57,11 +57,6 @@ public class CreateLaunchExperiment {
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
private static Airavata.Client airavataClient;
-<<<<<<< HEAD
- private static String echoAppId = "Echo_7405adc7-9519-4478-8529-21846b837cd3";
- private static String wrfAppId = "WRF_d41bdc86-e280-4eb6-a045-708f69a8c116";
- private static String amberAppId = "Amber_b23ee051-90d6-4892-827e-622a2f6c95ee";
-=======
private static String echoAppId = "Echo_36fbb479-5b41-4f48-a9c5-382ee910ac6b";
private static String wrfAppId = "WRF_7ad5da38-c08b-417c-a9ea-da9298839762";
private static String amberAppId = "Amber_49b16f6f-93ab-4885-9971-6ab2ab5eb3d3";
@@ -71,7 +66,6 @@ public class CreateLaunchExperiment {
private static String nwchemAppId = "NWChem_2c8fee64-acf9-4a89-b6d3-91eb53c7640c";
private static String trinityAppId = "Trinity_e894acf5-9bca-46e8-a1bd-7e2d5155191a";
private static String autodockAppId = "AutoDock_43d9fdd0-c404-49f4-b913-3abf9080a8c9";
->>>>>>> f348ef4c59c7f6a8c0fa347bde5b203ae17f7dde
private static String localHost = "localhost";
@@ -225,17 +219,6 @@ public class CreateLaunchExperiment {
public static String createEchoExperimentForFSD(Airavata.Client client) throws TException {
try {
-<<<<<<< HEAD
- // these are template variables and do not need to have values, as it is a data model.
- List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
- DataObjectType i1 = new DataObjectType();
- i1.setKey("i1");
- i1.setType(DataType.STRING);
- i1.setValue("Test echo output");
- exInputs.add(i1);
- DataObjectType i2 = new DataObjectType();
- i2.setKey("i2");
-=======
List<InputDataObjectType> exInputs = new ArrayList<InputDataObjectType>();
InputDataObjectType input = new InputDataObjectType();
input.setName("Input_to_Echo");
@@ -244,22 +227,15 @@ public class CreateLaunchExperiment {
exInputs.add(input);
InputDataObjectType i2 = new InputDataObjectType();
i2.setName("Input_to_Echo1");
->>>>>>> f348ef4c59c7f6a8c0fa347bde5b203ae17f7dde
i2.setType(DataType.URI);
- i2.setValue("http://textfiles.com/art/152614.txt");
+ i2.setValue("http://shrib.com/22QmrrX4");
exInputs.add(i2);
-<<<<<<< HEAD
- List<DataObjectType> exOut = new ArrayList<DataObjectType>();
- DataObjectType output = new DataObjectType();
- output.setKey("o1");
-=======
List<OutputDataObjectType> exOut = new ArrayList<OutputDataObjectType>();
OutputDataObjectType output = new OutputDataObjectType();
output.setName("Echoed_Output");
->>>>>>> f348ef4c59c7f6a8c0fa347bde5b203ae17f7dde
output.setType(DataType.STRING);
- output.setValue("152614.txt");
+ output.setValue("22QmrrX4");
exOut.add(output);
http://git-wip-us.apache.org/repos/asf/airavata/blob/cf18c7db/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index 6e1bb20..41020a0 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -529,21 +529,14 @@ public class RegisterSampleApplications {
List<String> appModules = new ArrayList<String>();
appModules.add(echoModuleId);
- InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("i1", "",
+ InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "Hello World",
DataType.STRING, null, false, "A test string to Echo", null);
-<<<<<<< HEAD
- InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("i2", "",
- DataType.URI, null, false, "A test uri to Echo", null);
-
-
-=======
->>>>>>> f348ef4c59c7f6a8c0fa347bde5b203ae17f7dde
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
- OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("o1",
- "", DataType.STRING);
+ OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output",
+ "22QmrrX4", DataType.STRING);
List<OutputDataObjectType> applicationOutputs = new ArrayList<OutputDataObjectType>();
applicationOutputs.add(output1);