You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by sh...@apache.org on 2015/07/02 22:17:43 UTC

[2/2] airavata git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata

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/953feec6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/953feec6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/953feec6

Branch: refs/heads/master
Commit: 953feec6bbbfcb2556ab207e1dbf93293e297b20
Parents: 48e23d9 aecf794
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Thu Jul 2 16:17:31 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Thu Jul 2 16:17:31 2015 -0400

----------------------------------------------------------------------
 .../airavata/common/utils/ServerSettings.java   |  5 --
 .../main/resources/airavata-server.properties   |  7 +-
 .../apache/airavata/gfac/server/GfacServer.java |  1 -
 .../airavata/gfac/server/GfacServerHandler.java |  8 +--
 .../core/context/OrchestratorContext.java       | 35 ++-------
 .../core/model/ExperimentConfigurationData.java | 68 ------------------
 .../core/model/ExperimentRequest.java           | 61 ----------------
 .../core/model/ResourceScheduling.java          | 75 --------------------
 .../core/utils/OrchestratorUtils.java           | 12 ----
 .../airavata/orchestrator/cpi/Orchestrator.java | 11 ---
 .../cpi/impl/AbstractOrchestrator.java          | 39 +---------
 .../cpi/impl/SimpleOrchestratorImpl.java        | 44 +-----------
 .../src/main/resources/expcatalog-mysql.sql     | 30 ++++----
 13 files changed, 29 insertions(+), 367 deletions(-)
----------------------------------------------------------------------