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/d6b6693c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d6b6693c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d6b6693c Branch: refs/heads/master Commit: d6b6693c941dc34e4f0e58df3e3a63a88cba9b71 Parents: 3cf487e 5e851e6 Author: Saminda Wijeratne <[email protected]> Authored: Tue Mar 4 13:02:42 2014 -0500 Committer: Saminda Wijeratne <[email protected]> Committed: Tue Mar 4 13:02:42 2014 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 24 +-- .../java-client-samples/pom.xml | 20 +++ .../client/samples/CreateLaunchExperiment.java | 153 +++++++++++++++++-- .../main/resources/airavata-client.properties | 77 ++++++++++ .../airavata/job/monitor/util/X509Helper.java | 2 +- .../server/OrchestratorServerHandler.java | 2 +- .../main/resources/airavata-server.properties | 4 +- .../src/main/resources/monitor.properties | 5 +- .../test/resources/airavata-server.properties | 2 +- .../src/test/resources/monitor.properties | 4 +- .../test/resources/airavata-server.properties | 2 +- 11 files changed, 261 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
