Merge branch 'master' into simpleWorkflowEngine
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0ae7e833 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0ae7e833 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0ae7e833 Branch: refs/heads/master Commit: 0ae7e833a80abec8b9507082ebc834ea30d5afad Parents: 0bc98a3 d9ae024 Author: shamrath <[email protected]> Authored: Wed Feb 18 08:37:30 2015 -0500 Committer: shamrath <[email protected]> Committed: Wed Feb 18 08:37:30 2015 -0500 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 68 +++--- .../client/samples/RegisterSampleData.java | 2 +- .../tools/RegisterSampleApplications.java | 13 +- .../common/utils/ApplicationSettings.java | 16 ++ .../apache/airavata/common/utils/Constants.java | 2 + .../main/resources/airavata-server.properties | 5 +- .../credential/store/client/TestSSLClient.java | 140 ++++++++++++ .../store/server/CredentialStoreServer.java | 109 ++++++---- .../server/CredentialStoreServerHandler.java | 37 +++- .../airavata/credential/store/util/Utility.java | 14 +- .../src/main/resources/bin/airavata-server.sh | 2 +- modules/messaging/client/README | 15 ++ modules/messaging/client/pom.xml | 103 +++++++++ .../messaging/client/RabbitMQListner.java | 215 +++++++++++++++++++ .../messaging/core/impl/RabbitMQPublisher.java | 12 +- .../messaging/core/stats/StatCounter.java | 69 ++++++ .../messaging/core/stats/WriterTask.java | 39 ++++ modules/messaging/pom.xml | 1 + .../org/apache/airavata/server/ServerMain.java | 4 +- 19 files changed, 754 insertions(+), 112 deletions(-) ----------------------------------------------------------------------
