Merge branch 'master' into CURATOR-132
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/053feb45 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/053feb45 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/053feb45 Branch: refs/heads/master Commit: 053feb45eb7e3cb774dd1551645ddafa9a83f832 Parents: 9735138 7bec246 Author: randgalt <[email protected]> Authored: Wed Aug 20 16:24:11 2014 -0500 Committer: randgalt <[email protected]> Committed: Wed Aug 20 16:24:11 2014 -0500 ---------------------------------------------------------------------- .../org/apache/curator/ConnectionState.java | 1 - .../apache/curator/CuratorZookeeperClient.java | 5 +- .../org/apache/curator/utils/PathUtils.java | 7 +- .../java/org/apache/curator/utils/ZKPaths.java | 16 + .../org/apache/curator/utils/TestZKPaths.java | 11 + .../framework/imps/CuratorFrameworkImpl.java | 5 +- .../recipes/atomic/DistributedAtomicValue.java | 4 +- .../recipes/atomic/PromotedToLock.java | 3 +- .../recipes/barriers/DistributedBarrier.java | 3 +- .../barriers/DistributedDoubleBarrier.java | 3 +- .../framework/recipes/cache/ChildData.java | 3 +- .../recipes/cache/GetDataOperation.java | 4 +- .../framework/recipes/cache/NodeCache.java | 3 +- .../recipes/cache/PathChildrenCache.java | 7 +- .../framework/recipes/cache/TreeCache.java | 667 +++++++++++++++++++ .../framework/recipes/cache/TreeCacheEvent.java | 134 ++++ .../recipes/cache/TreeCacheListener.java | 37 + .../framework/recipes/leader/LeaderLatch.java | 5 +- .../recipes/leader/LeaderSelector.java | 4 +- .../framework/recipes/locks/ChildReaper.java | 3 +- .../recipes/locks/InterProcessMultiLock.java | 1 + .../recipes/locks/InterProcessMutex.java | 3 +- .../recipes/locks/InterProcessSemaphore.java | 1 + .../recipes/locks/InterProcessSemaphoreV2.java | 2 + .../framework/recipes/locks/LockInternals.java | 3 +- .../recipes/locks/PredicateResults.java | 4 +- .../locks/StandardLockInternalsDriver.java | 1 - .../recipes/nodes/PersistentEphemeralNode.java | 8 +- .../framework/recipes/queue/ChildrenCache.java | 3 +- .../recipes/queue/DistributedQueue.java | 6 +- .../framework/recipes/queue/QueueBuilder.java | 5 +- .../framework/recipes/queue/QueueSafety.java | 5 +- .../recipes/queue/SimpleDistributedQueue.java | 3 +- .../framework/recipes/shared/SharedValue.java | 3 +- .../src/site/confluence/Tree-cache.confluence | 39 ++ .../src/site/confluence/index.confluence | 1 + .../src/site/confluence/path-cache.confluence | 2 +- .../recipes/cache/BaseTestTreeCache.java | 166 +++++ .../recipes/cache/TestPathChildrenCache.java | 105 ++- .../framework/recipes/cache/TestTreeCache.java | 373 +++++++++++ .../recipes/cache/TestTreeCacheRandomTree.java | 198 ++++++ .../recipes/leader/TestLeaderLatch.java | 8 + .../x/discovery/ServiceDiscoveryBuilder.java | 12 +- .../discovery/details/DownInstanceManager.java | 11 +- .../discovery/details/ServiceDiscoveryImpl.java | 26 +- .../details/TestServiceDiscoveryBuilder.java | 67 ++ pom.xml | 16 +- 47 files changed, 1943 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
