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 <[email protected]> Authored: Thu Oct 16 23:00:04 2014 -0400 Committer: shamrath <[email protected]> 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(-) ----------------------------------------------------------------------
