You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/08/07 22:33:08 UTC
[2/2] 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/d6ffefa8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d6ffefa8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d6ffefa8
Branch: refs/heads/master
Commit: d6ffefa815ccfc3598d2eca9f7ec5c3f461b293d
Parents: c29a6a9 7536fb6
Author: raminder <ra...@apache.org>
Authored: Thu Aug 7 16:32:44 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Thu Aug 7 16:32:44 2014 -0400
----------------------------------------------------------------------
.../airavata/api/server/WorkflowServer.java | 4 +-
.../server/handler/WorkflowServerHandler.java | 18 +-
.../AiravataExperimentStatusUpdator.java | 116 +++++++
.../listener/ExperimentStatusChangedEvent.java | 64 ++++
.../util/AiravataExperimentStatusUpdator.java | 117 -------
.../airavata/api/server/util/Constants.java | 4 +-
.../api/server/util/DataModelUtils.java | 3 -
.../client/samples/CreateLaunchExperiment.java | 4 +-
.../org/airavata/appcatalog/cpi/AppCatalog.java | 7 +
.../appcatalog/cpi/WorkflowCatalog.java | 20 ++
.../catalog/data/impl/AppCatalogImpl.java | 5 +
.../catalog/data/impl/WorkflowCatalogImpl.java | 137 ++++++++
.../catalog/data/model/Workflow.java | 80 +++++
.../data/resources/AbstractResource.java | 11 +-
.../data/resources/WorkflowResource.java | 336 +++++++++++++++++++
.../catalog/data/util/AppCatalogJPAUtils.java | 101 ++----
.../data/util/AppCatalogResourceType.java | 3 +-
.../data/util/AppCatalogThriftConversion.java | 9 +
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/appcatalog-derby.sql | 9 +
.../src/main/resources/appcatalog-mysql.sql | 9 +
.../src/test/resources/appcatalog-derby.sql | 9 +
modules/app-catalog/pom.xml | 1 -
.../common/utils/AbstractActivityListener.java | 27 --
.../listener/AbstractActivityListener.java | 27 ++
.../listener/AbstractStateChangeRequest.java | 27 ++
.../common/utils/listener/PublisherMessage.java | 26 ++
.../main/resources/airavata-server.properties | 6 +-
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 2 +-
.../apache/airavata/gfac/core/cpi/GFacImpl.java | 2 +-
.../core/monitor/AbstractActivityListener.java | 27 --
.../AiravataExperimentStatusUpdator.java | 109 ------
.../core/monitor/AiravataJobStatusUpdator.java | 2 +-
.../core/monitor/AiravataTaskStatusUpdator.java | 2 +-
.../AiravataWorkflowNodeStatusUpdator.java | 2 +-
.../core/monitor/GfacInternalStatusUpdator.java | 2 +-
.../state/AbstractStateChangeRequest.java | 27 --
.../state/ExperimentStatusChangedEvent.java | 63 ----
.../monitor/state/JobStatusChangeRequest.java | 1 +
.../monitor/state/JobStatusChangedEvent.java | 1 +
.../state/TaskOutputDataChangedEvent.java | 64 ++++
.../monitor/state/TaskStatusChangeRequest.java | 1 +
.../monitor/state/TaskStatusChangedEvent.java | 1 +
.../state/WorkflowNodeStatusChangedEvent.java | 1 +
.../gfac/local/provider/impl/LocalProvider.java | 22 +-
.../main/java/generators/JPAClassGenerator.java | 2 +-
.../src/main/java/generators/SQLGenerator.java | 2 +-
modules/workflow-model/workflow-engine/pom.xml | 10 +
.../workflow/catalog/WorkflowCatalog.java | 53 ---
.../catalog/WorkflowCatalogException.java | 17 -
.../catalog/WorkflowCatalogFactory.java | 24 +-
.../workflow/catalog/WorkflowCatalogImpl.java | 167 ---------
.../workflow/engine/WorkflowEngineImpl.java | 2 +-
.../airavata/workflow/engine/WorkflowUtils.java | 3 -
.../engine/interpretor/WorkflowInterpreter.java | 57 ++--
.../engine/util/ProxyMonitorPublisher.java | 2 +-
.../RegistryWorkflowPublisherWindow.java | 2 -
57 files changed, 1096 insertions(+), 755 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d6ffefa8/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d6ffefa8/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
----------------------------------------------------------------------