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 2014/04/14 17:46:53 UTC
[1/2] git commit: renaming some of the airavata-server.peroperties
Repository: airavata
Updated Branches:
refs/heads/master 96aad5226 -> bb0f71025
renaming some of the airavata-server.peroperties
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/43dfd1d8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/43dfd1d8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/43dfd1d8
Branch: refs/heads/master
Commit: 43dfd1d82993c529756d37c2a8b3fa5c0e96d6df
Parents: a5def09
Author: lahiru <la...@apache.org>
Authored: Mon Apr 14 10:46:50 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Mon Apr 14 10:46:50 2014 -0400
----------------------------------------------------------------------
.../apache/airavata/client/samples/CreateLaunchExperiment.java | 6 +++---
.../orchestrator/server/OrchestratorServerHandler.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/43dfd1d8/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 ac4aa7c..13a8dae 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
@@ -60,10 +60,10 @@ public class CreateLaunchExperiment {
AiravataUtils.setExecutionAsClient();
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavata.GetAPIVersion());
-// addDescriptors();
-// final String expId = createExperimentForLonestar(airavata);
+ addDescriptors();
+ final String expId = createExperimentForLocalHost(airavata);
// final String expId = createExperimentForSSHHost(airavata);
- final String expId = createExperimentForTrestles(airavata);
+// final String expId = createExperimentForTrestles(airavata);
// final String expId = createExperimentForStampede(airavata);
System.out.println("Experiment ID : " + expId);
launchExperiment(airavata, expId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/43dfd1d8/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 2d9a90d..bfeb058 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -83,8 +83,8 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
// Filling monitorManager properties
// we can keep a single user to do all the monitoring authentication for required machine..
- String myProxyUser = ServerSettings.getSetting("myproxy.user");
- String myProxyPass = ServerSettings.getSetting("myproxy.pass");
+ String myProxyUser = ServerSettings.getSetting("myproxy.username");
+ String myProxyPass = ServerSettings.getSetting("myproxy.password");
String certPath = ServerSettings.getSetting("trusted.cert.location");
String myProxyServer = ServerSettings.getSetting("myproxy.server");
authenticationInfo = new MyProxyAuthenticationInfo(myProxyUser, myProxyPass, myProxyServer,
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@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/bb0f7102
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bb0f7102
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bb0f7102
Branch: refs/heads/master
Commit: bb0f71025ede7e1c9cd5e961f9f2c28fdfeb7834
Parents: 43dfd1d 96aad52
Author: lahiru <la...@apache.org>
Authored: Mon Apr 14 11:46:18 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Mon Apr 14 11:46:18 2014 -0400
----------------------------------------------------------------------
README | 4 ++--
RELEASE_NOTES | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------