airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject [20/20] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Date Wed, 23 Jul 2014 16:48:34 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata

Conflicts:
	airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e6126da9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e6126da9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e6126da9

Branch: refs/heads/master
Commit: e6126da9ec066d08deaba7b1e045274450af3a7c
Parents: 81a21c5 88269c4
Author: Saminda Wijeratne <samindaw@gmail.com>
Authored: Wed Jul 23 12:47:49 2014 -0400
Committer: Saminda Wijeratne <samindaw@gmail.com>
Committed: Wed Jul 23 12:47:49 2014 -0400

----------------------------------------------------------------------
 .../client/samples/CreateLaunchExperiment.java  | 54 ++++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/e6126da9/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index e99fa23,28a5246..8d006ef
--- 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
@@@ -77,23 -77,23 +77,23 @@@ public class CreateLaunchExperiment 
              AiravataUtils.setExecutionAsClient();
              client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
              System.out.println("API version is " + client.getAPIVersion());
 -//            addDescriptors();
 +            addDescriptors();
  
 -//            final String expId = createExperimentForSSHHost(airavata);
 -//            final String expId = createExperimentForTrestles(client);
 -//            final String expId = createExperimentForStampede(client);
 +////            final String expId = createExperimentForSSHHost(airavata);
 +////            final String expId = createExperimentForTrestles(client);
 +////            final String expId = createExperimentForStampede(client);
  //            final String expId = createExperimentForLocalHost(client);
- ////            final String expId = createExperimentForLonestar(airavata);
- ////            final String expId = createExperimentWRFTrestles(client);
- ////            final String expId = createExperimentForBR2(client);
- ////            final String expId = createExperimentForBR2Amber(client);
- ////            final String expId = createExperimentWRFStampede(client);
- ////            final String expId = createExperimentForStampedeAmber(client);
- ////            final String expId = createExperimentForTrestlesAmber(client);
- //
- //            System.out.println("Experiment ID : " + expId);
- ////            updateExperiment(airavata, expId);
- //            launchExperiment(client, expId);
+ //            final String expId = createExperimentForLonestar(airavata);
+ //            final String expId = createExperimentWRFTrestles(client);
+             final String expId = createExperimentForBR2(client);
+ //            final String expId = createExperimentForBR2Amber(client);
+ //            final String expId = createExperimentWRFStampede(client);
+ //            final String expId = createExperimentForStampedeAmber(client);
+ //            final String expId = createExperimentForTrestlesAmber(client);
+ 
+             System.out.println("Experiment ID : " + expId);
+ //            updateExperiment(airavata, expId);
+             launchExperiment(client, expId);
  
  //            System.out.println("retrieved exp id : " + experiment.getExperimentID());
          } catch (Exception e) {


Mime
View raw message