merging develop with master and resolving conflcts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/caca2fe6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/caca2fe6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/caca2fe6 Branch: refs/heads/master Commit: caca2fe6de64b919b0eedca1be18e083bbaa8823 Parents: 2bab218 b96cb16 Author: Chathuri Wimalasena <[email protected]> Authored: Tue Feb 9 11:08:18 2016 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Feb 9 11:08:18 2016 -0500 ---------------------------------------------------------------------- .../gfac/core/cluster/RemoteCluster.java | 3 + .../airavata/gfac/impl/BESRemoteCluster.java | 6 + .../org/apache/airavata/gfac/impl/Factory.java | 14 +- .../airavata/gfac/impl/HPCRemoteCluster.java | 8 +- .../airavata/gfac/impl/LocalRemoteCluster.java | 6 + .../server/OrchestratorServerHandler.java | 1 - modules/workflow/workflow-core/pom.xml | 5 + .../airavata/workflow/core/WorkflowInfo.java | 87 ++++ .../workflow/core/dag/edge/DirectedEdge.java | 4 + .../core/dag/nodes/ApplicationNode.java | 5 + .../core/dag/nodes/ApplicationNodeImpl.java | 11 + .../core/parser/JsonWorkflowParser.java | 519 ++++++++++++++++++- .../workflow/core/parser/ParserException.java | 40 ++ .../workflow/core/parser/WorkflowParser.java | 3 +- .../airavata/workflow/core/WorkflowDAGTest.java | 46 -- .../core/parser/JsonWorkflowParserTest.java | 83 ++- .../src/test/resources/TestWorkflow.json | 8 +- 17 files changed, 773 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/caca2fe6/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ---------------------------------------------------------------------- diff --cc modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java index b0765ec,db36ce6..7c192f5 --- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java +++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java @@@ -135,7 -135,7 +135,6 @@@ public class OrchestratorServerHandler public boolean launchExperiment(String experimentId, String gatewayId) throws TException { ExperimentModel experiment = null; try { -- String experimentNodePath = GFacUtils.getExperimentNodePath (experimentId); ZKPaths.mkdirs(curatorClient.getZookeeperClient().getZooKeeper(), experimentNodePath); String experimentCancelNode = ZKPaths.makePath(experimentNodePath, ZkConstants.ZOOKEEPER_CANCEL_LISTENER_NODE);
