You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/06/02 22:57:13 UTC
[1/2] airavata git commit: update test class to have empty token
Repository: airavata
Updated Branches:
refs/heads/master 22a76f8af -> 7c95cf757
update test class to have empty token
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7c7bdaeb
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7c7bdaeb
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7c7bdaeb
Branch: refs/heads/master
Commit: 7c7bdaebf2eb82c3afce480fb75828a7e3d1dc16
Parents: 22bcbb4
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Jun 2 16:56:43 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Jun 2 16:56:43 2015 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7c7bdaeb/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 1597ced..5809122 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
@@ -30,6 +30,7 @@ import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.error.*;
+import org.apache.airavata.model.security.AuthzToken;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.util.ProjectModelUtil;
import org.apache.airavata.model.workspace.Gateway;
@@ -54,7 +55,7 @@ public class CreateLaunchExperiment {
private static final String DEFAULT_GATEWAY = "php_reference_gateway";
private static Airavata.Client airavataClient;
- private static String echoAppId = "Echo_54324c70-8e89-4bb6-b77f-b0b274c3a2ed";
+ private static String echoAppId = "Echo_53fcb5cd-7eda-485e-a9bc-fcf7c84a2e26";
private static String mpiAppId = "HelloMPI_bfd56d58-6085-4b7f-89fc-646576830518";
private static String wrfAppId = "WRF_7ad5da38-c08b-417c-a9ea-da9298839762";
private static String amberAppId = "Amber_357ba0ea-038c-4f14-b5f3-16bab331031b";
@@ -80,9 +81,10 @@ 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(null));
- registerApplications(); // run this only the first time
-// createAndLaunchExp();
+ AuthzToken token = new AuthzToken("empty_token");
+ System.out.println("API version is " + airavataClient.getAPIVersion(token));
+// registerApplications(); // run this only the first time
+ createAndLaunchExp();
}
private static String fsdResourceId;
@@ -162,12 +164,12 @@ public class CreateLaunchExperiment {
// final String expId = createMPIExperimentForFSD(airavataClient);
// final String expId = createEchoExperimentForStampede(airavataClient);
// final String expId = createEchoExperimentForTrestles(airavataClient);
-// final String expId = createExperimentEchoForLocalHost(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 = createExperimentForStampedeAmber(airavataClient);
// String expId = createExperimentForTrestlesAmber(airavataClient);
// final String expId = createExperimentGROMACSStampede(airavataClient);
// final String expId = createExperimentESPRESSOStampede(airavataClient);
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ch...@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/7c95cf75
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7c95cf75
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7c95cf75
Branch: refs/heads/master
Commit: 7c95cf757f3df3fa94767e25c8499d9f469d318c
Parents: 7c7bdae 22a76f8
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Jun 2 16:57:03 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Jun 2 16:57:03 2015 -0400
----------------------------------------------------------------------
.../main/resources/lib/airavata/Airavata.cpp | 61 +++++++++++++++++--
.../src/main/resources/lib/airavata/Airavata.h | 38 ++++++++----
.../lib/airavata/Airavata_server.skeleton.cpp | 2 +-
.../resources/lib/airavata/airavataAPI_types.h | 1 +
.../lib/airavata/airavataDataModel_types.h | 1 +
.../resources/lib/Airavata/API/Airavata.php | 63 ++++++++++++++++++--
.../lib/apache/airavata/api/Airavata-remote | 8 +--
.../lib/apache/airavata/api/Airavata.py | 57 ++++++++++++++++--
.../resources/lib/apache/airavata/api/ttypes.py | 1 +
.../lib/apache/airavata/model/ttypes.py | 1 +
.../catalog/resources/WorkerResource.java | 14 ++---
11 files changed, 208 insertions(+), 39 deletions(-)
----------------------------------------------------------------------