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/8ee11886 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8ee11886 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8ee11886 Branch: refs/heads/master Commit: 8ee1188648dfb2b96bd9a11297f084bf894d0d9c Parents: 0a1da56 029e604 Author: raminder <[email protected]> Authored: Wed Feb 12 15:41:09 2014 -0500 Committer: raminder <[email protected]> Committed: Wed Feb 12 15:41:09 2014 -0500 ---------------------------------------------------------------------- modules/gfac/gfac-core/pom.xml | 95 ++++--- .../java/org/apache/airavata/gfac/cpi/GFac.java | 118 ++++++++ .../apache/airavata/gfac/utils/GFacUtils.java | 56 ++-- modules/orchestrator/orchestrator-core/pom.xml | 5 + .../core/OrchestratorConfiguration.java | 10 + .../core/impl/EmbeddedGFACJobSubmitter.java | 115 ++------ .../orchestrator/core/job/JobSubmitter.java | 6 +- .../core/utils/OrchestratorConstants.java | 1 + .../core/utils/OrchestratorUtils.java | 33 +-- .../airavata/orchestrator/cpi/Orchestrator.java | 45 +-- .../cpi/impl/AbstractOrchestrator.java | 24 +- .../cpi/impl/SimpleOrchestratorImpl.java | 111 +------- .../src/main/resources/orchestrator.properties | 1 + .../orchestrator/core/NewOrchestratorTest.java | 276 +++++++++---------- .../src/test/resources/orchestrator.properties | 3 +- .../airavata/registry/api/JobRequest.java | 134 --------- .../registry/api/OrchestratorRegistry.java | 16 -- 17 files changed, 392 insertions(+), 657 deletions(-) ----------------------------------------------------------------------
