Merge pull request #3 from apache/auroraMesosIntegration Merge aurora-mesos-integration branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c6e96ca2 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c6e96ca2 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c6e96ca2 Branch: refs/heads/develop Commit: c6e96ca2d3d4e0c329fd83f745589eff5c7ceac9 Parents: b7bebec bf5d8c7 Author: Gourav Shenoy <[email protected]> Authored: Wed Nov 2 14:57:19 2016 -0400 Committer: GitHub <[email protected]> Committed: Wed Nov 2 14:57:19 2016 -0400 ---------------------------------------------------------------------- .../application_deployment_model_types.cpp | 88 ++++ .../application_deployment_model_types.h | 36 +- .../airavata/compute_resource_model_types.cpp | 88 ++++ .../lib/airavata/compute_resource_model_types.h | 36 +- .../Model/AppCatalog/AppDeployment/Types.php | 92 ++++ .../Model/AppCatalog/ComputeResource/Types.php | 92 ++++ .../model/appcatalog/appdeployment/ttypes.py | 54 ++- .../model/appcatalog/computeresource/ttypes.py | 54 ++- .../ApplicationDeploymentDescription.java | 415 +++++++++++++++++- .../appcatalog/computeresource/BatchQueue.java | 431 +++++++++++++++++-- modules/cloud/aurora-client/pom.xml | 12 +- .../cloud/aurora/client/AuroraThriftClient.java | 2 +- .../main/resources/aurora-scheduler.properties | 2 +- modules/cloud/cloud-provisioning/pom.xml | 7 + .../store/store/impl/db/CredentialsDAO.java | 2 +- modules/distribution/pom.xml | 230 +++++----- .../src/main/assembly/bin-assembly.xml | 5 - .../apache/airavata/gfac/core/GFacUtils.java | 88 +++- .../core/cluster/AbstractRemoteCluster.java | 6 +- modules/gfac/gfac-impl/pom.xml | 5 + .../apache/airavata/gfac/impl/AuroraUtils.java | 30 ++ .../org/apache/airavata/gfac/impl/Factory.java | 46 +- .../airavata/gfac/impl/GFacEngineImpl.java | 7 +- .../apache/airavata/gfac/impl/GFacWorker.java | 4 +- .../gfac/impl/task/AuroraJobSubmission.java | 149 +++++++ .../gfac/monitor/cloud/AuroraJobMonitor.java | 244 +++++++++++ .../core/utils/OrchestratorUtils.java | 16 + .../cpi/impl/SimpleOrchestratorImpl.java | 5 +- .../catalog/impl/ApplicationDeploymentImpl.java | 8 + .../app/catalog/impl/ComputeResourceImpl.java | 6 +- .../catalog/model/ApplicationDeployment.java | 42 +- .../core/app/catalog/model/BatchQueue.java | 44 ++ .../resources/AppDeploymentResource.java | 44 ++ .../catalog/resources/BatchQueueResource.java | 56 ++- .../app/catalog/util/AppCatalogJPAUtils.java | 28 ++ .../util/AppCatalogThriftConversion.java | 13 + .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/appcatalog-derby.sql | 8 + .../src/main/resources/appcatalog-mysql.sql | 8 + pom.xml | 4 +- .../application_deployment_model.thrift | 4 + .../compute_resource_model.thrift | 6 +- 42 files changed, 2312 insertions(+), 206 deletions(-) ----------------------------------------------------------------------
