You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/07/31 14:37:00 UTC

[53/53] [abbrv] curator git commit: Merge branch 'master' into persistent-watch

Merge branch 'master' into persistent-watch


Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/79e37de1
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/79e37de1
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/79e37de1

Branch: refs/heads/persistent-watch
Commit: 79e37de1b92cc1b3b8da1c166a8fac5be2b738a4
Parents: 793e1b6 64925a4
Author: randgalt <ra...@apache.org>
Authored: Mon Jul 31 09:35:51 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Mon Jul 31 09:35:51 2017 -0500

----------------------------------------------------------------------
 curator-client/pom.xml                          |     4 +-
 .../apache/curator/CuratorZookeeperClient.java  |     8 +-
 .../main/java/org/apache/curator/RetryLoop.java |     2 +-
 .../ClassicConnectionHandlingPolicy.java        |    88 -
 .../StandardConnectionHandlingPolicy.java       |     3 -
 .../org/apache/curator/utils/Compatibility.java |    76 +
 .../curator/utils/ExceptionAccumulator.java     |    69 +
 .../curator/utils/InjectSessionExpiration.java  |   107 +
 .../org/apache/curator/utils/ThreadUtils.java   |     4 +-
 curator-client/src/site/site.xml                |     4 +-
 .../java/org/apache/curator/BasicTests.java     |     4 +-
 .../java/org/apache/curator/TestEnsurePath.java |     6 +-
 .../curator/TestSessionFailRetryLoop.java       |    11 +-
 curator-examples/pom.xml                        |    25 +-
 .../src/main/java/async/AsyncExamples.java      |   127 +
 .../src/main/java/modeled/ContainerType.java    |    68 +
 .../java/modeled/ModeledCuratorExamples.java    |    67 +
 .../java/modeled/ModeledCuratorExamplesAlt.java |    52 +
 .../src/main/java/modeled/PersonId.java         |    70 +
 .../src/main/java/modeled/PersonModel.java      |   120 +
 .../src/main/java/modeled/PersonModelSpec.java  |    46 +
 .../src/main/java/pubsub/Clients.java           |    76 +
 .../src/main/java/pubsub/Publisher.java         |   146 +
 curator-examples/src/main/java/pubsub/README.md |    93 +
 .../src/main/java/pubsub/SubPubTest.java        |   220 +
 .../src/main/java/pubsub/Subscriber.java        |    84 +
 .../java/pubsub/messages/LocationAvailable.java |    55 +
 .../main/java/pubsub/messages/UserCreated.java  |    64 +
 .../src/main/java/pubsub/models/Group.java      |    47 +
 .../src/main/java/pubsub/models/Instance.java   |    76 +
 .../main/java/pubsub/models/InstanceType.java   |    27 +
 .../src/main/java/pubsub/models/Message.java    |    67 +
 .../src/main/java/pubsub/models/Priority.java   |    26 +
 .../src/main/resources/log4j.properties         |    24 +
 .../src/site/confluence/index.confluence        |     5 +-
 curator-examples/src/site/site.xml              |     4 +-
 curator-framework/pom.xml                       |     4 +-
 .../curator/framework/CuratorFramework.java     |     7 +
 .../framework/CuratorFrameworkFactory.java      |    31 +-
 .../apache/curator/framework/SafeIsTtlMode.java |    44 +
 .../api/ACLBackgroundPathAndBytesable.java      |     2 +-
 .../framework/api/ACLPathAndBytesable.java      |     2 +-
 .../apache/curator/framework/api/ACLable.java   |     2 +-
 .../framework/api/ACLableExistBuilderMain.java  |    26 +
 .../curator/framework/api/CreateBuilder.java    |    27 +-
 .../curator/framework/api/CreateBuilder2.java   |    34 +
 .../curator/framework/api/ExistsBuilder.java    |     4 +-
 .../curator/framework/api/ParentACLable.java    |    40 +
 .../transaction/TransactionCreateBuilder.java   |    24 +-
 .../transaction/TransactionCreateBuilder2.java  |    34 +
 .../apache/curator/framework/imps/ACLing.java   |    43 +-
 .../imps/ClassicInternalConnectionHandler.java  |    70 -
 .../imps/CompatibleCreateCallback.java          |    26 +
 .../framework/imps/CreateBuilderImpl.java       |   280 +-
 .../curator/framework/imps/CreateZK35.java      |    47 +
 .../framework/imps/CuratorFrameworkImpl.java    |    27 +-
 .../imps/CuratorMultiTransactionImpl.java       |    18 +-
 .../imps/CuratorMultiTransactionRecord.java     |    11 +
 .../curator/framework/imps/EnsembleTracker.java |    39 +-
 .../framework/imps/ExistsBuilderImpl.java       |    27 +-
 .../framework/imps/ExtractingCuratorOp.java     |     8 +-
 .../framework/imps/GetDataBuilderImpl.java      |     5 +
 .../framework/imps/SetACLBuilderImpl.java       |     2 +-
 .../framework/imps/WatcherRemovalManager.java   |     7 +-
 .../apache/curator/framework/schema/Schema.java |     2 +-
 .../framework/state/ConnectionStateManager.java |     6 +-
 curator-framework/src/site/site.xml             |     4 +-
 .../curator/framework/imps/TestCleanState.java  |     7 +
 .../curator/framework/imps/TestCreate.java      |   249 +
 .../framework/imps/TestCreateReturningStat.java |    13 +-
 .../imps/TestEnabledSessionExpiredState.java    |    14 +-
 .../framework/imps/TestExistsBuilder.java       |   109 +
 .../framework/imps/TestFailedDeleteManager.java |     8 +-
 .../curator/framework/imps/TestFramework.java   |    13 +-
 .../framework/imps/TestFrameworkEdges.java      |    31 +-
 .../framework/imps/TestNamespaceFacade.java     |     6 +-
 .../framework/imps/TestReconfiguration.java     |   157 +-
 .../framework/imps/TestRemoveWatches.java       |     6 +-
 .../curator/framework/imps/TestTtlNodes.java    |    90 +
 .../imps/TestWatcherRemovalManager.java         |     6 +-
 .../curator/framework/imps/TestWithCluster.java |    16 +-
 .../curator/framework/schema/TestSchema.java    |     6 -
 curator-recipes/pom.xml                         |    20 +-
 .../framework/recipes/cache/NodeCache.java      |    15 +
 .../recipes/cache/PathChildrenCache.java        |     4 +-
 .../recipes/locks/InterProcessMutex.java        |     7 +-
 .../framework/recipes/nodes/PersistentNode.java |    99 +-
 .../recipes/nodes/PersistentNodeListener.java   |    33 +
 .../recipes/nodes/PersistentTtlNode.java        |   209 +
 .../framework/recipes/shared/SharedCount.java   |    10 +-
 .../framework/recipes/shared/SharedValue.java   |    28 +-
 .../src/site/confluence/index.confluence        |     3 +-
 .../persistent-ephemeral-node.confluence        |    39 -
 .../site/confluence/persistent-node.confluence  |    39 +
 .../confluence/persistent-ttl-node.confluence   |    41 +
 curator-recipes/src/site/site.xml               |     4 +-
 .../recipes/cache/BaseTestTreeCache.java        |     2 +-
 .../recipes/cache/TestEventOrdering.java        |     6 +-
 .../framework/recipes/cache/TestNodeCache.java  |     4 +-
 .../recipes/cache/TestPathChildrenCache.java    |     4 +-
 .../cache/TestPathChildrenCacheInCluster.java   |    63 +-
 .../framework/recipes/cache/TestTreeCache.java  |     9 +-
 .../recipes/leader/TestLeaderLatch.java         |     3 +-
 .../recipes/leader/TestLeaderSelector.java      |    11 +-
 .../recipes/locks/TestInterProcessMutex.java    |     5 +-
 .../locks/TestInterProcessMutexBase.java        |    17 +-
 .../locks/TestInterProcessSemaphoreCluster.java |     3 +-
 .../nodes/TestPersistentEphemeralNode.java      |    14 +-
 .../recipes/nodes/TestPersistentNode.java       |     3 +-
 .../recipes/nodes/TestPersistentTtlNode.java    |   156 +
 .../recipes/shared/TestSharedCount.java         |   123 +-
 curator-test-zk34/README.md                     |    11 +
 curator-test-zk34/pom.xml                       |   198 +
 .../org/apache/curator/test/Compatibility.java  |    35 +
 .../apache/curator/test/TestCompatibility.java  |    97 +
 .../src/test/resources/log4j.properties         |    27 +
 curator-test/pom.xml                            |     4 +-
 .../apache/curator/test/BaseClassForTests.java  |    47 +-
 .../org/apache/curator/test/Compatibility.java  |    34 +
 .../org/apache/curator/test/DirectoryUtils.java |    10 +-
 .../apache/curator/test/KillServerSession.java  |   122 -
 .../curator/test/TestingQuorumPeerMain.java     |    17 +-
 .../curator/test/TestingZooKeeperMain.java      |    16 +-
 .../curator/test/TestingZooKeeperServer.java    |    18 +-
 .../java/org/apache/curator/test/Timing.java    |    47 +-
 .../apache/curator/test/ZooKeeperMainFace.java  |     3 -
 .../test/compatibility/CuratorTestBase.java     |    28 +
 .../test/compatibility/KillSession2.java        |    40 +
 .../curator/test/compatibility/Timing2.java     |   299 +
 .../compatibility/Zk35MethodInterceptor.java    |    56 +
 curator-test/src/site/site.xml                  |     4 +-
 curator-x-async/pom.xml                         |    20 +-
 .../org/apache/curator/x/async/AsyncStage.java  |    15 +-
 .../apache/curator/x/async/AsyncWrappers.java   |   393 +
 .../curator/x/async/api/AsyncCreateBuilder.java |    57 +
 .../x/async/api/AsyncCuratorFrameworkDsl.java   |     1 -
 .../api/AsyncTransactionCreateBuilder.java      |    35 +-
 .../x/async/details/AsyncCreateBuilderImpl.java |    43 +-
 .../x/async/details/AsyncTransactionOpImpl.java |    31 +-
 .../curator/x/async/migrations/Migration.java   |    37 +
 .../x/async/migrations/MigrationException.java  |    37 +
 .../x/async/migrations/MigrationManager.java    |   208 +
 .../x/async/migrations/MigrationSet.java        |    60 +
 .../x/async/modeled/JacksonModelSerializer.java |   124 +
 .../x/async/modeled/ModelSerializer.java        |    61 +
 .../curator/x/async/modeled/ModelSpec.java      |   217 +
 .../x/async/modeled/ModelSpecBuilder.java       |   138 +
 .../x/async/modeled/ModeledFramework.java       |   371 +
 .../async/modeled/ModeledFrameworkBuilder.java  |   173 +
 .../curator/x/async/modeled/ModeledOptions.java |    29 +
 .../curator/x/async/modeled/NodeName.java       |    39 +
 .../curator/x/async/modeled/Resolvable.java     |    48 +
 .../apache/curator/x/async/modeled/ZNode.java   |    74 +
 .../apache/curator/x/async/modeled/ZPath.java   |   279 +
 .../modeled/cached/CachedModeledFramework.java  |   113 +
 .../x/async/modeled/cached/ModeledCache.java    |    46 +
 .../modeled/cached/ModeledCacheListener.java    |   106 +
 .../details/CachedModeledFrameworkImpl.java     |   334 +
 .../x/async/modeled/details/ModelSpecImpl.java  |   239 +
 .../x/async/modeled/details/ModelStage.java     |   171 +
 .../async/modeled/details/ModeledCacheImpl.java |   211 +
 .../modeled/details/ModeledFrameworkImpl.java   |   469 +
 .../details/VersionedModeledFrameworkImpl.java  |    85 +
 .../x/async/modeled/details/ZNodeImpl.java      |    56 +
 .../x/async/modeled/details/ZPathImpl.java      |   289 +
 .../x/async/modeled/typed/TypedModelSpec.java   |    87 +
 .../x/async/modeled/typed/TypedModelSpec0.java  |    61 +
 .../x/async/modeled/typed/TypedModelSpec10.java |    61 +
 .../x/async/modeled/typed/TypedModelSpec2.java  |    61 +
 .../x/async/modeled/typed/TypedModelSpec3.java  |    61 +
 .../x/async/modeled/typed/TypedModelSpec4.java  |    61 +
 .../x/async/modeled/typed/TypedModelSpec5.java  |    61 +
 .../x/async/modeled/typed/TypedModelSpec6.java  |    61 +
 .../x/async/modeled/typed/TypedModelSpec7.java  |    61 +
 .../x/async/modeled/typed/TypedModelSpec8.java  |    61 +
 .../x/async/modeled/typed/TypedModelSpec9.java  |    61 +
 .../modeled/typed/TypedModeledFramework.java    |    93 +
 .../modeled/typed/TypedModeledFramework0.java   |    63 +
 .../modeled/typed/TypedModeledFramework10.java  |    63 +
 .../modeled/typed/TypedModeledFramework2.java   |    63 +
 .../modeled/typed/TypedModeledFramework3.java   |    63 +
 .../modeled/typed/TypedModeledFramework4.java   |    63 +
 .../modeled/typed/TypedModeledFramework5.java   |    63 +
 .../modeled/typed/TypedModeledFramework6.java   |    63 +
 .../modeled/typed/TypedModeledFramework7.java   |    63 +
 .../modeled/typed/TypedModeledFramework8.java   |    63 +
 .../modeled/typed/TypedModeledFramework9.java   |    63 +
 .../x/async/modeled/typed/TypedZPath.java       |    92 +
 .../x/async/modeled/typed/TypedZPath0.java      |    52 +
 .../x/async/modeled/typed/TypedZPath10.java     |    52 +
 .../x/async/modeled/typed/TypedZPath2.java      |    52 +
 .../x/async/modeled/typed/TypedZPath3.java      |    52 +
 .../x/async/modeled/typed/TypedZPath4.java      |    52 +
 .../x/async/modeled/typed/TypedZPath5.java      |    52 +
 .../x/async/modeled/typed/TypedZPath6.java      |    52 +
 .../x/async/modeled/typed/TypedZPath7.java      |    52 +
 .../x/async/modeled/typed/TypedZPath8.java      |    52 +
 .../x/async/modeled/typed/TypedZPath9.java      |    52 +
 .../x/async/modeled/versioned/Versioned.java    |    69 +
 .../versioned/VersionedModeledFramework.java    |    56 +
 .../src/site/confluence/async.confluence        |   212 +
 .../src/site/confluence/index.confluence        |   215 +-
 .../src/site/confluence/migrations.confluence   |    99 +
 .../confluence/modeled-components.confluence    |   186 +
 .../site/confluence/modeled-typed.confluence    |    89 +
 .../src/site/confluence/modeled.confluence      |    48 +
 curator-x-async/src/site/site.xml               |    12 +-
 .../x/async/CompletableBaseClassForTests.java   |    71 +
 .../curator/x/async/TestAsyncWrappers.java      |    73 +
 .../curator/x/async/TestBasicOperations.java    |    58 +-
 .../async/migrations/TestMigrationManager.java  |   355 +
 .../x/async/migrations/models/ModelV1.java      |    39 +
 .../x/async/migrations/models/ModelV2.java      |    46 +
 .../x/async/migrations/models/ModelV3.java      |    53 +
 .../modeled/TestCachedModeledFramework.java     |    96 +
 .../x/async/modeled/TestModeledFramework.java   |   170 +
 .../async/modeled/TestModeledFrameworkBase.java |    64 +
 .../curator/x/async/modeled/TestZPath.java      |   126 +
 .../x/async/modeled/models/TestModel.java       |   115 +
 .../x/async/modeled/models/TestNewerModel.java  |   137 +
 .../x/async/modeled/models/TestSimpleModel.java |    84 +
 .../src/test/resources/log4j.properties         |    27 +
 curator-x-discovery-server/pom.xml              |     4 +-
 curator-x-discovery-server/src/site/site.xml    |     4 +-
 .../jetty_resteasy/TestStringsWithRestEasy.java |     6 +-
 curator-x-discovery/pom.xml                     |     4 +-
 .../curator/x/discovery/ServiceInstance.java    |    15 +
 .../curator/x/discovery/ServiceProvider.java    |     7 +
 .../details/JsonInstanceSerializer.java         |    53 +-
 .../x/discovery/details/OldServiceInstance.java |   196 +
 .../discovery/details/ServiceDiscoveryImpl.java |    21 +-
 curator-x-discovery/src/site/site.xml           |     4 +-
 .../x/discovery/TestJsonInstanceSerializer.java |    16 +-
 ...TestJsonInstanceSerializerCompatibility.java |   107 +
 .../details/TestNewServiceInstance.java         |   145 +
 .../discovery/details/TestServiceDiscovery.java |   138 +-
 .../discovery/details/TestServiceProvider.java  |     3 +-
 curator-x-rpc/pom.xml                           |   189 -
 .../curator/x/rpc/CuratorProjectionServer.java  |   152 -
 .../AuthorizationConfiguration.java             |    45 -
 ...dedExponentialBackoffRetryConfiguration.java |    69 -
 .../x/rpc/configuration/Configuration.java      |    86 -
 .../rpc/configuration/ConfigurationBuilder.java |    87 -
 .../configuration/ConnectionConfiguration.java  |   129 -
 .../ExponentialBackoffRetryConfiguration.java   |    58 -
 .../configuration/RetryNTimesConfiguration.java |    58 -
 .../configuration/RetryPolicyConfiguration.java |    28 -
 .../curator/x/rpc/connections/Closer.java       |    24 -
 .../x/rpc/connections/ConnectionManager.java    |   141 -
 .../curator/x/rpc/connections/CuratorEntry.java |   170 -
 .../x/rpc/details/RpcBackgroundCallback.java    |    44 -
 .../curator/x/rpc/details/RpcWatcher.java       |    43 -
 .../x/rpc/idl/discovery/DiscoveryInstance.java  |    95 -
 .../idl/discovery/DiscoveryInstanceType.java    |    26 -
 .../rpc/idl/discovery/DiscoveryProjection.java  |    38 -
 .../discovery/DiscoveryProviderProjection.java  |    38 -
 .../x/rpc/idl/discovery/DiscoveryService.java   |   259 -
 .../idl/discovery/DiscoveryServiceLowLevel.java |   159 -
 .../rpc/idl/discovery/ProviderStrategyType.java |    27 -
 .../x/rpc/idl/exceptions/ExceptionType.java     |    26 -
 .../x/rpc/idl/exceptions/NodeExceptionType.java |    27 -
 .../x/rpc/idl/exceptions/RpcException.java      |    98 -
 .../idl/exceptions/ZooKeeperExceptionType.java  |    40 -
 .../idl/services/CuratorProjectionService.java  |   765 -
 .../x/rpc/idl/services/EventService.java        |    55 -
 .../curator/x/rpc/idl/structs/CreateSpec.java   |    66 -
 .../x/rpc/idl/structs/CuratorProjection.java    |    38 -
 .../curator/x/rpc/idl/structs/DeleteSpec.java   |    50 -
 .../curator/x/rpc/idl/structs/ExistsSpec.java   |    46 -
 .../x/rpc/idl/structs/GetChildrenSpec.java      |    46 -
 .../curator/x/rpc/idl/structs/GetDataSpec.java  |    50 -
 .../curator/x/rpc/idl/structs/LeaderEvent.java  |    46 -
 .../x/rpc/idl/structs/LeaderProjection.java     |    38 -
 .../curator/x/rpc/idl/structs/LeaderResult.java |    42 -
 .../x/rpc/idl/structs/LeaseProjection.java      |    38 -
 .../x/rpc/idl/structs/LockProjection.java       |    38 -
 .../x/rpc/idl/structs/NodeCacheProjection.java  |    38 -
 .../x/rpc/idl/structs/OptionalChildrenList.java |    39 -
 .../curator/x/rpc/idl/structs/OptionalData.java |    38 -
 .../rpc/idl/structs/OptionalLockProjection.java |    38 -
 .../curator/x/rpc/idl/structs/OptionalPath.java |    38 -
 .../x/rpc/idl/structs/OptionalRpcStat.java      |    38 -
 .../structs/PathChildrenCacheProjection.java    |    38 -
 .../idl/structs/PathChildrenCacheStartMode.java |    26 -
 .../PersistentEphemeralNodeProjection.java      |    38 -
 .../curator/x/rpc/idl/structs/RpcAcl.java       |    42 -
 .../curator/x/rpc/idl/structs/RpcChildData.java |    57 -
 .../x/rpc/idl/structs/RpcCreateMode.java        |    31 -
 .../x/rpc/idl/structs/RpcCuratorEvent.java      |   224 -
 .../x/rpc/idl/structs/RpcCuratorEventType.java  |    46 -
 .../curator/x/rpc/idl/structs/RpcEventType.java |    31 -
 .../apache/curator/x/rpc/idl/structs/RpcId.java |    42 -
 .../x/rpc/idl/structs/RpcKeeperState.java       |    34 -
 .../x/rpc/idl/structs/RpcParticipant.java       |    42 -
 .../idl/structs/RpcPathChildrenCacheEvent.java  |    54 -
 .../structs/RpcPathChildrenCacheEventType.java  |    33 -
 .../structs/RpcPersistentEphemeralNodeMode.java |    30 -
 .../curator/x/rpc/idl/structs/RpcStat.java      |    95 -
 .../x/rpc/idl/structs/RpcWatchedEvent.java      |    54 -
 .../curator/x/rpc/idl/structs/SetDataSpec.java  |    58 -
 .../curator/x/rpc/idl/structs/Version.java      |    38 -
 .../src/main/resources/curator/help.txt         |    72 -
 curator-x-rpc/src/main/scripts/apply-thrift.sh  |    36 -
 curator-x-rpc/src/main/scripts/generate.sh      |    56 -
 curator-x-rpc/src/main/thrift/curator.thrift    |   297 -
 .../site/confluence/configuration.confluence    |   143 -
 .../src/site/confluence/deploy.confluence       |    31 -
 .../src/site/confluence/events.confluence       |    90 -
 .../src/site/confluence/index.confluence        |    49 -
 .../src/site/confluence/reference.confluence    |   120 -
 .../src/site/confluence/usage.confluence        |   115 -
 .../src/site/resources/images/topology.png      |   Bin 135534 -> 0 bytes
 curator-x-rpc/src/site/site.xml                 |    33 -
 .../java/org/apache/curator/generated/Acl.java  |   491 -
 .../org/apache/curator/generated/ChildData.java |   604 -
 .../apache/curator/generated/CreateMode.java    |    51 -
 .../apache/curator/generated/CreateSpec.java    |  1001 -
 .../apache/curator/generated/CuratorEvent.java  |  1636 --
 .../curator/generated/CuratorEventType.java     |    99 -
 .../curator/generated/CuratorException.java     |   736 -
 .../curator/generated/CuratorProjection.java    |   388 -
 .../curator/generated/CuratorService.java       | 24123 -----------------
 .../apache/curator/generated/DeleteSpec.java    |   691 -
 .../curator/generated/DiscoveryInstance.java    |  1201 -
 .../generated/DiscoveryInstanceType.java        |    48 -
 .../curator/generated/DiscoveryProjection.java  |   388 -
 .../generated/DiscoveryProviderProjection.java  |   388 -
 .../curator/generated/DiscoveryService.java     |  7236 -----
 .../generated/DiscoveryServiceLowLevel.java     |  6966 -----
 .../apache/curator/generated/EventService.java  |  1082 -
 .../org/apache/curator/generated/EventType.java |    54 -
 .../apache/curator/generated/ExceptionType.java |    48 -
 .../apache/curator/generated/ExistsSpec.java    |   586 -
 .../curator/generated/GetChildrenSpec.java      |   586 -
 .../apache/curator/generated/GetDataSpec.java   |   680 -
 .../java/org/apache/curator/generated/Id.java   |   488 -
 .../apache/curator/generated/KeeperState.java   |    63 -
 .../apache/curator/generated/LeaderEvent.java   |   586 -
 .../curator/generated/LeaderProjection.java     |   388 -
 .../apache/curator/generated/LeaderResult.java  |   491 -
 .../curator/generated/LeaseProjection.java      |   388 -
 .../curator/generated/LockProjection.java       |   388 -
 .../curator/generated/NodeCacheProjection.java  |   388 -
 .../curator/generated/NodeExceptionType.java    |    51 -
 .../curator/generated/OptionalChildrenList.java |   437 -
 .../apache/curator/generated/OptionalData.java  |   399 -
 .../generated/OptionalLockProjection.java       |   393 -
 .../apache/curator/generated/OptionalPath.java  |   388 -
 .../apache/curator/generated/OptionalStat.java  |   393 -
 .../apache/curator/generated/Participant.java   |   486 -
 .../generated/PathChildrenCacheEvent.java       |   609 -
 .../generated/PathChildrenCacheEventType.java   |    60 -
 .../generated/PathChildrenCacheProjection.java  |   388 -
 .../generated/PathChildrenCacheStartMode.java   |    48 -
 .../generated/PersistentEphemeralNodeMode.java  |    51 -
 .../PersistentEphemeralNodeProjection.java      |   388 -
 .../curator/generated/ProviderStrategyType.java |    51 -
 .../apache/curator/generated/SetDataSpec.java   |   896 -
 .../java/org/apache/curator/generated/Stat.java |  1326 -
 .../org/apache/curator/generated/Version.java   |   386 -
 .../apache/curator/generated/WatchedEvent.java  |   620 -
 .../generated/ZooKeeperExceptionType.java       |    90 -
 .../java/org/apache/curator/x/rpc/RpcTests.java |   294 -
 .../org/apache/curator/x/rpc/TestClient.java    |   168 -
 .../org/apache/curator/x/rpc/TestServer.java    |    34 -
 .../resources/configuration/connections.json    |    27 -
 .../test/resources/configuration/logging.json   |    19 -
 .../test/resources/configuration/simple.json    |     7 -
 .../src/test/resources/configuration/test.json  |    14 -
 doap.rdf                                        |     4 +-
 pom.xml                                         |    43 +-
 src/site/confluence/compatibility.confluence    |     1 +
 src/site/confluence/index.confluence            |    23 +-
 src/site/confluence/zk-compatibility.confluence |    48 +
 src/site/resources/css/site.css                 |    55 +-
 src/site/resources/images/arrow.png             |   Bin 0 -> 2159 bytes
 src/site/site.xml                               |    32 +-
 377 files changed, 14566 insertions(+), 67244 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/curator/blob/79e37de1/curator-framework/src/main/java/org/apache/curator/framework/CuratorFramework.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/79e37de1/curator-framework/src/main/java/org/apache/curator/framework/imps/CuratorFrameworkImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/79e37de1/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/NodeCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/79e37de1/curator-recipes/src/main/java/org/apache/curator/framework/recipes/cache/PathChildrenCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/curator/blob/79e37de1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 06dc3a1,1f73b54..e981493
--- a/pom.xml
+++ b/pom.xml
@@@ -59,12 -59,13 +59,13 @@@
          <jdk-version>1.7</jdk-version>
  
          <!-- versions -->
 -        <zookeeper-version>3.5.3-beta</zookeeper-version>
 +        <zookeeper-version>3.6.0-SNAPSHOT</zookeeper-version>
-         <maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version>
+         <maven-project-info-reports-plugin-version>2.9</maven-project-info-reports-plugin-version>
          <maven-bundle-plugin-version>3.2.0</maven-bundle-plugin-version>
-         <maven-javadoc-plugin-version>2.10.3</maven-javadoc-plugin-version>
-         <doxia-module-confluence-version>1.6</doxia-module-confluence-version>
+         <maven-javadoc-plugin-version>2.10.4</maven-javadoc-plugin-version>
+         <doxia-module-confluence-version>1.7</doxia-module-confluence-version>
          <maven-license-plugin-version>1.9.0</maven-license-plugin-version>
+         <javassist-version>3.20.0-GA</javassist-version>
          <commons-math-version>2.2</commons-math-version>
          <jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version>
          <jackson-version>2.7.3</jackson-version>