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/0ec292f9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0ec292f9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0ec292f9 Branch: refs/heads/master Commit: 0ec292f929d89e3f743bd848e9c19b8e7f3c88cf Parents: d6b6693 5b62ef6 Author: Saminda Wijeratne <[email protected]> Authored: Tue Mar 4 16:30:52 2014 -0500 Committer: Saminda Wijeratne <[email protected]> Committed: Tue Mar 4 16:30:52 2014 -0500 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 15 ++++++-- .../src/main/resources/monitor.properties | 2 -- .../airavata/job/monitor/QstatMonitorTest.java | 1 - .../apache/airavata/common/utils/Constants.java | 1 - .../server/OrchestratorServerHandler.java | 14 +++----- .../main/resources/airavata-server.properties | 26 ++++++++++++-- .../src/main/resources/monitor.properties | 9 ----- .../src/main/resources/orchestrator.properties | 26 -------------- .../orchestrator/core/job/JobSubmitter.java | 2 +- .../core/utils/OrchestratorConstants.java | 1 - .../core/utils/OrchestratorUtils.java | 11 ++---- .../cpi/impl/AbstractOrchestrator.java | 2 +- .../main/resources/airavata-server.properties | 20 +++++++++++ .../src/main/resources/orchestrator.properties | 26 -------------- .../test/resources/airavata-server.properties | 23 +++++++++++- .../src/test/resources/orchestrator.properties | 26 -------------- .../registry/jpa/impl/ExperimentRegistry.java | 38 +++++++++++++++++--- .../jpa/resources/JobDetailResource.java | 4 +-- .../registry/jpa/resources/StatusResource.java | 12 +++++-- .../jpa/utils/ThriftDataModelConversion.java | 17 ++++----- .../gsi/ssh/impl/DefaultSSHApiTest.java | 1 - 21 files changed, 141 insertions(+), 136 deletions(-) ----------------------------------------------------------------------
