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 A23F617DF3 for ; Fri, 10 Apr 2015 15:50:35 +0000 (UTC) Received: (qmail 77387 invoked by uid 500); 10 Apr 2015 15:50:26 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 77271 invoked by uid 500); 10 Apr 2015 15:50:26 -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 77233 invoked by uid 99); 10 Apr 2015 15:50:26 -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; Fri, 10 Apr 2015 15:50:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 050BADFF0B; Fri, 10 Apr 2015 15:50:26 +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: Fri, 10 Apr 2015 15:50:27 -0000 Message-Id: <1f42578f824345cb82b4b50550a29bb8@git.apache.org> In-Reply-To: <154e3dee7ef44e92abcd6005cbae32a8@git.apache.org> References: <154e3dee7ef44e92abcd6005cbae32a8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] 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/fc208820 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fc208820 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fc208820 Branch: refs/heads/emailMonitoring Commit: fc20882025dd1830b85c626522fd64da03080f20 Parents: 50672a7 fdb3fc9 Author: shamrath Authored: Thu Apr 9 16:15:33 2015 -0400 Committer: shamrath Committed: Thu Apr 9 16:15:33 2015 -0400 ---------------------------------------------------------------------- .../test-suite/multi-tenanted-airavata/README | 2 +- .../test-suite/multi-tenanted-airavata/pom.xml | 29 ++++ .../ApplicationRegister.java | 147 +++++++++++-------- .../ComputeResourceRegister.java | 2 +- .../ExperimentExecution.java | 140 ++++++++++-------- .../FrameworkBootstrapping.java | 2 +- .../multitenantedairavata/GatewayRegister.java | 23 ++- .../utils/FrameworkUtils.java | 54 +++++++ .../utils/TestFrameworkConstants.java | 3 + .../main/resources/test-framework.properties | 3 + 10 files changed, 275 insertions(+), 130 deletions(-) ----------------------------------------------------------------------