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 0E7F4111AC for ; Fri, 16 May 2014 20:25:28 +0000 (UTC) Received: (qmail 85176 invoked by uid 500); 16 May 2014 17:48:29 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 55246 invoked by uid 500); 16 May 2014 17:23:28 -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 78001 invoked by uid 99); 16 May 2014 17:05:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 May 2014 17:05:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1900A92DD91; Fri, 16 May 2014 17:05:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: samindaw@apache.org To: commits@airavata.apache.org Date: Fri, 16 May 2014 17:05:31 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/38f12a05 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/38f12a05 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/38f12a05 Branch: refs/heads/master Commit: 38f12a05ed9bb50fe40108d7f159b45bb55f38ec Parents: 6edddf2 a0c369a Author: Saminda Wijeratne Authored: Fri May 16 10:05:11 2014 -0700 Committer: Saminda Wijeratne Committed: Fri May 16 10:05:11 2014 -0700 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 79 +- .../java/org/apache/airavata/api/Airavata.java | 153 +- .../api/appcatalog/ApplicationCatalogAPI.java | 4800 ++++++++++-- .../src/main/resources/lib/Airavata.cpp | 38 +- .../src/main/resources/lib/Airavata.h | 29 +- .../resources/lib/Airavata_server.skeleton.cpp | 2 +- .../resources/lib/ApplicationCatalogAPI.cpp | 6973 ++++++++++++++++++ .../main/resources/lib/ApplicationCatalogAPI.h | 3040 ++++++++ .../ApplicationCatalogAPI_server.skeleton.cpp | 139 + .../src/main/resources/lib/airavataAPI_types.h | 1 + .../lib/applicationCatalogAPI_constants.cpp | 19 + .../lib/applicationCatalogAPI_constants.h | 25 + .../lib/applicationCatalogAPI_types.cpp | 13 + .../resources/lib/applicationCatalogAPI_types.h | 25 + .../applicationCatalogDataModel_constants.cpp | 19 + .../lib/applicationCatalogDataModel_constants.h | 25 + .../lib/applicationCatalogDataModel_types.cpp | 1260 ++++ .../lib/applicationCatalogDataModel_types.h | 730 ++ .../resources/lib/experimentModel_types.cpp | 279 +- .../main/resources/lib/experimentModel_types.h | 98 + .../resources/lib/Airavata/API/Airavata.php | 32 +- .../API/AppCatalog/ApplicationCatalogAPI.php | 5387 ++++++++++++++ .../lib/Airavata/API/AppCatalog/Types.php | 22 + .../Model/Workspace/Experiment/Types.php | 312 +- .../src/main/resources/lib/Types.php | 1567 ++++ .../model/appcatalog/ApplicationDeployment.java | 600 ++ .../model/appcatalog/ApplicationDescriptor.java | 506 ++ .../model/appcatalog/ApplicationInterface.java | 658 ++ .../appcatalog/ComputeResourceDescription.java | 1537 ++++ .../model/appcatalog/DataMovementProtocol.java | 83 + .../model/appcatalog/GSISSHJobSubmission.java | 1163 +++ .../model/appcatalog/GlobusJobSubmission.java | 620 ++ .../model/appcatalog/JobSubmissionProtocol.java | 77 + .../appcatalog/JobSubmissionProtocols.java | 937 +++ .../model/appcatalog/ResourceJobManager.java | 83 + .../model/appcatalog/SCPDataMovement.java | 511 ++ .../model/appcatalog/SSHJobSubmission.java | 511 ++ .../model/appcatalog/SecurityProtocol.java | 82 + .../applicationCatalogDataModelConstants.java | 55 + .../model/workspace/experiment/Experiment.java | 180 +- .../workspace/experiment/ValidationResults.java | 543 ++ .../workspace/experiment/ValidatorResult.java | 505 ++ .../airavataAPI.thrift | 3 +- .../applicationCatalogAPI.thrift | 59 +- .../applicationCatalogDataModel.thrift | 2 +- .../experimentModel.thrift | 19 + .../AdvanceInputDataHandlingResource.java | 10 +- .../AdvancedOutputDataHandlingResource.java | 10 +- .../ComputationSchedulingResource.java | 11 +- .../resources/DataTransferDetailResource.java | 3 + .../jpa/resources/ExperimentResource.java | 10 + .../jpa/resources/JobDetailResource.java | 6 + .../jpa/resources/TaskDetailResource.java | 3 + .../resources/WorkflowNodeDetailResource.java | 6 + .../jpa/utils/ThriftDataModelConversion.java | 107 +- 55 files changed, 32941 insertions(+), 1026 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/38f12a05/airavata-api/thrift-interface-descriptions/applicationCatalogDataModel.thrift ----------------------------------------------------------------------