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/12 00:56:11 UTC
[1/2] airavata git commit: Fixed GSISSH for amber and few issues
arise with create launcher sample
Repository: airavata
Updated Branches:
refs/heads/master 831dbdce4 -> dfa2f22e2
Fixed GSISSH for amber and few issues arise with create launcher sample
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ce62a61f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ce62a61f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ce62a61f
Branch: refs/heads/master
Commit: ce62a61fc8d12f71c57102ab95bd13fc772a381d
Parents: c36ab24
Author: shamrath <sh...@gmail.com>
Authored: Tue Nov 11 18:55:25 2014 -0500
Committer: shamrath <sh...@gmail.com>
Committed: Tue Nov 11 18:55:25 2014 -0500
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 20 ++++++++++----------
.../tools/RegisterSampleApplications.java | 5 -----
.../gfac/gsissh/handler/GSISSHInputHandler.java | 2 +-
3 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce62a61f/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 2d0f4fa..cc2307e 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
@@ -58,9 +58,9 @@ public class CreateLaunchExperiment {
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
private static Airavata.Client airavataClient;
- private static String echoAppId = "Echo_7b3cfedd-efe4-4a6f-8201-9ee1891d8ced";
- 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_3f2bb10b-2ee4-48c0-a526-c7c3c53f0a97";
+ private static String wrfAppId = "WRF_a37fb0be-a252-4185-a31c-ff43f585f88f";
+ private static String amberAppId = "Amber_a8187edf-7be0-4dad-9c8a-d0cc9075e6a0";
private static String localHost = "localhost";
private static String trestlesHostName = "trestles.sdsc.xsede.org";
@@ -75,7 +75,7 @@ public class CreateLaunchExperiment {
public static void main(String[] args) throws Exception {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavataClient.getAPIVersion());
-// regist?erApplications(); // run this only the first time
+// registerApplications(); // run this only the first time
createAndLaunchExp();
}
@@ -90,14 +90,14 @@ public class CreateLaunchExperiment {
// final String expId = createExperimentForSSHHost(airavata);
// final String expId = createEchoExperimentForFSD(airavataClient);
// final String expId = createEchoExperimentForStampede(airavataClient);
- final String expId = createEchoExperimentForTrestles(airavataClient);
+// final String expId = createEchoExperimentForTrestles(airavataClient);
// final String expId = createExperimentEchoForLocalHost(airavataClient);
// final String expId = createExperimentWRFTrestles(airavataClient);
// final String expId = createExperimentForBR2(airavataClient);
// final String expId = createExperimentForBR2Amber(airavataClient);
// final String expId = createExperimentWRFStampede(airavataClient);
// final String expId = createExperimentForStampedeAmber(airavataClient);
-// final String expId = createExperimentForTrestlesAmber(airavataClient);
+ final String expId = createExperimentForTrestlesAmber(airavataClient);
System.out.println("Experiment ID : " + expId);
// updateExperiment(airavata, expId);
@@ -894,19 +894,19 @@ public class CreateLaunchExperiment {
InputDataObjectType input = new InputDataObjectType();
input.setName("Heat_Restart_File");
input.setType(DataType.URI);
- input.setValue("/Users/lahirugunathilake/Downloads/02_Heat.rst");
+ input.setValue("/Users/shameera/Downloads/PHP-Gateway-Scripts/appScripts/AMBER_FILES/02_Heat.rst");
exInputs.add(input);
InputDataObjectType input1 = new InputDataObjectType();
input1.setName("Production_Control_File");
input1.setType(DataType.URI);
- input1.setValue("/Users/lahirugunathilake/Downloads/03_Prod.in");
+ input1.setValue("/Users/shameera/Downloads/PHP-Gateway-Scripts/appScripts/AMBER_FILES/03_Prod.in");
exInputs.add(input1);
InputDataObjectType input2 = new InputDataObjectType();
- input2.setName("Production_Control_File");
+ input2.setName("Parameter_Topology_File");
input2.setType(DataType.URI);
- input2.setValue("/Users/lahirugunathilake/Downloads/prmtop");
+ input2.setValue("/Users/shameera/Downloads/PHP-Gateway-Scripts/appScripts/AMBER_FILES/prmtop");
exInputs.add(input2);
List<OutputDataObjectType> exOut = new ArrayList<OutputDataObjectType>();
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce62a61f/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 db24a28..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
@@ -532,13 +532,8 @@ public class RegisterSampleApplications {
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "Hello World",
DataType.STRING, null, false, "A test string to Echo", null);
- InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo1", "http://shrib.com/22QmrrX4",
- DataType.URI, null, false, "A test uri to Echo", null);
-
-
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
applicationInputs.add(input1);
- applicationInputs.add(input2);
OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output",
"22QmrrX4", DataType.STRING);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ce62a61f/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
index c297b2a..d74727a 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
@@ -115,7 +115,7 @@ public class GSISSHInputHandler extends AbstractRecoverableHandler {
Set<String> parameters = input.getParameters().keySet();
for (String paramName : parameters) {
InputDataObjectType inputParamType = (InputDataObjectType) input.getParameters().get(paramName);
- String paramValue = inputParamType.getName();
+ String paramValue = inputParamType.getValue();
//TODO: Review this with type
if (inputParamType.getType() == DataType.URI) {
if (index < oldIndex) {
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dfa2f22e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dfa2f22e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dfa2f22e
Branch: refs/heads/master
Commit: dfa2f22e282bac82ec03d2ac76bfc87edcbf99d1
Parents: ce62a61 831dbdc
Author: shamrath <sh...@gmail.com>
Authored: Tue Nov 11 18:55:44 2014 -0500
Committer: shamrath <sh...@gmail.com>
Committed: Tue Nov 11 18:55:44 2014 -0500
----------------------------------------------------------------------
.../catalog/data/util/AppCatalogThriftConversion.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------