You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2014/11/07 01:11:37 UTC
[22/23] airavata git commit: Merged master branch
Merged master branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a3351b70
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a3351b70
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a3351b70
Branch: refs/heads/gfac_appcatalog_int
Commit: a3351b7000384a1a28f969fa5d0473d238c1cbcc
Parents: b52499e f7c25ca
Author: shamrath <sh...@gmail.com>
Authored: Thu Nov 6 19:03:13 2014 -0500
Committer: shamrath <sh...@gmail.com>
Committed: Thu Nov 6 19:03:13 2014 -0500
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 2 +-
.../airavata/api/server/WorkflowServer.java | 164 -
.../server/handler/AiravataServerHandler.java | 357 +-
.../server/handler/WorkflowServerHandler.java | 158 -
.../AiravataExperimentStatusUpdator.java | 7 +-
.../java/org/apache/airavata/api/Workflow.java | 8191 ------------------
.../api/client/AiravataClientFactory.java | 30 +-
.../apache/airavata/api/workflow/Workflow.java | 8191 ------------------
.../api/workflow/workflowAPIConstants.java | 56 -
modules/distribution/api-server/pom.xml | 203 +
.../src/main/assembly/bin-assembly.xml | 137 +
.../src/main/assembly/src-assembly.xml | 74 +
.../api-server/src/main/resources/INSTALL | 55 +
.../api-server/src/main/resources/LICENSE | 2387 +++++
.../api-server/src/main/resources/NOTICE | 163 +
.../api-server/src/main/resources/README | 121 +
.../src/main/resources/bin/api-server.sh | 118 +
.../api-server/src/main/resources/bin/logo.txt | 34 +
modules/distribution/gfac-server/pom.xml | 486 ++
.../src/main/assembly/bin-assembly.xml | 305 +
.../src/main/assembly/src-assembly.xml | 75 +
.../gfac-server/src/main/resources/INSTALL | 55 +
.../gfac-server/src/main/resources/LICENSE | 2387 +++++
.../gfac-server/src/main/resources/NOTICE | 163 +
.../gfac-server/src/main/resources/README | 121 +
.../src/main/resources/bin/gfac-server.sh | 118 +
.../gfac-server/src/main/resources/bin/logo.txt | 34 +
.../distribution/orchestrator-server/pom.xml | 325 +
.../src/main/assembly/bin-assembly.xml | 230 +
.../src/main/assembly/src-assembly.xml | 75 +
.../src/main/resources/INSTALL | 55 +
.../src/main/resources/LICENSE | 2387 +++++
.../src/main/resources/NOTICE | 163 +
.../src/main/resources/README | 121 +
.../src/main/resources/bin/logo.txt | 34 +
.../main/resources/bin/orchestrator-server.sh | 118 +
modules/distribution/pom.xml | 5 +-
modules/distribution/server/pom.xml | 22 +-
.../server/src/main/assembly/bin-assembly.xml | 3 +
modules/gfac/airavata-gfac-service/pom.xml | 5 +
modules/gfac/airavata-gfac-stubs/pom.xml | 60 +
.../airavata/gfac/client/GFACInstance.java | 62 +
.../airavata/gfac/client/GFacClientFactory.java | 42 +
.../apache/airavata/gfac/cpi/GfacService.java | 2867 ++++++
.../gfac/cpi/gfac_cpi_serviceConstants.java | 55 +
.../security/TokenizedMyProxyAuthInfo.java | 2 +-
.../monitor/impl/pull/qstat/HPCPullMonitor.java | 6 +-
modules/gfac/pom.xml | 1 +
.../airavata-orchestrator-service/pom.xml | 10 +
.../client/OrchestratorClientFactory.java | 45 -
.../orchestrator/cpi/OrchestratorService.java | 4467 ----------
.../cpi/orchestrator_cpi_serviceConstants.java | 55 -
.../server/OrchestratorServerHandler.java | 180 +-
.../orchestrator/util/DataModelUtils.java | 53 +
.../util/OrchestratorRecoveryHandler.java | 2 +-
.../OrchestratorServerThreadPoolExecutor.java | 35 +
.../airavata-orchestrator-stubs/pom.xml | 60 +
.../client/OrchestratorClientFactory.java | 44 +
.../orchestrator/cpi/OrchestratorService.java | 4568 ++++++++++
.../cpi/orchestrator_cpi_serviceConstants.java | 55 +
.../sample/OrchestratorClientSample.java | 134 +
.../orchestrator-client-sdks/pom.xml | 70 -
.../client/sample/OrchestratorClientSample.java | 138 -
modules/orchestrator/orchestrator-core/pom.xml | 7 +-
.../core/context/OrchestratorContext.java | 3 +-
.../orchestrator/core/gfac/GFACInstance.java | 62 -
.../core/gfac/GFacClientFactory.java | 42 -
.../core/impl/GFACEmbeddedJobSubmitter.java | 6 +-
.../core/impl/GFACServiceJobSubmitter.java | 6 +-
.../orchestrator/core/job/JobSubmitter.java | 3 +-
.../orchestrator/core/BaseOrchestratorTest.java | 9 -
.../orchestrator.cpi.service.thrift | 2 +-
modules/orchestrator/pom.xml | 2 +-
modules/workflow-model/workflow-engine/pom.xml | 7 +-
.../workflow/engine/WorkflowEngineImpl.java | 5 +-
modules/xbaya-gui/pom.xml | 7 +-
.../ui/dialogs/registry/RegistryWindow.java | 4 +-
.../dialogs/workflow/WorkflowImportWindow.java | 4 +-
.../RegistryWorkflowPublisherWindow.java | 4 +-
.../WorkflowInterpreterLaunchWindow.java | 9 +-
.../apache/airavata/xbaya/util/XBayaUtil.java | 4 +-
81 files changed, 18919 insertions(+), 22013 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a3351b70/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/impl/pull/qstat/HPCPullMonitor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a3351b70/modules/gfac/pom.xml
----------------------------------------------------------------------
diff --cc modules/gfac/pom.xml
index dd38b6f,6698d31..34253b9
--- a/modules/gfac/pom.xml
+++ b/modules/gfac/pom.xml
@@@ -35,12 -35,13 +35,13 @@@
<module>gfac-ec2</module>
<module>gfac-ssh</module>
<module>gfac-local</module>
- <module>gfac-hadoop</module>
- <module>gfac-gram</module>
+ <!--<module>gfac-hadoop</module>-->
+ <!--<module>gfac-gram</module>-->
<module>gfac-gsissh</module>
- <module>gfac-bes</module>
+ <!--<module>gfac-bes</module>-->
<module>gfac-monitor</module>
<module>airavata-gfac-service</module>
+ <module>airavata-gfac-stubs</module>
</modules>
</profile>
</profiles>