[3/3] airavata git commit: Merge branch 'master' into emailMonitoring

[sh...@apache.org]

Merge branch 'master' into emailMonitoring


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5e77e4b5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5e77e4b5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5e77e4b5

Branch: refs/heads/emailMonitoring
Commit: 5e77e4b5fddb88d538431c90c61e2c9427047939
Parents: 6ffc3ee 1d862a4
Author: shamrath <sh...@gmail.com>
Authored: Wed Apr 8 11:25:56 2015 -0400
Committer: shamrath <sh...@gmail.com>
Committed: Wed Apr 8 11:25:56 2015 -0400

----------------------------------------------------------------------
 .../airavata/api/server/AiravataAPIServer.java  | 16 ++++----
 .../server/handler/AiravataServerHandler.java   | 22 +++++------
 .../AiravataExperimentStatusUpdator.java        |  4 +-
 .../airavata/common/utils/ServerSettings.java   |  6 ---
 .../main/resources/airavata-server.properties   |  1 -
 .../test/resources/airavata-server.properties   |  1 -
 .../main/resources/airavata-server.properties   |  1 -
 .../src/main/resources/bin/airavata-server.sh   |  8 ++--
 .../core/monitor/AiravataJobStatusUpdator.java  |  4 +-
 .../core/monitor/AiravataTaskStatusUpdator.java |  8 +---
 .../AiravataWorkflowNodeStatusUpdator.java      |  4 +-
 .../server/OrchestratorServerHandler.java       | 40 +++++++++-----------
 12 files changed, 43 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/5e77e4b5/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/5e77e4b5/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------