You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2015/03/11 21:21:55 UTC
[2/2] airavata git commit: fixing LSF issues
fixing LSF issues
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/13b480d8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/13b480d8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/13b480d8
Branch: refs/heads/master
Commit: 13b480d84cdfcaf110536688309834122db8917e
Parents: c2bacf2 10c5abf
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Wed Mar 11 16:21:50 2015 -0400
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Wed Mar 11 16:21:50 2015 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 34 +-
.../java/org/apache/airavata/api/Airavata.java | 5264 +++++++++++-------
.../main/resources/lib/airavata/Airavata.cpp | 381 ++
.../src/main/resources/lib/airavata/Airavata.h | 161 +
.../lib/airavata/Airavata_server.skeleton.cpp | 5 +
.../lib/airavata/computeResourceModel_types.cpp | 203 +-
.../lib/airavata/computeResourceModel_types.h | 38 +-
.../resources/lib/Airavata/API/Airavata.php | 296 +
.../Model/AppCatalog/ComputeResource/Types.php | 49 +
.../client/samples/CreateLaunchExperiment.java | 584 +-
.../tools/RegisterSampleApplications.java | 158 +-
.../computeresource/AuthenticationMode.java | 70 +
.../computeresource/UnicoreJobSubmission.java | 222 +-
.../airavataAPI.thrift | 6 +
.../computeResourceModel.thrift | 25 +-
.../catalog/data/impl/ComputeResourceImpl.java | 1 +
.../data/model/UnicoreJobSubmission.java | 16 +-
.../data/resources/AbstractResource.java | 1 +
.../resources/UnicoreJobSubmissionResource.java | 39 +-
.../catalog/data/util/AppCatalogJPAUtils.java | 1 +
.../data/util/AppCatalogThriftConversion.java | 3 +-
.../src/main/resources/appcatalog-derby.sql | 1 +
.../src/main/resources/appcatalog-mysql.sql | 1 +
.../registry/jpa/impl/ExperimentRegistry.java | 3 +
24 files changed, 5039 insertions(+), 2523 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b480d8/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 b5a5bcc,bb914fa..ed141b9
--- 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,13 -58,13 +58,13 @@@ public class CreateLaunchExperiment
private static final String DEFAULT_GATEWAY = "php_reference_gateway";
private static Airavata.Client airavataClient;
- private static String echoAppId = "Echo_8506337e-ab7a-46b6-9b71-4a461b6c5e35";
+ private static String echoAppId = "Echo_61988d1f-7ca9-47ba-9212-a0ac2e973cf1";
private static String mpiAppId = "HelloMPI_720e159f-198f-4daa-96ca-9f5eafee92c9";
private static String wrfAppId = "WRF_7ad5da38-c08b-417c-a9ea-da9298839762";
- private static String amberAppId = "Amber_a56d457c-f239-4c0b-ba00-66bda936f7bc";
+ private static String amberAppId = "Amber_aa083c86-4680-4002-b3ef-fad93c181926";
private static String gromacsAppId = "GROMACS_05622038-9edd-4cb1-824e-0b7cb993364b";
private static String espressoAppId = "ESPRESSO_10cc2820-5d0b-4c63-9546-8a8b595593c1";
- private static String lammpsAppId = "LAMMPS_10893eb5-3840-438c-8446-d26c7ecb001f";
+ private static String lammpsAppId = "LAMMPS_2472685b-8acf-497e-aafe-cc66fe5f4cb6";
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";
@@@ -162,7 -183,6 +183,7 @@@
// final String expId = createExperimentTRINITYStampede(airavataClient);
// final String expId = createExperimentAUTODOCKStampede(airavataClient); // this is not working , we need to register AutoDock app on stampede
// final String expId = createExperimentForLSF(airavataClient);
- final String expId = createExperimentLAMMPSForLSF(airavataClient);
++// final String expId = createExperimentLAMMPSForLSF(airavataClient);
// final String expId = "Ultrascan_ln_eb029947-391a-4ccf-8ace-9bafebe07cc0";
System.out.println("Experiment ID : " + expId);
// updateExperiment(airavata, expId);
@@@ -1356,8 -1112,9 +1113,7 @@@
for (InputDataObjectType inputDataObjectType : exInputs) {
inputDataObjectType.setValue("Hello World");
}
-
List<OutputDataObjectType> exOut = client.getApplicationOutputs(echoAppId);
-
-
Project project = ProjectModelUtil.createProject("default", "lg11w", "test project");
String projectId = client.createProject(DEFAULT_GATEWAY, project);
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b480d8/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------