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 B0D361092A for ; Fri, 7 Mar 2014 20:51:31 +0000 (UTC) Received: (qmail 17106 invoked by uid 500); 7 Mar 2014 20:51:30 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 17016 invoked by uid 500); 7 Mar 2014 20:51:29 -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 17000 invoked by uid 99); 7 Mar 2014 20:51:29 -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, 07 Mar 2014 20:51:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 33D4093A830; Fri, 7 Mar 2014 20:51:29 +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, 07 Mar 2014 20:51:30 -0000 Message-Id: <843862f9105840b0b213f16346dfcafe@git.apache.org> 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/1f298eab Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1f298eab Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1f298eab Branch: refs/heads/master Commit: 1f298eabd66e847b9c656a11a4dfcd1d3c7bf906 Parents: 9e71880 4932605 Author: Saminda Wijeratne Authored: Fri Mar 7 15:51:03 2014 -0500 Committer: Saminda Wijeratne Committed: Fri Mar 7 15:51:03 2014 -0500 ---------------------------------------------------------------------- .../java-client-samples/pom.xml | 6 +- .../client/samples/CreateLaunchExperiment.java | 67 ++++++++++- .../main/resources/airavata-client.properties | 8 +- .../airavata/client/tools/DocumentCreator.java | 116 ++++++++++++++++++- .../monitor/impl/pull/qstat/QstatMonitor.java | 2 + .../impl/pull/qstat/ResourceConnection.java | 4 +- .../airavata/job/monitor/state/JobStatus.java | 17 ++- .../test/resources/airavata-server.properties | 2 +- .../resources/conf/airavata-client.properties | 2 +- .../test/resources/airavata-server.properties | 2 +- .../test/resources/airavata-server.properties | 2 +- .../main/resources/airavata-server.properties | 2 +- .../test/resources/airavata-server.properties | 2 +- .../main/resources/airavata-client.properties | 2 +- .../main/resources/airavata-server.properties | 2 +- .../test/resources/airavata-server.properties | 2 +- .../registry/jpa/impl/ExperimentRegistry.java | 2 +- .../test/resources/airavata-client.properties | 2 +- .../main/resources/airavata-server.properties | 2 +- .../gsi/ssh/api/job/SlurmOutputParser.java | 14 +-- 20 files changed, 225 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/1f298eab/modules/server/src/main/resources/airavata-server.properties ----------------------------------------------------------------------