Merge branch 'develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fad21741 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fad21741 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fad21741 Branch: refs/heads/master Commit: fad21741d1f7c4df2b0d7ee9c7be637a15bd4d8e Parents: b5bdad1 26fd7c3 Author: Shameera Rathnayaka <[email protected]> Authored: Fri Apr 22 21:57:54 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Fri Apr 22 21:57:54 2016 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 87 + .../handler/AiravataServerHandlerTest.java | 22 + .../java/org/apache/airavata/api/Airavata.java | 15220 ++++++++++++----- .../main/resources/lib/airavata/Airavata.cpp | 5355 ++++-- .../src/main/resources/lib/airavata/Airavata.h | 1172 +- .../lib/airavata/Airavata_server.skeleton.cpp | 32 + .../lib/airavata/scheduling_model_types.cpp | 66 + .../lib/airavata/scheduling_model_types.h | 28 +- .../lib/airavata/workspace_model_types.cpp | 201 + .../lib/airavata/workspace_model_types.h | 81 + .../resources/lib/Airavata/API/Airavata.php | 3062 +++- .../lib/Airavata/Model/Scheduling/Types.php | 69 + .../lib/Airavata/Model/Workspace/Types.php | 190 + .../lib/apache/airavata/api/Airavata-remote | 35 + .../lib/apache/airavata/api/Airavata.py | 2754 ++- .../apache/airavata/model/scheduling/ttypes.py | 41 +- .../apache/airavata/model/workspace/ttypes.py | 136 + .../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 | 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 +- .../model/data/replica/DataProductModel.java | 2 +- .../data/replica/DataReplicaLocationModel.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 | 328 +- .../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/Notification.java | 920 + .../airavata/model/workspace/Project.java | 2 +- .../apache/airavata/model/workspace/User.java | 2 +- modules/cloud/cloud-provisioning/README | 7 + modules/cloud/cloud-provisioning/pom.xml | 60 + .../airavata/cloud/intf/CloudInterface.java | 78 + .../cloud/intf/impl/OpenstackIntfImpl.java | 276 + .../cloud/openstack/OS4JClientProvider.java | 117 + .../apache/airavata/cloud/util/CloudRef.java | 40 + .../apache/airavata/cloud/util/Constants.java | 36 + .../org/apache/airavata/cloud/util/IPType.java | 39 + .../main/resources/jetstream_openrc.properties | 33 + .../airavata/cloud/test/CloudIntfTest.java | 131 + .../src/test/resources/test_data.properties | 26 + modules/cloud/pom.xml | 6 +- .../main/resources/airavata-server.properties | 6 +- .../test/resources/airavata-server.properties | 274 - .../gfac/core/context/ProcessContext.java | 8 +- .../org/apache/airavata/gfac/impl/Factory.java | 43 +- .../airavata/gfac/impl/GFacEngineImpl.java | 9 +- .../airavata/gfac/impl/HPCRemoteCluster.java | 91 +- .../org/apache/airavata/gfac/impl/SSHUtils.java | 6 +- .../impl/task/DefaultJobSubmissionTask.java | 14 +- .../core/utils/OrchestratorUtils.java | 34 + .../cpi/impl/SimpleOrchestratorImpl.java | 14 +- .../core/experiment/catalog/ResourceType.java | 1 + .../catalog/impl/ExperimentCatalogImpl.java | 17 + .../catalog/impl/NotificationRegistry.java | 87 + .../core/experiment/catalog/impl/UserReg.java | 41 - .../experiment/catalog/impl/UserRegistry.java | 41 + .../experiment/catalog/model/Notification.java | 98 + .../catalog/model/ProcessResourceSchedule.java | 30 + .../catalog/model/UserConfigurationData.java | 30 + .../resources/AbstractExpCatResource.java | 7 + .../catalog/resources/NotificationResource.java | 267 + .../ProcessResourceScheduleResource.java | 30 + .../UserConfigurationDataResource.java | 60 +- .../experiment/catalog/resources/Utils.java | 27 + .../utils/ThriftDataModelConversion.java | 26 + .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/expcatalog-derby.sql | 14 + .../src/main/resources/expcatalog-mysql.sql | 14 + .../registry/cpi/ExpCatParentDataType.java | 3 +- .../cpi/ExperimentCatalogModelType.java | 1 + pom.xml | 2 +- .../airavata-apis/airavata_api.thrift | 33 + .../scheduling_model.thrift | 5 +- .../workspace_model.thrift | 9 + 145 files changed, 24849 insertions(+), 7304 deletions(-) ----------------------------------------------------------------------
