This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch staging in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 58678923e9754ea8839dfdcce113b831c09a66c7 Merge: cc699a4 42bd72f Author: dimuthu <[email protected]> AuthorDate: Mon Apr 23 16:19:08 2018 -0400 Merge branch 'develop' into staging .../api/server/handler/AiravataServerHandler.java | 3 +- modules/airavata-helix/agent-api/pom.xml | 12 +- .../apache/airavata/agents/api/AgentAdaptor.java | 2 + .../org/apache/airavata/agents/api/AgentStore.java | 122 -------- .../org/apache/airavata/agents/api/AgentUtils.java | 34 ++ modules/airavata-helix/agent-impl/pom.xml | 1 + .../airavata-helix/agent-impl/ssh-agent/pom.xml | 25 +- .../helix/agent/local/LocalAgentAdaptor.java | 69 ----- .../airavata/helix/agent/ssh/SshAgentAdaptor.java | 109 ++++--- .../agent/storage/StorageResourceAdaptorImpl.java | 67 +--- .../agent-impl/{ => sshj-agent}/pom.xml | 24 +- .../airavata/helix/adaptor/PoolingSSHJClient.java | 345 +++++++++++++++++++++ .../airavata/helix/adaptor/SSHJAgentAdaptor.java | 217 +++++++++++++ .../airavata/helix/adaptor/SSHJStorageAdaptor.java | 73 +++++ .../adaptor/wrapper/SCPFileTransferWrapper.java | 76 +++++ .../helix/adaptor/wrapper/SFTPClientWrapper.java} | 29 +- .../helix/adaptor/wrapper/SessionWrapper.java | 183 +++++++++++ .../controller/conf/airavata-server.properties | 2 +- .../participant/conf/airavata-server.properties | 136 +------- .../post-wm/conf/airavata-server.properties | 93 +----- .../pre-wm/conf/airavata-server.properties | 115 +------ modules/airavata-helix/helix-spectator/pom.xml | 8 +- .../airavata/helix/impl/task/AiravataTask.java | 150 ++++----- .../airavata/helix/impl/task/TaskContext.java | 205 ++++-------- .../impl/task/cancel/CancelCompletingTask.java | 14 +- .../task/cancel/RemoteJobCancellationTask.java | 65 +++- .../airavata/helix/impl/task/env/EnvSetupTask.java | 2 +- .../helix/impl/task/staging/ArchiveTask.java | 7 +- .../helix/impl/task/staging/DataStagingTask.java | 40 ++- .../impl/task/staging/InputDataStagingTask.java | 10 + .../impl/task/staging/OutputDataStagingTask.java | 37 ++- .../task/submission/DefaultJobSubmissionTask.java | 75 +++-- .../task/submission/ForkJobSubmissionTask.java | 2 +- .../impl/task/submission/JobSubmissionTask.java | 50 +-- .../task/submission/config/GroovyMapBuilder.java | 9 +- .../impl/task/submission/config/JobFactory.java | 19 +- .../helix/impl/workflow/PostWorkflowManager.java | 245 ++++++--------- .../helix/impl/workflow/PreWorkflowManager.java | 126 +++----- .../helix/impl/workflow/WorkflowManager.java | 124 ++++++++ .../src/main/resources/airavata-server.properties | 217 +------------ .../helix-spectator/src/main/resources/logback.xml | 4 +- modules/airavata-helix/task-api/pom.xml | 12 +- .../helix/task/api/support/AdaptorSupport.java | 6 +- modules/airavata-helix/task-core/pom.xml | 17 +- .../helix/core/support/AdaptorSupportImpl.java | 65 ---- .../helix/core/support/TaskHelperImpl.java | 2 +- .../core/support/adaptor/AdaptorSupportImpl.java | 106 +++++++ .../helix/core/support/adaptor/AgentStore.java | 83 +++++ .../airavata/helix/core/util/MonitoringUtil.java | 158 ++++++++++ .../apache/airavata/helix/core/util/TaskUtil.java | 4 + ...{WorkflowManager.java => WorkflowOperator.java} | 6 +- .../airavata/common/utils}/ThriftClientPool.java | 2 +- .../airavata/monitor/email/EmailBasedMonitor.java | 3 +- .../messaging/core/impl/RabbitMQPublisher.java | 31 +- pom.xml | 2 +- 55 files changed, 2109 insertions(+), 1534 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
