Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EE3A9186F9 for ; Tue, 22 Dec 2015 21:31:15 +0000 (UTC) Received: (qmail 87771 invoked by uid 500); 22 Dec 2015 21:31:15 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 87673 invoked by uid 500); 22 Dec 2015 21:31:15 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 87654 invoked by uid 99); 22 Dec 2015 21:31:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Dec 2015 21:31:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 75FFADFE14; Tue, 22 Dec 2015 21:31:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Tue, 22 Dec 2015 21:31:16 -0000 Message-Id: <037c03bf38984b1db15b3a41dc2e9599@git.apache.org> In-Reply-To: <8fe19e57c0454957b2190eba7b360949@git.apache.org> References: <8fe19e57c0454957b2190eba7b360949@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] airavata git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata 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/2d8e3503 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2d8e3503 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2d8e3503 Branch: refs/heads/master Commit: 2d8e3503a2f914299873a2c45052735f6cab0b84 Parents: c62f64a 4a84e86 Author: Shameera Rathnayaka Authored: Tue Dec 22 16:30:59 2015 -0500 Committer: Shameera Rathnayaka Committed: Tue Dec 22 16:30:59 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/Airavata.java | 2 +- .../client/samples/CreateLaunchExperiment.java | 2 +- .../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 | 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 +- .../core/app/catalog/impl/AppCatalogImpl.java | 12 + .../catalog/impl/GwyClientCredentialImpl.java | 104 ++++++ .../catalog/model/GatewayClientCredential.java | 63 ++++ .../resources/AppCatAbstractResource.java | 6 + .../GatewayClientCredentialResource.java | 333 +++++++++++++++++++ .../app/catalog/util/AppCatalogJPAUtils.java | 17 + .../catalog/util/AppCatalogResourceType.java | 3 +- .../catalog/resources/JobResource.java | 3 +- .../catalog/resources/ProcessResource.java | 3 +- .../catalog/resources/TaskResource.java | 3 +- .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/appcatalog-derby.sql | 8 + .../src/main/resources/appcatalog-mysql.sql | 8 + .../catalog/GatewayClientCredentialTest.java | 69 ++++ .../airavata/registry/cpi/AppCatalog.java | 7 + .../registry/cpi/GwyClientCredential.java | 33 ++ .../airavata-apis/airavata_api.thrift | 1 + 96 files changed, 749 insertions(+), 83 deletions(-) ----------------------------------------------------------------------