Return-Path: X-Original-To: apmail-curator-commits-archive@minotaur.apache.org Delivered-To: apmail-curator-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 531D318F95 for ; Tue, 25 Aug 2015 04:08:23 +0000 (UTC) Received: (qmail 37098 invoked by uid 500); 25 Aug 2015 04:08:23 -0000 Delivered-To: apmail-curator-commits-archive@curator.apache.org Received: (qmail 37035 invoked by uid 500); 25 Aug 2015 04:08:23 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 35635 invoked by uid 99); 25 Aug 2015 04:08:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Aug 2015 04:08:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 761B9E3626; Tue, 25 Aug 2015 04:08:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cammckenzie@apache.org To: commits@curator.apache.org Date: Tue, 25 Aug 2015 04:08:49 -0000 Message-Id: <9db6f2d6e8ae4aa5b2d9bbb522bcb195@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [29/50] curator git commit: Merge branch 'CURATOR-222' Merge branch 'CURATOR-222' Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/d90325cf Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/d90325cf Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/d90325cf Branch: refs/heads/CURATOR-167 Commit: d90325cfbd5fb4ee373bc7b8206d28305b26e0a8 Parents: 19bb4d1 df8ec86 Author: randgalt Authored: Wed Jul 1 18:01:04 2015 -0500 Committer: randgalt Committed: Wed Jul 1 18:01:04 2015 -0500 ---------------------------------------------------------------------- curator-client/pom.xml | 16 ++ .../org/apache/curator/utils/DebugUtils.java | 1 + .../org/apache/curator/utils/EnsurePath.java | 14 +- .../java/org/apache/curator/utils/ZKPaths.java | 74 ++++++- .../src/main/java/cache/PathCacheExample.java | 2 +- curator-framework/pom.xml | 6 + .../curator/framework/CuratorFramework.java | 18 +- .../framework/CuratorFrameworkFactory.java | 20 ++ .../api/CreateBackgroundModeACLable.java | 12 ++ .../curator/framework/api/CreateBuilder.java | 13 ++ .../curator/framework/api/ExistsBuilder.java | 15 +- .../framework/api/ExistsBuilderMain.java | 27 +++ .../framework/imps/CreateBuilderImpl.java | 38 +++- .../framework/imps/CuratorFrameworkImpl.java | 15 ++ .../framework/imps/ExistsBuilderImpl.java | 56 ++++- .../curator/framework/imps/NamespaceFacade.java | 10 +- .../curator/framework/imps/NamespaceImpl.java | 12 +- .../src/site/confluence/index.confluence | 6 +- .../curator/framework/imps/TestFramework.java | 211 +++++++++++++++++-- curator-recipes/pom.xml | 6 + .../recipes/atomic/DistributedAtomicValue.java | 15 +- .../recipes/barriers/DistributedBarrier.java | 2 +- .../barriers/DistributedDoubleBarrier.java | 2 +- .../framework/recipes/cache/NodeCache.java | 9 +- .../recipes/cache/PathChildrenCache.java | 20 +- .../recipes/cache/PathChildrenCacheMode.java | 1 + .../framework/recipes/cache/TreeCache.java | 27 ++- .../framework/recipes/leader/LeaderLatch.java | 2 +- .../framework/recipes/locks/ChildReaper.java | 5 + .../recipes/locks/InterProcessSemaphore.java | 1 + .../recipes/locks/InterProcessSemaphoreV2.java | 2 +- .../curator/framework/recipes/locks/Reaper.java | 5 + .../locks/StandardLockInternalsDriver.java | 4 +- .../recipes/nodes/PersistentEphemeralNode.java | 2 +- .../recipes/queue/DistributedQueue.java | 4 +- .../framework/recipes/queue/QueueSharder.java | 2 +- .../recipes/queue/SimpleDistributedQueue.java | 18 +- .../framework/recipes/shared/SharedValue.java | 2 +- .../src/site/confluence/index.confluence | 2 + .../recipes/cache/TestPathChildrenCache.java | 78 ------- .../framework/recipes/cache/TestTreeCache.java | 13 ++ .../locks/TestInterProcessMultiMutex.java | 4 +- .../recipes/locks/TestInterProcessMutex.java | 2 +- .../locks/TestInterProcessMutexBase.java | 85 +++++++- .../locks/TestInterProcessSemaphoreMutex.java | 2 +- curator-test/pom.xml | 10 + .../apache/curator/test/BaseClassForTests.java | 28 ++- curator-x-discovery-server/pom.xml | 6 + curator-x-discovery/pom.xml | 6 + .../discovery/details/ServiceDiscoveryImpl.java | 4 +- curator-x-rpc/pom.xml | 6 + .../idl/services/CuratorProjectionService.java | 4 + .../curator/x/rpc/idl/structs/CreateSpec.java | 6 +- .../x/rpc/idl/structs/RpcCreateMode.java | 3 +- curator-x-rpc/src/main/thrift/curator.thrift | 3 +- .../src/site/confluence/reference.confluence | 1 + pom.xml | 27 +-- src/site/confluence/utilities.confluence | 32 --- 58 files changed, 763 insertions(+), 254 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/d90325cf/curator-recipes/src/main/java/org/apache/curator/framework/recipes/queue/DistributedQueue.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/d90325cf/curator-recipes/src/test/java/org/apache/curator/framework/recipes/cache/TestPathChildrenCache.java ----------------------------------------------------------------------