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 AAC9017329 for ; Fri, 17 Oct 2014 16:13:22 +0000 (UTC) Received: (qmail 22724 invoked by uid 500); 17 Oct 2014 16:13:22 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 22598 invoked by uid 500); 17 Oct 2014 16:13:22 -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 22574 invoked by uid 99); 17 Oct 2014 16:13:22 -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, 17 Oct 2014 16:13:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 556B0939F1E; Fri, 17 Oct 2014 16:13:22 +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, 17 Oct 2014 16:13:23 -0000 Message-Id: <38f404d5969f4afdaacc418496ad655e@git.apache.org> In-Reply-To: <7fe926a5f86a4ff8a1f4984489b34c06@git.apache.org> References: <7fe926a5f86a4ff8a1f4984489b34c06@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] 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/7c2af985 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7c2af985 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7c2af985 Branch: refs/heads/master Commit: 7c2af98553ef0a243242a2c48aeb969eb226711d Parents: 62ba471 82da3d2 Author: shamrath Authored: Thu Oct 16 23:00:04 2014 -0400 Committer: shamrath Committed: Thu Oct 16 23:00:04 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 134 +++-- .../api/server/util/RegistryInitUtil.java | 4 +- .../client/tools/DocumentCreatorNew.java | 2 +- .../apache/airavata/common/utils/Constants.java | 2 +- .../airavata/common/utils/ServerSettings.java | 87 +-- .../airavata/common/utils/ServiceUtils.java | 186 +++---- .../common/utils/ApplicationSettingsTest.java | 11 +- .../main/resources/airavata-client.properties | 2 +- .../main/resources/airavata-server.properties | 202 +++---- .../server/src/main/resources/axis2.xml | 533 ------------------- .../server/src/main/resources/host.xml | 86 --- .../basic/BasicAccessAuthenticator.java | 15 +- .../session/ServletRequestHelper.java | 19 +- .../main/resources/airavata-server.properties | 286 ++++------ .../src/main/resources/bin/airavata-server.sh | 5 +- .../server/src/main/resources/bin/api-server.sh | 118 ++++ .../src/main/resources/bin/gfac-server.sh | 118 ++++ .../main/resources/bin/orchestrator-server.sh | 118 ++++ .../src/main/resources/bin/workflow-server.sh | 118 ++++ .../airavata/gfac/server/GfacServerHandler.java | 15 +- .../airavata/gfac/core/utils/GFacUtils.java | 7 +- .../security/TokenizedMyProxyAuthInfo.java | 5 +- .../gfac/ssh/security/TokenizedSSHAuthInfo.java | 3 + .../integration/tools/DocumentCreatorNew.java | 2 +- .../airavata/messaging/core/MessageHandler.java | 2 +- .../messaging/core/MessagingConstants.java | 3 + .../airavata/messaging/core/TestClient.java | 15 +- .../messaging/core/impl/RabbitMQConsumer.java | 131 +++-- .../messaging/core/impl/RabbitMQProducer.java | 2 +- .../messaging/core/impl/RabbitMQPublisher.java | 8 +- .../server/OrchestratorServerHandler.java | 4 +- .../core/impl/GFACEmbeddedJobSubmitter.java | 2 +- .../core/impl/GFACServiceJobSubmitter.java | 2 +- .../cpi/impl/AbstractOrchestrator.java | 5 +- .../registry/jpa/impl/GatewayRegistry.java | 2 +- .../registry/jpa/impl/RegistryImpl.java | 12 +- .../persistance/registry/jpa/impl/UserReg.java | 2 +- .../org/apache/airavata/server/ServerMain.java | 26 +- .../airavata/xbaya/messaging/EventData.java | 44 +- .../xbaya/messaging/EventDataRepository.java | 8 +- .../airavata/xbaya/messaging/MessageClient.java | 220 -------- .../airavata/xbaya/messaging/Monitor.java | 139 +++-- 42 files changed, 1103 insertions(+), 1602 deletions(-) ----------------------------------------------------------------------