Merge branch 'master' into CURATOR-425
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/334950f6 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/334950f6 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/334950f6 Branch: refs/heads/CURATOR-426 Commit: 334950f6188fe646a4588fd5aafd46e1525686d2 Parents: 1eb8aa8 95b70d2 Author: randgalt <randg...@apache.org> Authored: Fri Jul 21 12:02:03 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Fri Jul 21 12:02:03 2017 -0500 ---------------------------------------------------------------------- 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 - pom.xml | 7 - src/site/confluence/index.confluence | 23 +- src/site/site.xml | 7 +- 135 files changed, 17 insertions(+), 66064 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/334950f6/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index b816d36,3aceb5f..a88d370 --- a/pom.xml +++ b/pom.xml @@@ -296,9 -296,7 +296,8 @@@ <module>curator-examples</module> <module>curator-x-discovery</module> <module>curator-x-discovery-server</module> - <module>curator-x-rpc</module> <module>curator-x-async</module> + <module>curator-test-zk34</module> </modules> <dependencyManagement>