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 2015/09/04 22:29:17 UTC
[1/2] airavata git commit: Fixed cancel zookeeper node path issue
Repository: airavata
Updated Branches:
refs/heads/master 39a0365d8 -> 2c4044cd6
Fixed cancel zookeeper node path issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/12a4800c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/12a4800c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/12a4800c
Branch: refs/heads/master
Commit: 12a4800cfc2f7f90306b5f36f3bed4c6a3996e49
Parents: 60e657d
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Sep 4 16:28:38 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Sep 4 16:28:38 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/server/GfacServerHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/12a4800c/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
index 8427cdc..94dbc57 100644
--- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
+++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java
@@ -336,7 +336,7 @@ public class GfacServerHandler implements GfacService.Iface {
curatorClient.getData().usingWatcher(Factory.getCancelRequestWatcher()).forPath(cancelListenerNode);*/
// create /experiments/{experimentId}/cancel node and set watcher for data changes
- String experimentCancelNode = experimentNodePath + "/" + ZkConstants.ZOOKEEPER_CANCEL_LISTENER_NODE;
+ String experimentCancelNode = ZKPaths.makePath(experimentNodePath, ZkConstants.ZOOKEEPER_CANCEL_LISTENER_NODE);
ZKPaths.mkdirs(curatorClient.getZookeeperClient().getZooKeeper(), experimentCancelNode);
curatorClient.getData().usingWatcher(Factory.getCancelRequestWatcher()).forPath (experimentCancelNode);
[2/2] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2c4044cd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2c4044cd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2c4044cd
Branch: refs/heads/master
Commit: 2c4044cd63fa42c61a6f04d87b54ba26e3c40959
Parents: 12a4800 39a0365
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Fri Sep 4 16:29:07 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Fri Sep 4 16:29:07 2015 -0400
----------------------------------------------------------------------
.../catalog/resources/ExperimentResource.java | 2 -
.../catalog/resources/GatewayResource.java | 2 -
.../catalog/resources/JobResource.java | 2 -
.../catalog/resources/JobStatusResource.java | 6 +--
.../catalog/resources/ProcessErrorResource.java | 6 +--
.../catalog/resources/ProcessInputResource.java | 4 +-
.../resources/ProcessOutputResource.java | 4 +-
.../catalog/resources/ProcessResource.java | 2 -
.../ProcessResourceScheduleResource.java | 6 +--
.../resources/ProcessStatusResource.java | 6 +--
.../catalog/resources/ProjectResource.java | 2 +
.../catalog/resources/TaskResource.java | 2 -
.../src/main/resources/expcatalog-derby.sql | 2 +-
.../src/main/resources/expcatalog-mysql.sql | 2 +-
.../src/test/resources/expcatalog-derby.sql | 40 +++++++++++++++-----
15 files changed, 51 insertions(+), 37 deletions(-)
----------------------------------------------------------------------