You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/09 18:42:59 UTC
[1/2] git commit: creating the server start file in bin location
Repository: airavata
Updated Branches:
refs/heads/master 417a31093 -> 4244103cb
creating the server start file in bin location
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2bd6d333
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2bd6d333
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2bd6d333
Branch: refs/heads/master
Commit: 2bd6d33349b6b0a9b4a92e7d8ebe945533dbf393
Parents: 58e8fb9
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Jul 9 12:42:23 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Jul 9 12:42:23 2014 -0400
----------------------------------------------------------------------
.../integration/SingleAppIntegrationTestBase.java | 2 +-
.../java/org/apache/airavata/server/ServerMain.java | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2bd6d333/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
index 84bd528..1b097e7 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
@@ -52,6 +52,7 @@ public class SingleAppIntegrationTestBase extends AbstractIntegrationTest {
ExperimentStatus experimentStatus = null;
do {
try {
+ Thread.sleep(2000);
experimentStatus = client.getExperimentStatus(expId);
if (previousUpdateTime!=experimentStatus.getTimeOfStateChange()) {
previousUpdateTime=experimentStatus.getTimeOfStateChange();
@@ -60,7 +61,6 @@ public class SingleAppIntegrationTestBase extends AbstractIntegrationTest {
+ " ["+new Date(previousUpdateTime).toString()+"]");
}
- Thread.sleep(2000);
} catch (Exception e) {
log.error("Thread interrupted", e);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/2bd6d333/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index abc0819..3120804 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -105,6 +105,19 @@ public class ServerMain {
// }
public static void main(String args[]) throws ParseException, IOException {
+// Properties properties = System.getProperties();
+// for (Object key : properties.keySet()) {
+// System.out.println(key.toString()+" = "+properties.get(key));
+// }
+// Map<String, String> env = System.getenv();
+//
+// for (Object key : env.keySet()) {
+// System.out.println(key.toString()+" = "+env.get(key));
+// }
+// if (true){
+// return;
+// }
+
AiravataUtils.setExecutionAsServer();
CommandLineParameters commandLineParameters = StringUtil.getCommandLineParser(args);
if (commandLineParameters.getArguments().contains(STOP_COMMAND_STR)){
@@ -241,7 +254,7 @@ public class ServerMain {
}
private static String getServerStartedFileName() {
- return serverStartedFileNamePrefix+"_"+Integer.toString(serverPID);
+ return new File(new File(System.getenv("AIRAVATA_HOME"),"bin"),serverStartedFileNamePrefix+"_"+Integer.toString(serverPID)).toString();
}
public static void stopAllServers() {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sa...@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/4244103c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4244103c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4244103c
Branch: refs/heads/master
Commit: 4244103cb6281c708c1d81cd21776143434fa288
Parents: 2bd6d33 417a310
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Jul 9 12:42:49 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Jul 9 12:42:49 2014 -0400
----------------------------------------------------------------------
.../updateApplicationInterface.php | 79 ++++++++++++++++++++
.../client/samples/CreateLaunchExperiment.java | 30 ++++----
.../data/impl/ApplicationInterfaceImpl.java | 40 +++++-----
.../main/resources/airavata-server.properties | 6 +-
4 files changed, 119 insertions(+), 36 deletions(-)
----------------------------------------------------------------------