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 04C1F11447 for ; Wed, 14 May 2014 17:12:36 +0000 (UTC) Received: (qmail 21726 invoked by uid 500); 14 May 2014 16:12:35 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 21642 invoked by uid 500); 14 May 2014 16:12:35 -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 21623 invoked by uid 99); 14 May 2014 16:12:35 -0000 Received: from Unknown (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 16:12:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D553F8C48D9; Wed, 14 May 2014 16:12:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lahiru@apache.org To: commits@airavata.apache.org Date: Wed, 14 May 2014 16:12:35 -0000 Message-Id: <8a20f5dfa68a4dddbe3070eca44a0ddb@git.apache.org> In-Reply-To: <9c2fdc1ad33b434aae8db4e7ce75b284@git.apache.org> References: <9c2fdc1ad33b434aae8db4e7ce75b284@git.apache.org> 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/d76c9d57 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d76c9d57 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d76c9d57 Branch: refs/heads/master Commit: d76c9d57fae4574d47624dddeadae28e444b0317 Parents: f05dd0f 7147780 Author: lahiru Authored: Wed May 14 12:12:18 2014 -0400 Committer: lahiru Committed: Wed May 14 12:12:18 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 19 ++- .../java/org/apache/airavata/api/Airavata.java | 125 ++------------ .../src/main/resources/lib/Airavata.cpp | 28 +--- .../src/main/resources/lib/Airavata.h | 24 +-- .../resources/lib/Airavata_server.skeleton.cpp | 2 +- .../resources/lib/experimentModel_types.cpp | 4 +- .../main/resources/lib/experimentModel_types.h | 7 +- .../resources/lib/Airavata/API/Airavata.php | 29 +--- .../Model/Workspace/Experiment/Types.php | 14 +- .../client/samples/CreateLaunchExperiment.java | 10 +- .../samples/CreateLaunchExperimentUS3.java | 8 +- .../model/workspace/experiment/DataType.java | 13 +- airavata-api/generate-thrift-files.sh | 10 +- .../airavataAPI.thrift | 3 +- .../applicationCatalogAPI.thrift | 165 +++++++++++++++++++ .../apache/airavata/integration/BaseCaseIT.java | 4 +- .../airavata/integration/DataRetrievalIT.java | 2 +- .../airavata/integration/SimpleEchoIT.java | 2 +- 18 files changed, 246 insertions(+), 223 deletions(-) ----------------------------------------------------------------------