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 4F97318818 for ; Wed, 13 Jan 2016 17:02:39 +0000 (UTC) Received: (qmail 16438 invoked by uid 500); 13 Jan 2016 17:02:39 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 16330 invoked by uid 500); 13 Jan 2016 17:02:38 -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 15695 invoked by uid 99); 13 Jan 2016 17:02:38 -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; Wed, 13 Jan 2016 17:02:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9B03AE3848; Wed, 13 Jan 2016 17:02:38 +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: Wed, 13 Jan 2016 17:02:59 -0000 Message-Id: <52f7f2a3140c48b8877f1721ead01407@git.apache.org> In-Reply-To: <322fe77c52bb471ba0fb9d423de4ad4a@git.apache.org> References: <322fe77c52bb471ba0fb9d423de4ad4a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/42] 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/531cbdfb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/531cbdfb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/531cbdfb Branch: refs/heads/develop Commit: 531cbdfbcdc07893f69f0bea8cec9011fdf3a7b7 Parents: bd77541 4dc6588 Author: scnakandala Authored: Wed Jan 6 11:34:39 2016 -0500 Committer: scnakandala Committed: Wed Jan 6 11:34:39 2016 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 232 ++++++++++++++----- .../src/main/resources/expcatalog-mysql.sql | 13 +- 2 files changed, 179 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/531cbdfb/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql ----------------------------------------------------------------------