You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/10/12 17:58:06 UTC
[42/50] [abbrv] oodt git commit: Merge branch
'feature/zookeeper-config' into development
Merge branch 'feature/zookeeper-config' into development
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/d444f6cd
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/d444f6cd
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/d444f6cd
Branch: refs/heads/master
Commit: d444f6cd3a65301eda39831e35e1535cc0cb72cd
Parents: ce89ad1 bd86cd6
Author: Chris Mattmann <ch...@jpl.nasa.gov>
Authored: Tue Oct 10 11:20:44 2017 -0700
Committer: Chris Mattmann <ch...@jpl.nasa.gov>
Committed: Tue Oct 10 11:20:44 2017 -0700
----------------------------------------------------------------------
config/pom.xml | 2 +-
.../org/apache/oodt/config/ConfigEventType.java | 50 +++++++++++++
.../oodt/config/ConfigurationListener.java | 31 ++++++++
.../oodt/config/ConfigurationManager.java | 23 ++++++
.../java/org/apache/oodt/config/Constants.java | 3 +
.../DistributedConfigurationManager.java | 79 +++++++++++++++++---
.../DistributedConfigurationPublisher.java | 43 ++++++++++-
.../oodt/config/distributed/ZNodePaths.java | 27 +++++++
.../oodt/config/distributed/cli/CLIAction.java | 48 +++++++++++-
.../config/distributed/cli/ConfigPublisher.java | 8 ++
.../config/distributed/utils/ConfigUtils.java | 5 ++
.../config/distributed/utils/CuratorUtils.java | 19 +++--
.../AbstractDistributedConfigurationTest.java | 7 ++
config/src/main/resources/cmd-line-options.xml | 31 ++++++++
.../DistributedConfigurationManagerTest.java | 69 ++++++++++++++++-
core/pom.xml | 2 +-
.../cas/filemgr/system/XmlRpcFileManager.java | 18 ++++-
pge/pom.xml | 2 +-
18 files changed, 435 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/d444f6cd/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index 3489a56,f6e0fc3..779c0c1
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -254,13 -243,8 +254,13 @@@ the License
<version>8.7</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.12</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
+ <artifactId>curator-recipes</artifactId>
<version>3.3.0</version>
</dependency>
<dependency>