Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into grouper-integration
# Conflicts: # airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java # airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java # airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.cpp # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataProductModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/replica/DataReplicaLocationModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Notification.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java # airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java # modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/620d9fb6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/620d9fb6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/620d9fb6 Branch: refs/heads/develop Commit: 620d9fb6aecadff92c95aa27a28517d62d5a7684 Parents: 5f9dace 2c6d1d5 Author: scnakandala <[email protected]> Authored: Wed Jul 13 01:31:48 2016 -0400 Committer: scnakandala <[email protected]> Committed: Wed Jul 13 01:31:48 2016 -0400 ---------------------------------------------------------------------- INSTALL | 2 +- RELEASE_NOTES | 294 +++++++++++++++++++ .../handler/AiravataServerHandlerTest.java | 71 ++--- .../lib/airavata/user_profile_model_types.cpp | 80 ++--- .../lib/airavata/user_profile_model_types.h | 12 +- .../lib/airavata/workspace_model_types.h | 92 +++++- .../resources/lib/Airavata/Model/User/Types.php | 109 +++---- .../lib/Airavata/Model/Workspace/Types.php | 257 +++++++++++++++- .../lib/apache/airavata/model/user/ttypes.py | 103 +++---- .../apache/airavata/model/workspace/ttypes.py | 170 ++++++++++- .../client/samples/CreateLaunchBES.java | 20 ++ .../client/secure/client/SecureClient.java | 3 +- .../main/resources/bin/airavata-server-start.sh | 9 +- modules/cloud/cloud-provisioning/pom.xml | 10 + modules/cloud/pom.xml | 10 + .../gfac-application-specific-handlers/pom.xml | 10 + modules/gfac/gfac-core/pom.xml | 47 ++- .../core/AbstractJobManagerConfiguration.java | 3 +- .../airavata/gfac/core/ExecutionMode.java | 5 +- .../org/apache/airavata/gfac/core/GFac.java | 5 +- .../airavata/gfac/core/GFacConstants.java | 4 +- .../apache/airavata/gfac/core/GFacEngine.java | 3 +- .../airavata/gfac/core/GFacException.java | 6 +- .../gfac/core/GFacThreadPoolExecutor.java | 5 +- .../apache/airavata/gfac/core/GFacUtils.java | 3 +- .../airavata/gfac/core/JobDescriptor.java | 5 +- .../gfac/core/JobManagerConfiguration.java | 3 +- .../apache/airavata/gfac/core/RequestData.java | 4 +- .../airavata/gfac/core/SSHApiException.java | 4 +- .../airavata/gfac/core/SecurityContext.java | 6 +- .../core/authentication/AuthenticationInfo.java | 4 +- .../authentication/GSIAuthenticationInfo.java | 4 +- .../authentication/SSHKeyAuthentication.java | 4 +- .../SSHPasswordAuthentication.java | 4 +- .../SSHPublicKeyAuthentication.java | 11 +- .../SSHPublicKeyFileAuthentication.java | 11 +- .../core/cluster/AbstractRemoteCluster.java | 3 +- .../airavata/gfac/core/cluster/CommandInfo.java | 4 +- .../gfac/core/cluster/CommandOutput.java | 4 +- .../gfac/core/cluster/JobSubmissionOutput.java | 3 +- .../gfac/core/cluster/OutputParser.java | 5 +- .../gfac/core/cluster/RawCommandInfo.java | 10 +- .../gfac/core/cluster/RemoteCluster.java | 5 +- .../airavata/gfac/core/cluster/ServerInfo.java | 4 +- .../core/config/DataTransferTaskConfig.java | 3 +- .../gfac/core/config/GFacYamlConfigruation.java | 3 +- .../core/config/JobSubmitterTaskConfig.java | 3 +- .../gfac/core/config/ResourceConfig.java | 3 +- .../gfac/core/context/AbstractContext.java | 6 +- .../core/context/AbstractSecurityContext.java | 4 +- .../gfac/core/context/ApplicationContext.java | 6 +- .../airavata/gfac/core/context/GFacContext.java | 3 +- .../gfac/core/context/JobExecutionContext.java | 40 ++- .../gfac/core/context/MessageContext.java | 6 +- .../gfac/core/context/ProcessContext.java | 4 +- .../airavata/gfac/core/context/TaskContext.java | 3 +- .../airavata/gfac/core/monitor/EmailParser.java | 5 +- .../airavata/gfac/core/monitor/JobMonitor.java | 3 +- .../gfac/core/monitor/JobStatusResult.java | 5 +- .../airavata/gfac/core/monitor/MonitorID.java | 5 +- .../gfac/core/scheduler/HostScheduler.java | 5 +- .../gfac/core/task/JobSubmissionTask.java | 3 +- .../apache/airavata/gfac/core/task/Task.java | 3 +- .../airavata/gfac/core/task/TaskException.java | 3 +- .../gfac/core/watcher/CancelRequestWatcher.java | 3 +- .../core/watcher/RedeliveryRequestWatcher.java | 3 +- .../gfac/core/x2012/x12/AfterAnyList.java | 19 ++ .../gfac/core/x2012/x12/AfterOKList.java | 19 ++ .../gfac/core/x2012/x12/ExportProperties.java | 19 ++ .../airavata/gfac/core/x2012/x12/InputList.java | 19 ++ .../core/x2012/x12/JobDescriptorDocument.java | 19 ++ .../gfac/core/x2012/x12/ModuleLoadCommands.java | 19 ++ .../airavata/gfac/core/x2012/x12/PbsParams.java | 19 ++ .../gfac/core/x2012/x12/PostJobCommands.java | 19 ++ .../gfac/core/x2012/x12/PreJobCommands.java | 19 ++ .../core/x2012/x12/impl/AfterAnyListImpl.java | 19 ++ .../core/x2012/x12/impl/AfterOKListImpl.java | 19 ++ .../x2012/x12/impl/ExportPropertiesImpl.java | 19 ++ .../gfac/core/x2012/x12/impl/InputListImpl.java | 19 ++ .../x12/impl/JobDescriptorDocumentImpl.java | 19 ++ .../x2012/x12/impl/ModuleLoadCommandsImpl.java | 19 ++ .../gfac/core/x2012/x12/impl/PbsParamsImpl.java | 19 ++ .../x2012/x12/impl/PostJobCommandsImpl.java | 19 ++ .../core/x2012/x12/impl/PreJobCommandsImpl.java | 19 ++ .../src/main/resources/apache-license.txt | 17 ++ .../airavata/gfac/impl/LocalCommandOutput.java | 20 ++ .../airavata/gfac/impl/LocalRemoteCluster.java | 20 ++ .../airavata/messaging/client/TestReader.java | 20 ++ .../messaging/core/stats/CountWriterTask.java | 20 ++ .../messaging/core/stats/LatencyWriterTask.java | 20 ++ .../messaging/core/stats/StatCounter.java | 20 ++ modules/monitoring/pom.xml | 10 + .../airavata/monitoring/MessageExtract.java | 20 ++ .../org/apache/airavata/monitoring/Util.java | 20 ++ .../monitoring/consumer/StatusConsumer.java | 20 ++ .../monitoring/consumer/StatusReceiver.java | 20 ++ .../monitoring/mailbox/GmailSMTPMailBox.java | 20 ++ .../airavata/monitoring/mailbox/MailBox.java | 20 ++ .../producer/RabbitMQEmailPublisher.java | 20 ++ .../monitoring/simulator/FetchPublish.java | 20 ++ .../catalog/impl/GatewayRegistry.java | 18 ++ .../core/experiment/catalog/model/Gateway.java | 102 ++++++- .../catalog/resources/GatewayResource.java | 108 +++++++ .../utils/ThriftDataModelConversion.java | 9 + .../registry/cpi/ExperimentCatalog.java | 16 - modules/user-profile/pom.xml | 10 + modules/user-profile/user-profile-core/pom.xml | 10 + .../core/UserProfileCPIImplTest.java | 4 +- modules/user-profile/user-profile-cpi/pom.xml | 10 + modules/workflow/pom.xml | 10 + modules/workflow/workflow-core/pom.xml | 10 + modules/xbaya/pom.xml | 10 + .../src/main/java/org/airavata/xbaya/App.java | 20 ++ .../org/airavata/xbaya/ui/home/HomeWindow.java | 20 ++ .../test/java/org/airavata/xbaya/AppTest.java | 20 ++ .../workspace_model.thrift | 23 +- .../user-group-models/user_profile_model.thrift | 31 +- 117 files changed, 2180 insertions(+), 453 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/620d9fb6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/workspace_model_types.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/620d9fb6/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Types.php ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/620d9fb6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/workspace/ttypes.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/620d9fb6/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/620d9fb6/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift ---------------------------------------------------------------------- diff --cc thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift index e214d39,2755b45..e620bbc --- a/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift +++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/workspace_model.thrift @@@ -52,19 -51,32 +52,36 @@@ struct Project } struct User { - 1: required string userName, - 2: optional list<Group> groupList + 1: required string airavataInternalUserId = airavata_commons.DEFAULT_ID, + 2: optional string userName, + 3: required string gatewayId, + 4: optional string firstName, + 5: optional string lastName, + 6: optional string email } + enum GatewayApprovalStatus { + REQUESTED, + APPROVED, + ACTIVE, + DEACTIVATED + } + struct Gateway { 1: required string gatewayId, - 2: optional string gatewayName, - 3: optional string domain, - 4: optional string emailAddress + 2: required GatewayApprovalStatus gatewayApprovalStatus, + 3: optional string gatewayName, + 4: optional string domain, + 5: optional string emailAddress + 6: optional string gatewayAcronym, + 7: optional string gatewayURL, + 8: optional string gatewayPublicAbstract, + 9: optional string reviewProposalDescription, + 10: optional string gatewayAdminFirstName, + 11: optional string gatewayAdminLastName, + 12: optional string gatewayAdminEmail, + 13: optional string identityServerUserName, + 14: optional string identityServerPasswordToken } enum NotificationPriority {
