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/06/26 06:27:49 UTC

[4/4] 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/2c942771
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2c942771
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2c942771

Branch: refs/heads/master
Commit: 2c94277151a25e4000d929684f3de0c3e33cd34c
Parents: 7f4f182 6caf478
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Jun 26 00:27:13 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Jun 26 00:27:13 2015 -0400

----------------------------------------------------------------------
 .../Airavata/Model/Messaging/Event/Types.php    | 577 ++++++++----
 .../airavata/model/messaging/event/ttypes.py    | 513 +++++++----
 .../model/messaging/event/MessageType.java      |  12 +-
 .../messaging/event/ProcessSubmitEvent.java     | 321 ++++---
 .../messaging/event/ProcessTerminateEvent.java  | 608 +++++++++++++
 .../apache/airavata/gfac/cpi/GfacService.java   | 887 +++++++------------
 .../gfac/cpi/gfac_cpi_serviceConstants.java     |   2 +-
 .../apache/airavata/gfac/core/GFacEngine.java   |   2 +-
 .../apache/airavata/gfac/core/GFacUtils.java    |  23 +-
 .../airavata/gfac/impl/GFacEngineImpl.java      |   2 +-
 .../apache/airavata/gfac/impl/GFacWorker.java   |   7 +-
 .../airavata/gfac/server/GfacServerHandler.java |  87 +-
 .../core/impl/RabbitMQProcessConsumer.java      | 163 ----
 .../impl/RabbitMQProcessLaunchConsumer.java     | 283 ++++++
 .../impl/RabbitMQProcessLaunchPublisher.java    |  78 ++
 .../core/impl/RabbitMQProcessPublisher.java     |  84 --
 .../core/impl/RabbitMQStatusConsumer.java       |   6 +-
 .../core/impl/RabbitMQStatusPublisher.java      |   2 +-
 .../core/impl/RabbitMQTaskLaunchConsumer.java   | 290 ------
 .../core/impl/RabbitMQTaskLaunchPublisher.java  |  78 --
 .../orchestrator/cpi/OrchestratorService.java   | 314 +++----
 .../cpi/orchestrator_cpi_serviceConstants.java  |   2 +-
 .../core/impl/GFACEmbeddedJobSubmitter.java     |  98 --
 .../core/impl/GFACPassiveJobSubmitter.java      |  33 +-
 .../orchestrator/core/job/JobSubmitter.java     |  12 +-
 .../core/validator/JobMetadataValidator.java    |   3 +-
 .../validator/impl/BatchQueueValidator.java     |   3 +-
 .../impl/ExperimentStatusValidator.java         |   2 +-
 .../airavata/orchestrator/cpi/Orchestrator.java |  14 +-
 .../cpi/impl/SimpleOrchestratorImpl.java        |  26 +-
 .../server/OrchestratorServerHandler.java       | 344 +++----
 .../orchestrator/util/DataModelUtils.java       |  55 --
 .../catalog/impl/ExperimentCatalogImpl.java     |  16 +-
 .../catalog/impl/ExperimentRegistry.java        | 249 ++++--
 .../core/experiment/catalog/model/Job.java      |   3 +-
 .../core/experiment/catalog/model/JobPK.java    |  74 ++
 .../experiment/catalog/model/JobStatus.java     |  11 +
 .../experiment/catalog/model/JobStatusPK.java   |  13 +
 .../core/experiment/catalog/model/Process.java  |  56 ++
 .../resources/AbstractExpCatResource.java       |   1 +
 .../resources/ExperimentStatusResource.java     |   1 +
 .../catalog/resources/JobResource.java          |   7 +-
 .../catalog/resources/JobStatusResource.java    |  16 +-
 .../catalog/resources/ProcessResource.java      |  50 ++
 .../resources/ProcessStatusResource.java        |   1 +
 .../catalog/resources/TaskResource.java         |  26 +
 .../catalog/resources/TaskStatusResource.java   |   1 +
 .../experiment/catalog/resources/Utils.java     |   5 +
 .../utils/ThriftDataModelConversion.java        |   8 +
 .../src/main/resources/expcatalog-derby.sql     |  12 +-
 .../src/main/resources/expcatalog-mysql.sql     |  12 +-
 .../src/test/resources/expcatalog-derby.sql     |  12 +-
 .../airavata/registry/cpi/utils/Constants.java  |  13 +
 .../airavata-api/messaging_events.thrift        |  27 +-
 .../gfac-cpi/gfac.cpi.service.thrift            |  37 +-
 .../orchestrator.cpi.service.thrift             |   8 +-
 56 files changed, 3101 insertions(+), 2489 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/2c942771/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/2c942771/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/TaskResource.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/2c942771/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/2c942771/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------