Merge develop branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e3da0914 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e3da0914 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e3da0914 Branch: refs/heads/auroraMesosIntegration Commit: e3da0914426c11a3e4d0cf7621a83147e32d1add Parents: 512d35e f396cb8 Author: Shameera Rathnayaka <[email protected]> Authored: Tue Nov 1 17:40:35 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Tue Nov 1 17:40:35 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 +++++++++++++++++-- .../store/store/impl/db/CredentialsDAO.java | 2 +- .../catalog/impl/ApplicationDeploymentImpl.java | 8 + .../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 | 8 + .../util/AppCatalogThriftConversion.java | 13 + .../src/main/resources/appcatalog-derby.sql | 8 + .../src/main/resources/appcatalog-mysql.sql | 8 + .../application_deployment_model.thrift | 4 + .../compute_resource_model.thrift | 6 +- 22 files changed, 1582 insertions(+), 47 deletions(-) ----------------------------------------------------------------------
