airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [2/2] git commit: Merge remote-tracking branch 'origin/master'
Date Sun, 02 Mar 2014 20:39:56 GMT
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: 1262568a93625c76627ad5301395dd90400969d7
Parents: 955dfe7 a4c0adc
Author: Suresh Marru <smarru@apache.org>
Authored: Sun Mar 2 15:39:49 2014 -0500
Committer: Suresh Marru <smarru@apache.org>
Committed: Sun Mar 2 15:39:49 2014 -0500

----------------------------------------------------------------------
 .../client/samples/CreateLaunchExperiment.java  |  12 +-
 .../model/util/ExperimentModelUtil.java         |   5 +
 .../apache/airavata/job/monitor/MonitorID.java  |   7 +
 .../airavata/job/monitor/MonitorManager.java    |  30 +-
 .../monitor/impl/pull/qstat/QstatMonitor.java   |  21 +
 .../job/monitor/impl/push/amqp/AMQPMonitor.java |   3 +
 .../airavata/job/monitor/AMQPMonitorTest.java   |   2 +-
 .../airavata/job/monitor/QstatMonitorTest.java  |   4 +-
 .../common/utils/ApplicationSettings.java       |  10 +-
 .../apache/airavata/common/utils/DBUtil.java    |   4 +-
 .../org/apache/airavata/gfac/cpi/GFacImpl.java  |  22 +-
 .../gfac/provider/impl/GSISSHProvider.java      |  62 +--
 .../gfac/provider/impl/GramProvider.java        |   1 -
 .../gfac/provider/impl/SSHProvider.java         |   1 -
 .../apache/airavata/gfac/utils/GFacUtils.java   |  23 +-
 .../server/OrchestratorServerHandler.java       |  19 +-
 .../main/resources/airavata-server.properties   | 254 ++++++++++
 .../src/main/resources/monitor.properties       |   8 +-
 .../orchestrator/client/DocumentCreator.java    | 316 ++++++++++++
 .../client/OrchestratorClientFactoryTest.java   |  87 +++-
 .../test/resources/airavata-server.properties   | 254 ++++++++++
 .../src/test/resources/gfac-config.xml          |  90 ++++
 .../src/test/resources/gsissh.properties        |  26 +
 .../src/test/resources/monitor.properties       |  10 +
 .../src/test/resources/orchestrator.properties  |  26 +
 .../core/impl/EmbeddedGFACJobSubmitter.java     |   5 +-
 .../cpi/impl/SimpleOrchestratorImpl.java        |  12 +-
 .../orchestrator/core/BaseOrchestratorTest.java |  18 +-
 .../registry/jpa/impl/ExperimentRegistry.java   |  63 ++-
 .../jpa/resources/AbstractResource.java         |   2 +-
 .../jpa/resources/ExperimentResource.java       |   1 -
 .../registry/jpa/resources/Utils.java           | 504 +++++++++++--------
 .../resources/WorkflowNodeDetailResource.java   |   2 +-
 .../jpa/utils/ThriftDataModelConversion.java    | 493 +++++++++++-------
 34 files changed, 1837 insertions(+), 560 deletions(-)
----------------------------------------------------------------------



Mime
View raw message