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/92888e5f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/92888e5f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/92888e5f Branch: refs/heads/master Commit: 92888e5f1a3b11840c711db70018f941e00db185 Parents: 0b8dcd3 e32c1a9 Author: raminder <[email protected]> Authored: Tue Feb 3 16:40:30 2015 -0500 Committer: raminder <[email protected]> Committed: Tue Feb 3 16:40:30 2015 -0500 ---------------------------------------------------------------------- .../common/utils/ApplicationSettings.java | 7 + .../main/resources/airavata-server.properties | 5 +- .../store/server/CredentialStoreServer.java | 133 +++++++++++++++++++ .../server/CredentialStoreServerHandler.java | 44 ++++++ .../invoker/MsgBoxWsaResponsesCorrelator.java | 95 +++++++------ .../xbaya/jython/runner/JythonClassLoader.java | 8 +- .../xbaya/jython/script/JythonScript.java | 11 +- .../xbaya/lead/LeadContextHeaderHelper.java | 21 ++- .../xbaya/lead/NotificationHandler.java | 49 +++---- .../monitor/MonitorConfigurationWindow.java | 15 +-- 10 files changed, 280 insertions(+), 108 deletions(-) ----------------------------------------------------------------------
