Merge remote-tracking branch 'origin/develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/630c7511 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/630c7511 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/630c7511 Branch: refs/heads/master Commit: 630c75116925e86a49b5e78f0e962c6ea567ead0 Parents: e6d6827 851117f Author: smarru <[email protected]> Authored: Thu Mar 3 13:14:47 2016 -0500 Committer: smarru <[email protected]> Committed: Thu Mar 3 13:14:47 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/Airavata.java | 2 +- .../application_deployment_model_types.cpp | 22 +- .../application_deployment_model_types.h | 22 +- .../airavata/compute_resource_model_types.cpp | 546 ++++++++++--------- .../lib/airavata/compute_resource_model_types.h | 11 +- .../lib/airavata/experiment_model_types.cpp | 52 +- .../lib/airavata/experiment_model_types.h | 12 +- .../airavata/parallelism_model_constants.cpp | 34 ++ .../lib/airavata/parallelism_model_constants.h | 41 ++ .../lib/airavata/parallelism_model_types.cpp | 51 ++ .../lib/airavata/parallelism_model_types.h | 54 ++ .../Model/AppCatalog/AppDeployment/Types.php | 33 -- .../Model/AppCatalog/ComputeResource/Types.php | 221 +++++--- .../Model/AppCatalog/Parallelism/Types.php | 53 ++ .../lib/Airavata/Model/Experiment/Types.php | 67 ++- .../model/appcatalog/appdeployment/ttypes.py | 43 +- .../model/appcatalog/computeresource/ttypes.py | 138 +++-- .../model/appcatalog/parallelism/__init__.py | 1 + .../model/appcatalog/parallelism/constants.py | 11 + .../model/appcatalog/parallelism/ttypes.py | 60 ++ .../apache/airavata/model/experiment/ttypes.py | 61 ++- .../client/samples/RegisterSampleData.java | 2 +- .../tools/RegisterOGCEUS3Application.java | 2 +- .../tools/RegisterSampleApplications.java | 2 +- .../tools/RegisterSampleApplicationsUtils.java | 2 +- .../client/tools/RegisterUS3Application.java | 2 +- .../apache/airavata/model/ComponentStatus.java | 2 +- .../org/apache/airavata/model/EdgeModel.java | 2 +- .../org/apache/airavata/model/NodeModel.java | 2 +- .../org/apache/airavata/model/PortModel.java | 2 +- .../apache/airavata/model/WorkflowModel.java | 2 +- .../apache/airavata/model/WorkflowStatus.java | 2 +- .../ApplicationDeploymentDescription.java | 28 +- .../appdeployment/ApplicationModule.java | 2 +- .../ApplicationParallelismType.java | 90 --- .../appcatalog/appdeployment/CommandObject.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 218 ++++---- .../computeresource/GlobusJobSubmission.java | 34 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 207 ++++++- .../computeresource/SSHJobSubmission.java | 34 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 2 +- .../gatewayprofile/GatewayResourceProfile.java | 2 +- .../gatewayprofile/StoragePreference.java | 2 +- .../StorageResourceDescription.java | 2 +- .../application/io/InputDataObjectType.java | 2 +- .../application/io/OutputDataObjectType.java | 2 +- .../airavata/model/commons/ErrorModel.java | 2 +- .../model/commons/ValidationResults.java | 2 +- .../airavata/model/commons/ValidatorResult.java | 2 +- .../data/movement/DataMovementInterface.java | 2 +- .../data/movement/GridFTPDataMovement.java | 2 +- .../model/data/movement/LOCALDataMovement.java | 2 +- .../model/data/movement/SCPDataMovement.java | 2 +- .../data/movement/UnicoreDataMovement.java | 2 +- .../data/resource/DataReplicaLocationModel.java | 2 +- .../model/data/resource/DataResourceModel.java | 2 +- .../model/error/AiravataClientException.java | 2 +- .../model/error/AiravataSystemException.java | 2 +- .../model/error/AuthenticationException.java | 2 +- .../model/error/AuthorizationException.java | 2 +- .../error/ExperimentNotFoundException.java | 2 +- .../model/error/InvalidRequestException.java | 2 +- .../model/error/LaunchValidationException.java | 2 +- .../model/error/ProjectNotFoundException.java | 2 +- .../airavata/model/error/TimedOutException.java | 2 +- .../airavata/model/error/ValidationResults.java | 2 +- .../airavata/model/error/ValidatorResult.java | 2 +- .../model/experiment/ExperimentModel.java | 208 +++++-- .../model/experiment/ExperimentStatistics.java | 2 +- .../experiment/ExperimentSummaryModel.java | 2 +- .../experiment/UserConfigurationDataModel.java | 2 +- .../org/apache/airavata/model/job/JobModel.java | 2 +- .../event/ExperimentStatusChangeEvent.java | 2 +- .../model/messaging/event/JobIdentifier.java | 2 +- .../messaging/event/JobStatusChangeEvent.java | 2 +- .../event/JobStatusChangeRequestEvent.java | 2 +- .../airavata/model/messaging/event/Message.java | 2 +- .../messaging/event/ProcessIdentifier.java | 2 +- .../event/ProcessStatusChangeEvent.java | 2 +- .../event/ProcessStatusChangeRequestEvent.java | 2 +- .../messaging/event/ProcessSubmitEvent.java | 2 +- .../messaging/event/ProcessTerminateEvent.java | 2 +- .../model/messaging/event/TaskIdentifier.java | 2 +- .../messaging/event/TaskOutputChangeEvent.java | 2 +- .../messaging/event/TaskStatusChangeEvent.java | 2 +- .../event/TaskStatusChangeRequestEvent.java | 2 +- .../parallelism/ApplicationParallelismType.java | 90 +++ .../airavata/model/process/ProcessModel.java | 2 +- .../ComputationalResourceSchedulingModel.java | 2 +- .../airavata/model/security/AuthzToken.java | 2 +- .../airavata/model/status/ExperimentStatus.java | 2 +- .../apache/airavata/model/status/JobStatus.java | 2 +- .../airavata/model/status/ProcessStatus.java | 2 +- .../airavata/model/status/TaskStatus.java | 2 +- .../model/task/DataStagingTaskModel.java | 2 +- .../model/task/EnvironmentSetupTaskModel.java | 2 +- .../model/task/JobSubmissionTaskModel.java | 2 +- .../airavata/model/task/MonitorTaskModel.java | 2 +- .../apache/airavata/model/task/TaskModel.java | 2 +- .../airavata/model/workspace/Gateway.java | 2 +- .../apache/airavata/model/workspace/Group.java | 2 +- .../airavata/model/workspace/Project.java | 2 +- .../apache/airavata/model/workspace/User.java | 2 +- .../apache/airavata/gfac/core/GFacUtils.java | 30 +- .../impl/task/DefaultJobSubmissionTask.java | 3 +- .../task/utils/bes/ApplicationProcessor.java | 2 +- .../catalog/impl/ApplicationDeploymentImpl.java | 2 +- .../app/catalog/impl/ComputeResourceImpl.java | 33 ++ .../catalog/model/ParallelismPrefixCommand.java | 78 +++ .../model/ParallelismPrefixCommand_PK.java | 62 +++ .../resources/AppCatAbstractResource.java | 7 + .../ParallelismPrefixCommandResource.java | 350 ++++++++++++ .../app/catalog/util/AppCatalogJPAUtils.java | 18 + .../catalog/util/AppCatalogResourceType.java | 1 + .../util/AppCatalogThriftConversion.java | 12 + .../catalog/impl/ExperimentRegistry.java | 2 + .../experiment/catalog/model/Experiment.java | 11 + .../catalog/resources/ExperimentResource.java | 11 + .../experiment/catalog/resources/Utils.java | 1 + .../utils/ThriftDataModelConversion.java | 1 + .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/appcatalog-derby.sql | 9 + .../src/main/resources/appcatalog-mysql.sql | 9 + .../src/main/resources/expcatalog-derby.sql | 1 + .../src/main/resources/expcatalog-mysql.sql | 1 + .../test-suite/multi-tenanted-airavata/pom.xml | 10 +- .../ApplicationRegister.java | 2 +- .../application_deployment_model.thrift | 28 +- .../app-catalog-models/parallelism_model.thrift | 54 ++ .../experiment_model.thrift | 17 +- .../compute_resource_model.thrift | 4 +- 138 files changed, 2336 insertions(+), 1030 deletions(-) ----------------------------------------------------------------------
