Approved and merge pull request 52 into develop branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6250ff1d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6250ff1d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6250ff1d Branch: refs/heads/develop Commit: 6250ff1dcd72f54bca5333d3c71729b12578f740 Parents: 7c6c562 1b91dd1 Author: Shameera Rathnayaka <shameerai...@gmail.com> Authored: Wed Oct 12 15:37:33 2016 -0400 Committer: Shameera Rathnayaka <shameerai...@gmail.com> Committed: Wed Oct 12 15:37:33 2016 -0400 ---------------------------------------------------------------------- .../airavata/compute_resource_model_types.cpp | 28 ++-- .../lib/airavata/compute_resource_model_types.h | 13 +- .../Model/AppCatalog/ComputeResource/Types.php | 2 + .../model/appcatalog/computeresource/ttypes.py | 5 + .../computeresource/LOCALSubmission.java | 53 +++---- .../appcatalog/computeresource/MonitorMode.java | 5 +- .../server/src/main/resources/gfac-config.yaml | 4 +- .../airavata/gfac/impl/GFacEngineImpl.java | 11 +- .../apache/airavata/gfac/impl/HTTPUtils.java | 7 + .../airavata/gfac/impl/LocalRemoteCluster.java | 42 +++++- .../gfac/impl/task/LocalJobSubmissionTask.java | 150 ++++++++++--------- .../airavata/gfac/impl/task/TaskUtils.java | 2 +- .../cpi/impl/SimpleOrchestratorImpl.java | 12 +- .../app/catalog/impl/ComputeResourceImpl.java | 1 + .../core/app/catalog/model/LocalSubmission.java | 11 ++ .../resources/LocalSubmissionResource.java | 12 +- .../app/catalog/util/AppCatalogJPAUtils.java | 1 + .../util/AppCatalogThriftConversion.java | 1 + .../src/main/resources/appcatalog-derby.sql | 1 + .../src/main/resources/appcatalog-mysql.sql | 1 + .../compute_resource_model.thrift | 5 +- 21 files changed, 228 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java ----------------------------------------------------------------------
