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/98fc3f58 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/98fc3f58 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/98fc3f58 Branch: refs/heads/develop Commit: 98fc3f58280d126f2c6fd1d03477f8b9a9332838 Parents: 5ce750d 2fe5278 Author: Shameera Rathnayaka <[email protected]> Authored: Wed Jan 6 14:15:50 2016 -0500 Committer: Shameera Rathnayaka <[email protected]> Committed: Wed Jan 6 14:15:50 2016 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 166 ++++++++++++++----- .../java/org/apache/airavata/api/Airavata.java | 2 +- .../lib/airavata/experiment_model_types.cpp | 22 +++ .../lib/airavata/experiment_model_types.h | 12 +- .../lib/airavata/process_model_types.cpp | 22 +++ .../lib/airavata/process_model_types.h | 12 +- .../lib/Airavata/Model/Experiment/Types.php | 23 +++ .../lib/Airavata/Model/Process/Types.php | 23 +++ .../apache/airavata/model/experiment/ttypes.py | 15 +- .../lib/apache/airavata/model/process/ttypes.py | 15 +- .../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/GlobusJobSubmission.java | 2 +- .../computeresource/JobSubmissionInterface.java | 2 +- .../computeresource/LOCALSubmission.java | 2 +- .../computeresource/ResourceJobManager.java | 2 +- .../computeresource/SSHJobSubmission.java | 2 +- .../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 | 2 +- .../model/experiment/ExperimentStatistics.java | 2 +- .../experiment/ExperimentSummaryModel.java | 2 +- .../experiment/UserConfigurationDataModel.java | 116 ++++++++++++- .../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 | 116 ++++++++++++- .../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 +- .../model/util/ExperimentModelUtil.java | 1 + .../gfac/impl/task/SCPDataStageTask.java | 17 +- .../catalog/impl/ExperimentRegistry.java | 4 + .../core/experiment/catalog/model/Process.java | 10 ++ .../catalog/model/UserConfigurationData.java | 11 ++ .../catalog/resources/ProcessResource.java | 10 ++ .../UserConfigurationDataResource.java | 10 ++ .../experiment/catalog/resources/Utils.java | 1 + .../utils/ThriftDataModelConversion.java | 2 + .../src/main/resources/expcatalog-derby.sql | 2 + .../src/main/resources/expcatalog-mysql.sql | 2 + .../experiment_model.thrift | 1 + .../process_model.thrift | 3 +- 100 files changed, 627 insertions(+), 141 deletions(-) ----------------------------------------------------------------------
