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/85fb6b69 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/85fb6b69 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/85fb6b69 Branch: refs/heads/master Commit: 85fb6b69443c4be9736c9a3af641341c5f957db8 Parents: 687d812 b4e3c33 Author: Shameera Rathnayaka <[email protected]> Authored: Fri Nov 6 17:25:44 2015 -0500 Committer: Shameera Rathnayaka <[email protected]> Committed: Fri Nov 6 17:25:44 2015 -0500 ---------------------------------------------------------------------- .../api/server/util/AppCatalogInitUtil.java | 1 + .../java/org/apache/airavata/api/Airavata.java | 2 +- .../src/main/resources/lib/airavata/Airavata.h | 152 +++++++++---------- .../application_interface_model_types.cpp | 4 +- .../application_interface_model_types.h | 4 +- .../airavata/application_io_models_types.cpp | 26 +++- .../lib/airavata/application_io_models_types.h | 16 +- .../lib/airavata/experiment_model_types.cpp | 4 +- .../lib/airavata/experiment_model_types.h | 4 +- .../gateway_resource_profile_model_types.cpp | 37 ++++- .../gateway_resource_profile_model_types.h | 11 +- .../lib/airavata/messaging_events_types.cpp | 4 +- .../lib/airavata/messaging_events_types.h | 4 +- .../lib/airavata/process_model_types.cpp | 4 +- .../lib/airavata/process_model_types.h | 4 +- .../resources/lib/airavata/task_model_types.cpp | 4 +- .../resources/lib/airavata/task_model_types.h | 4 +- .../lib/airavata/workflow_data_model_types.cpp | 4 +- .../lib/airavata/workflow_data_model_types.h | 4 +- .../Model/AppCatalog/GatewayProfile/Types.php | 37 ++++- .../lib/Airavata/Model/Application/Io/Types.php | 23 +++ .../model/appcatalog/gatewayprofile/ttypes.py | 33 ++-- .../airavata/model/application/io/ttypes.py | 15 +- .../client/samples/CreateLaunchExperiment.java | 4 +- .../org/apache/airavata/model/Workflow.java | 2 +- .../ApplicationDeploymentDescription.java | 2 +- .../appdeployment/ApplicationModule.java | 2 +- .../appcatalog/appdeployment/CommandObject.java | 2 +- .../appcatalog/appdeployment/SetEnvPaths.java | 2 +- .../ApplicationInterfaceDescription.java | 2 +- .../appcatalog/computeresource/BatchQueue.java | 2 +- .../computeresource/CloudJobSubmission.java | 2 +- .../ComputeResourceDescription.java | 2 +- .../computeresource/DataMovementInterface.java | 2 +- .../computeresource/GlobusJobSubmission.java | 2 +- .../computeresource/GridFTPDataMovement.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALDataMovement.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SCPDataMovement.java | 2 +- .../computeresource/SSHJobSubmission.java | 2 +- .../computeresource/UnicoreDataMovement.java | 2 +- .../computeresource/UnicoreJobSubmission.java | 2 +- .../ComputeResourcePreference.java | 2 +- .../gatewayprofile/DataStoragePreference.java | 2 +- .../gatewayprofile/GatewayResourceProfile.java | 129 ++++++++++++++-- .../application/io/InputDataObjectType.java | 2 +- .../application/io/OutputDataObjectType.java | 109 ++++++++++++- .../airavata/model/commons/ErrorModel.java | 2 +- .../model/commons/ValidationResults.java | 2 +- .../airavata/model/commons/ValidatorResult.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 | 2 +- .../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 +- .../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 +- .../impl/task/AdvancedSCPDataStageTask.java | 1 + .../catalog/impl/ApplicationInterfaceImpl.java | 2 + .../catalog/impl/GwyResourceProfileImpl.java | 2 + .../app/catalog/model/ApplicationIntOutput.java | 10 ++ .../core/app/catalog/model/GatewayProfile.java | 11 ++ .../resources/ApplicationOutputResource.java | 10 ++ .../resources/GatewayProfileResource.java | 11 ++ .../app/catalog/util/AppCatalogJPAUtils.java | 2 + .../util/AppCatalogThriftConversion.java | 2 + .../catalog/impl/ExperimentRegistry.java | 4 + .../catalog/model/ExperimentOutput.java | 11 ++ .../experiment/catalog/model/ProcessOutput.java | 12 +- .../resources/ExperimentOutputResource.java | 10 ++ .../resources/ProcessOutputResource.java | 10 ++ .../experiment/catalog/resources/Utils.java | 2 + .../utils/ThriftDataModelConversion.java | 2 + .../src/main/resources/appcatalog-derby.sql | 2 + .../src/main/resources/appcatalog-mysql.sql | 2 + .../src/main/resources/expcatalog-derby.sql | 2 + .../src/main/resources/expcatalog-mysql.sql | 2 + .../airavata-api/application_io_models.thrift | 3 +- .../gateway_resource_profile_model.thrift | 7 +- 120 files changed, 675 insertions(+), 232 deletions(-) ----------------------------------------------------------------------
