From cbe013a461ff655e76da53230fff480a4acf76b2 Mon Sep 17 00:00:00 2001 From: Norbert Kalmar Date: Fri, 5 Oct 2018 14:25:43 +0200 Subject: [PATCH] ZOOKEEPER-3032 - MAVEN MIGRATION - branch 3.4 move java server, client --- .gitignore | 4 +- bin/zkEnv.sh | 2 +- build.xml | 207 ++++++++++++------ src/java/OldChangeLog | 0 .../zookeeper-client-c/tests/zkServer.sh | 2 +- .../zookeeper/client/ConnectStringParser.java | 0 .../zookeeper/client/FourLetterWordMain.java | 0 .../apache/zookeeper/client/HostProvider.java | 0 .../zookeeper/client/StaticHostProvider.java | 0 .../zookeeper/client/ZooKeeperSaslClient.java | 0 .../org/apache/zookeeper/AsyncCallback.java | 0 .../org/apache/zookeeper/ClientCnxn.java | 0 .../apache/zookeeper/ClientCnxnSocket.java | 0 .../apache/zookeeper/ClientCnxnSocketNIO.java | 0 .../apache/zookeeper/ClientWatchManager.java | 0 .../org/apache/zookeeper/CreateMode.java | 0 .../org/apache/zookeeper/Environment.java | 0 .../org/apache/zookeeper/KeeperException.java | 0 .../java}/org/apache/zookeeper/Login.java | 0 .../org/apache/zookeeper/MultiResponse.java | 0 .../zookeeper/MultiTransactionRecord.java | 0 .../main/java}/org/apache/zookeeper/Op.java | 0 .../java}/org/apache/zookeeper/OpResult.java | 0 .../java}/org/apache/zookeeper/Quotas.java | 0 .../zookeeper/SaslClientCallbackHandler.java | 0 .../apache/zookeeper/ServerAdminClient.java | 0 .../java}/org/apache/zookeeper/Shell.java | 0 .../org/apache/zookeeper/StatsTrack.java | 0 .../java}/org/apache/zookeeper/Testable.java | 0 .../org/apache/zookeeper/Transaction.java | 0 .../java}/org/apache/zookeeper/Version.java | 0 .../org/apache/zookeeper/WatchedEvent.java | 0 .../java}/org/apache/zookeeper/Watcher.java | 0 .../java}/org/apache/zookeeper/ZKUtil.java | 0 .../java}/org/apache/zookeeper/ZooDefs.java | 0 .../java}/org/apache/zookeeper/ZooKeeper.java | 0 .../org/apache/zookeeper/ZooKeeperMain.java | 0 .../apache/zookeeper/ZooKeeperTestable.java | 0 .../common/AtomicFileOutputStream.java | 0 .../org/apache/zookeeper/common/IOUtils.java | 0 .../org/apache/zookeeper/common/PathTrie.java | 0 .../apache/zookeeper/common/PathUtils.java | 0 .../org/apache/zookeeper/common/Time.java | 0 .../apache/zookeeper/util/SecurityUtils.java | 0 .../apache/zookeeper/version/util/VerGen.java | 0 .../main/resources}/lib/cobertura/README.txt | 0 .../resources}/lib/jdiff/zookeeper_3.1.1.xml | 0 .../resources}/lib/log4j-1.2.17.LICENSE.txt | 0 .../resources}/lib/slf4j-1.7.25.LICENSE.txt | 0 .../apache/zookeeper/ClientReconnectTest.java | 0 .../apache/zookeeper/JUnit4ZKTestRunner.java | 0 .../apache/zookeeper/JaasConfiguration.java | 0 .../org/apache/zookeeper/MockPacket.java | 0 .../apache/zookeeper/MultiResponseTest.java | 0 .../zookeeper/MultiTransactionRecordTest.java | 0 .../org/apache/zookeeper/PortAssignment.java | 0 .../org/apache/zookeeper/SaslAuthTest.java | 0 .../apache/zookeeper/ServerConfigTest.java | 0 .../apache/zookeeper/TestableZooKeeper.java | 0 .../org/apache/zookeeper/VerGenTest.java | 0 .../org/apache/zookeeper/ZKTestCase.java | 0 .../org/apache/zookeeper/ZooKeeperTest.java | 0 .../org/apache/zookeeper/common/TimeTest.java | 0 .../apache/zookeeper/test/ACLCountTest.java | 0 .../apache/zookeeper/test/ACLRootTest.java | 0 .../org/apache/zookeeper/test/ACLTest.java | 0 .../zookeeper/test/AsyncHammerTest.java | 0 .../org/apache/zookeeper/test/AsyncOps.java | 0 .../apache/zookeeper/test/AsyncOpsTest.java | 0 .../org/apache/zookeeper/test/AsyncTest.java | 0 .../test/AtomicFileOutputStreamTest.java | 0 .../org/apache/zookeeper/test/AuthTest.java | 0 .../apache/zookeeper/test/BufferSizeTest.java | 0 .../zookeeper/test/ChrootAsyncTest.java | 0 .../zookeeper/test/ChrootClientTest.java | 0 .../org/apache/zookeeper/test/ChrootTest.java | 0 .../org/apache/zookeeper/test/ClientBase.java | 0 .../zookeeper/test/ClientHammerTest.java | 0 .../zookeeper/test/ClientPortBindTest.java | 0 .../apache/zookeeper/test/ClientRetry.java | 0 .../org/apache/zookeeper/test/ClientTest.java | 0 .../test/ConnectStringParserTest.java | 0 .../apache/zookeeper/test/CreateModeTest.java | 0 .../test/DisconnectableZooKeeper.java | 0 .../test/DisconnectedWatcherTest.java | 0 .../apache/zookeeper/test/EventTypeTest.java | 0 .../zookeeper/test/FLENewEpochTest.java | 0 .../zookeeper/test/FLEPredicateTest.java | 0 .../apache/zookeeper/test/FLERestartTest.java | 0 .../org/apache/zookeeper/test/FLETest.java | 0 .../zookeeper/test/FLEZeroWeightTest.java | 0 .../test/FollowerResyncConcurrencyTest.java | 0 .../apache/zookeeper/test/FollowerTest.java | 0 .../test/FourLetterWordsQuorumTest.java | 0 .../zookeeper/test/FourLetterWordsTest.java | 0 .../test/FourLetterWordsWhiteListTest.java | 0 .../zookeeper/test/GetChildren2Test.java | 0 .../test/HierarchicalQuorumTest.java | 0 .../apache/zookeeper/test/IntegrityCheck.java | 0 .../zookeeper/test/InvalidSnapshotTest.java | 0 .../org/apache/zookeeper/test/JMXEnv.java | 0 .../zookeeper/test/KeeperStateTest.java | 0 .../zookeeper/test/LENonTerminateTest.java | 0 .../org/apache/zookeeper/test/LETest.java | 0 .../test/LoadFromLogNoServerTest.java | 0 .../zookeeper/test/LoadFromLogTest.java | 0 .../apache/zookeeper/test/MaxCnxnsTest.java | 0 .../zookeeper/test/MultiTransactionTest.java | 0 .../zookeeper/test/NioNettySuiteBase.java | 0 .../test/NioNettySuiteHammerTest.java | 0 .../zookeeper/test/NioNettySuiteTest.java | 0 .../test/NonRecoverableErrorTest.java | 0 .../apache/zookeeper/test/NullDataTest.java | 0 .../org/apache/zookeeper/test/OOMTest.java | 0 .../apache/zookeeper/test/OSMXBeanTest.java | 0 .../test/ObserverHierarchicalQuorumTest.java | 0 .../apache/zookeeper/test/ObserverLETest.java | 0 .../test/ObserverQuorumHammerTest.java | 0 .../apache/zookeeper/test/ObserverTest.java | 0 .../org/apache/zookeeper/test/QuorumBase.java | 0 .../zookeeper/test/QuorumHammerTest.java | 0 .../zookeeper/test/QuorumQuotaTest.java | 0 .../org/apache/zookeeper/test/QuorumTest.java | 0 .../org/apache/zookeeper/test/QuorumUtil.java | 0 .../zookeeper/test/QuorumZxidSyncTest.java | 0 .../zookeeper/test/ReadOnlyModeTest.java | 0 .../apache/zookeeper/test/RecoveryTest.java | 0 .../zookeeper/test/RepeatStartupTest.java | 0 .../test/RestoreCommittedLogTest.java | 0 .../test/SaslAuthDesignatedClientTest.java | 0 .../test/SaslAuthDesignatedServerTest.java | 0 .../SaslAuthFailDesignatedClientTest.java | 0 .../test/SaslAuthFailNotifyTest.java | 0 .../zookeeper/test/SaslAuthFailTest.java | 0 .../test/SaslAuthMissingClientConfigTest.java | 0 .../apache/zookeeper/test/SaslClientTest.java | 0 .../test/SessionInvalidationTest.java | 0 .../apache/zookeeper/test/SessionTest.java | 0 .../zookeeper/test/SessionTimeoutTest.java | 0 .../apache/zookeeper/test/SledgeHammer.java | 0 .../apache/zookeeper/test/StandaloneTest.java | 0 .../org/apache/zookeeper/test/StatTest.java | 0 .../test/StaticHostProviderTest.java | 0 .../apache/zookeeper/test/SyncCallTest.java | 0 .../org/apache/zookeeper/test/TestHammer.java | 0 .../org/apache/zookeeper/test/TestUtils.java | 0 .../apache/zookeeper/test/TruncateTest.java | 0 .../apache/zookeeper/test/UpgradeTest.java | 0 .../test/WatchEventWhenAutoReset.java | 0 .../zookeeper/test/WatchedEventTest.java | 0 .../zookeeper/test/WatcherFuncTest.java | 0 .../apache/zookeeper/test/WatcherTest.java | 0 .../test/ZkDatabaseCorruptionTest.java | 0 .../zookeeper/test/ZooKeeperQuotaTest.java | 0 .../zookeeper/test/ZooKeeperTestClient.java | 0 .../test/resources}/check_compatibility.py | 0 .../resources}/checkstyle-noframes-sorted.xsl | 0 .../src/test/resources}/checkstyle.xml | 0 .../data/buffersize/create/version-2/log.1 | Bin .../buffersize/create/version-2/snapshot.0 | Bin .../data/buffersize/set/version-2/log.1 | Bin .../data/buffersize/set/version-2/snapshot.0 | Bin .../data/buffersize/snapshot/version-2/log.1 | Bin .../buffersize/snapshot/version-2/snapshot.0 | Bin .../buffersize/snapshot/version-2/snapshot.2 | Bin .../data/invalidsnap/version-2/log.1 | Bin .../data/invalidsnap/version-2/log.274 | Bin .../data/invalidsnap/version-2/log.42 | Bin .../data/invalidsnap/version-2/log.63b | Bin .../data/invalidsnap/version-2/snapshot.0 | Bin .../data/invalidsnap/version-2/snapshot.272 | Bin .../data/invalidsnap/version-2/snapshot.273 | Bin .../data/invalidsnap/version-2/snapshot.639 | Bin .../data/invalidsnap/version-2/snapshot.83f | Bin .../data/kerberos/minikdc-krb5.conf | 0 .../resources}/data/kerberos/minikdc.ldiff | 0 .../resources}/data/upgrade/log.100000001 | Bin .../resources}/data/upgrade/log.100001bf0 | Bin .../data/upgrade/snapshot.100000000 | Bin .../data/upgrade/snapshot.100001bec | Bin .../test/resources}/findbugsExcludeFile.xml | 0 .../src/test/resources}/test-github-pr.sh | 0 .../src/test/resources}/test-patch.properties | 0 .../src/test/resources}/test-patch.sh | 0 zookeeper-contrib/build-contrib.xml | 4 +- .../zookeeper-contrib-fatjar/build.xml | 2 +- .../zookeeper-contrib-rest/build.xml | 4 +- .../src/test/zkServer.sh | 2 +- .../src/test/zkServer.sh | 2 +- zookeeper-it/.empty | 0 {src/java/systest => zookeeper-it}/README.txt | 0 .../zookeeper/test/system/BaseSysTest.java | 0 .../test/system/DuplicateNameException.java | 0 .../zookeeper/test/system/GenerateLoad.java | 0 .../zookeeper/test/system/Instance.java | 0 .../test/system/InstanceContainer.java | 0 .../test/system/InstanceManager.java | 0 .../test/system/NoAssignmentException.java | 0 .../test/system/NoAvailableContainers.java | 0 .../test/system/QuorumPeerInstance.java | 0 .../zookeeper/test/system/SimpleClient.java | 0 .../zookeeper/test/system/SimpleSysTest.java | 0 zookeeper-recipes/build-recipes.xml | 2 +- .../src/main/c/tests/zkServer.sh | 2 +- .../src/main/c/tests/zkServer.sh | 2 +- .../apache/zookeeper/JLineZNodeCompletor.java | 0 .../org/apache/zookeeper/jmx/CommonNames.java | 0 .../apache/zookeeper/jmx/MBeanRegistry.java | 0 .../org/apache/zookeeper/jmx/ManagedUtil.java | 0 .../org/apache/zookeeper/jmx/ZKMBeanInfo.java | 0 .../server/ByteBufferInputStream.java | 0 .../server/ByteBufferOutputStream.java | 0 .../zookeeper/server/ConnectionBean.java | 0 .../zookeeper/server/ConnectionMXBean.java | 0 .../org/apache/zookeeper/server/DataNode.java | 0 .../org/apache/zookeeper/server/DataTree.java | 0 .../apache/zookeeper/server/DataTreeBean.java | 0 .../zookeeper/server/DataTreeMXBean.java | 0 .../server/DatadirCleanupManager.java | 0 .../org/apache/zookeeper/server/ExitCode.java | 0 .../server/FinalRequestProcessor.java | 0 .../apache/zookeeper/server/LogFormatter.java | 0 .../zookeeper/server/NIOServerCnxn.java | 0 .../server/NIOServerCnxnFactory.java | 0 .../zookeeper/server/NettyServerCnxn.java | 0 .../server/NettyServerCnxnFactory.java | 0 .../apache/zookeeper/server/ObserverBean.java | 0 .../server/PrepRequestProcessor.java | 0 .../apache/zookeeper/server/PurgeTxnLog.java | 0 .../server/ReferenceCountedACLCache.java | 0 .../org/apache/zookeeper/server/Request.java | 0 .../zookeeper/server/RequestProcessor.java | 0 .../apache/zookeeper/server/ServerCnxn.java | 0 .../zookeeper/server/ServerCnxnFactory.java | 0 .../apache/zookeeper/server/ServerConfig.java | 0 .../apache/zookeeper/server/ServerStats.java | 0 .../zookeeper/server/SessionTracker.java | 0 .../zookeeper/server/SessionTrackerImpl.java | 0 .../zookeeper/server/SnapshotFormatter.java | 0 .../org/apache/zookeeper/server/Stats.java | 0 .../server/SyncRequestProcessor.java | 0 .../zookeeper/server/TraceFormatter.java | 0 .../server/UnimplementedRequestProcessor.java | 0 .../apache/zookeeper/server/WatchManager.java | 0 .../apache/zookeeper/server/ZKDatabase.java | 0 .../server/ZooKeeperCriticalThread.java | 0 .../zookeeper/server/ZooKeeperSaslServer.java | 0 .../zookeeper/server/ZooKeeperServer.java | 0 .../zookeeper/server/ZooKeeperServerBean.java | 0 .../server/ZooKeeperServerListener.java | 0 .../server/ZooKeeperServerListenerImpl.java | 0 .../server/ZooKeeperServerMXBean.java | 0 .../zookeeper/server/ZooKeeperServerMain.java | 0 .../ZooKeeperServerShutdownHandler.java | 0 .../zookeeper/server/ZooKeeperThread.java | 0 .../org/apache/zookeeper/server/ZooTrace.java | 0 .../server/auth/AuthenticationProvider.java | 0 .../auth/DigestAuthenticationProvider.java | 0 .../server/auth/DigestLoginModule.java | 0 .../server/auth/IPAuthenticationProvider.java | 0 .../zookeeper/server/auth/KerberosName.java | 0 .../server/auth/ProviderRegistry.java | 0 .../auth/SASLAuthenticationProvider.java | 0 .../auth/SaslServerCallbackHandler.java | 0 .../org/apache/zookeeper/server/package.html | 0 .../server/persistence/FilePadding.java | 0 .../server/persistence/FileSnap.java | 0 .../server/persistence/FileTxnLog.java | 0 .../server/persistence/FileTxnSnapLog.java | 0 .../server/persistence/SnapShot.java | 0 .../zookeeper/server/persistence/TxnLog.java | 0 .../server/persistence/TxnLogToolkit.java | 0 .../persistence/TxnLogToolkitCliParser.java | 0 .../zookeeper/server/persistence/Util.java | 0 .../server/quorum/AckRequestProcessor.java | 0 .../server/quorum/AuthFastLeaderElection.java | 0 .../server/quorum/CommitProcessor.java | 0 .../zookeeper/server/quorum/Election.java | 0 .../server/quorum/FastLeaderElection.java | 0 .../zookeeper/server/quorum/Follower.java | 0 .../zookeeper/server/quorum/FollowerBean.java | 0 .../server/quorum/FollowerMXBean.java | 0 .../quorum/FollowerRequestProcessor.java | 0 .../quorum/FollowerZooKeeperServer.java | 0 .../zookeeper/server/quorum/Leader.java | 0 .../zookeeper/server/quorum/LeaderBean.java | 0 .../server/quorum/LeaderElection.java | 0 .../server/quorum/LeaderElectionBean.java | 0 .../server/quorum/LeaderElectionMXBean.java | 0 .../zookeeper/server/quorum/LeaderMXBean.java | 0 .../server/quorum/LeaderZooKeeperServer.java | 0 .../zookeeper/server/quorum/Learner.java | 0 .../server/quorum/LearnerHandler.java | 0 .../server/quorum/LearnerSessionTracker.java | 0 .../server/quorum/LearnerSyncRequest.java | 0 .../server/quorum/LearnerZooKeeperServer.java | 0 .../server/quorum/LocalPeerBean.java | 0 .../server/quorum/LocalPeerMXBean.java | 0 .../zookeeper/server/quorum/Observer.java | 0 .../server/quorum/ObserverMXBean.java | 0 .../quorum/ObserverRequestProcessor.java | 0 .../quorum/ObserverZooKeeperServer.java | 0 .../quorum/ProposalRequestProcessor.java | 0 .../server/quorum/ProposalStats.java | 0 .../zookeeper/server/quorum/QuorumBean.java | 0 .../server/quorum/QuorumCnxManager.java | 0 .../zookeeper/server/quorum/QuorumMXBean.java | 0 .../zookeeper/server/quorum/QuorumPeer.java | 0 .../server/quorum/QuorumPeerConfig.java | 0 .../server/quorum/QuorumPeerMain.java | 0 .../zookeeper/server/quorum/QuorumStats.java | 0 .../server/quorum/QuorumZooKeeperServer.java | 0 .../zookeeper/server/quorum/ReadOnlyBean.java | 0 .../quorum/ReadOnlyRequestProcessor.java | 0 .../quorum/ReadOnlyZooKeeperServer.java | 0 .../server/quorum/RemotePeerBean.java | 0 .../server/quorum/RemotePeerMXBean.java | 0 .../quorum/SendAckRequestProcessor.java | 0 .../zookeeper/server/quorum/ServerBean.java | 0 .../zookeeper/server/quorum/ServerMXBean.java | 0 .../zookeeper/server/quorum/StateSummary.java | 0 .../apache/zookeeper/server/quorum/Vote.java | 0 .../quorum/auth/NullQuorumAuthLearner.java | 0 .../quorum/auth/NullQuorumAuthServer.java | 0 .../server/quorum/auth/QuorumAuth.java | 0 .../server/quorum/auth/QuorumAuthLearner.java | 0 .../server/quorum/auth/QuorumAuthServer.java | 0 .../quorum/auth/SaslQuorumAuthLearner.java | 0 .../quorum/auth/SaslQuorumAuthServer.java | 0 .../auth/SaslQuorumServerCallbackHandler.java | 0 .../quorum/flexible/QuorumHierarchical.java | 0 .../server/quorum/flexible/QuorumMaj.java | 0 .../quorum/flexible/QuorumVerifier.java | 0 .../zookeeper/server/upgrade/DataNodeV1.java | 0 .../zookeeper/server/upgrade/DataTreeV1.java | 0 .../zookeeper/server/upgrade/UpgradeMain.java | 0 .../server/upgrade/UpgradeSnapShot.java | 0 .../server/upgrade/UpgradeSnapShotV1.java | 0 .../zookeeper/server/util/KerberosUtil.java | 0 .../zookeeper/server/util/OSMXBean.java | 0 .../zookeeper/server/util/Profiler.java | 0 .../zookeeper/server/util/SerializeUtils.java | 0 .../zookeeper/server/util/ZxidUtils.java | 0 .../src/main/resources}/LICENSE.txt | 2 +- .../src/main/resources}/NOTICE.txt | 0 .../main/resources}/jline-0.9.94.LICENSE.txt | 0 .../src/main/resources}/lastRevision.bat | 0 .../src/main/resources}/lastRevision.sh | 0 .../src/main/resources}/overview.html | 0 .../src/main/resources}/pom.template | 0 .../org/apache/zookeeper/server/CRCTest.java | 0 .../apache/zookeeper/server/DataNodeTest.java | 0 .../apache/zookeeper/server/DataTreeTest.java | 0 .../zookeeper/server/DataTreeUnitTest.java | 0 .../server/DatadirCleanupManagerTest.java | 0 .../server/DeserializationPerfTest.java | 0 .../server/InvalidSnapCountTest.java | 0 .../zookeeper/server/InvalidSnapshotTest.java | 0 .../zookeeper/server/MockNIOServerCnxn.java | 0 .../zookeeper/server/NIOServerCnxnTest.java | 0 .../zookeeper/server/NettyServerCnxnTest.java | 0 .../server/PrepRequestProcessorTest.java | 0 .../apache/zookeeper/server/PurgeTxnTest.java | 0 .../server/ReferenceCountedACLCacheTest.java | 0 .../server/SerializationPerfTest.java | 0 .../server/ServerCnxnFactoryAccessor.java | 0 .../zookeeper/server/ServerStatsTest.java | 0 .../zookeeper/server/SessionTrackerTest.java | 0 .../apache/zookeeper/server/ToStringTest.java | 0 .../server/ZooKeeperServerMainTest.java | 0 .../server/ZooKeeperServerStartupTest.java | 0 .../zookeeper/server/ZooKeeperServerTest.java | 0 .../zookeeper/server/ZooKeeperThreadTest.java | 0 .../zookeeper/server/ZxidRolloverTest.java | 0 .../server/persistence/FileTxnLogTest.java | 0 .../persistence/FileTxnSnapLogTest.java | 0 .../TxnLogToolkitCliParserTest.java | 0 .../server/persistence/TxnLogToolkitTest.java | 0 .../server/quorum/CnxManagerTest.java | 0 .../quorum/EphemeralNodeDeletionTest.java | 0 .../quorum/FLEBackwardElectionRoundTest.java | 0 .../server/quorum/FLECompatibilityTest.java | 0 .../server/quorum/FLEDontCareTest.java | 0 .../server/quorum/FLELostMessageTest.java | 0 .../zookeeper/server/quorum/FLETestUtils.java | 0 .../server/quorum/LeaderBeanTest.java | 0 .../server/quorum/LeaderWithObserverTest.java | 0 .../zookeeper/server/quorum/LearnerTest.java | 0 .../server/quorum/ProposalStatsTest.java | 0 .../server/quorum/QuorumCnxManagerTest.java | 0 .../server/quorum/QuorumPeerMainTest.java | 0 .../server/quorum/QuorumPeerTestBase.java | 0 .../server/quorum/WatchLeakTest.java | 0 .../zookeeper/server/quorum/Zab1_0Test.java | 0 .../zookeeper/server/quorum/ZabUtils.java | 0 .../ApacheDSKerberosSecurityTestcase.java | 0 .../server/quorum/auth/ApacheDSMiniKdc.java | 0 .../quorum/auth/ApacheDSMiniKdcTest.java | 0 .../auth/ApacheDSQuorumKerberosAuthTest.java | 0 ...acheDSQuorumKerberosHostBasedAuthTest.java | 0 .../quorum/auth/KerberosSecurityTestcase.java | 0 .../server/quorum/auth/KerberosTestUtils.java | 0 .../zookeeper/server/quorum/auth/MiniKdc.java | 0 .../server/quorum/auth/MiniKdcTest.java | 0 .../quorum/auth/QuorumAuthTestBase.java | 0 .../quorum/auth/QuorumAuthUpgradeTest.java | 0 .../quorum/auth/QuorumDigestAuthTest.java | 0 .../quorum/auth/QuorumKerberosAuthTest.java | 0 .../auth/QuorumKerberosHostBasedAuthTest.java | 0 .../zookeeper/server/util/PortForwarder.java | 0 .../server/util/SerializeUtilsTest.java | 0 411 files changed, 157 insertions(+), 80 deletions(-) delete mode 100644 src/java/OldChangeLog rename {src/java/main => zookeeper-client/zookeeper-client-java/src/main/java}/org/apache/zookeeper/client/ConnectStringParser.java (100%) rename {src/java/main => zookeeper-client/zookeeper-client-java/src/main/java}/org/apache/zookeeper/client/FourLetterWordMain.java (100%) rename {src/java/main => zookeeper-client/zookeeper-client-java/src/main/java}/org/apache/zookeeper/client/HostProvider.java (100%) rename {src/java/main => zookeeper-client/zookeeper-client-java/src/main/java}/org/apache/zookeeper/client/StaticHostProvider.java (100%) rename {src/java/main => zookeeper-client/zookeeper-client-java/src/main/java}/org/apache/zookeeper/client/ZooKeeperSaslClient.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/AsyncCallback.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ClientCnxn.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ClientCnxnSocket.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ClientCnxnSocketNIO.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ClientWatchManager.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/CreateMode.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Environment.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/KeeperException.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Login.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/MultiResponse.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/MultiTransactionRecord.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Op.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/OpResult.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Quotas.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/SaslClientCallbackHandler.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ServerAdminClient.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Shell.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/StatsTrack.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Testable.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Transaction.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Version.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/WatchedEvent.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/Watcher.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ZKUtil.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ZooDefs.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ZooKeeper.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ZooKeeperMain.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/ZooKeeperTestable.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/common/AtomicFileOutputStream.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/common/IOUtils.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/common/PathTrie.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/common/PathUtils.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/common/Time.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/util/SecurityUtils.java (100%) rename {src/java/main => zookeeper-common/src/main/java}/org/apache/zookeeper/version/util/VerGen.java (100%) rename {src/java => zookeeper-common/src/main/resources}/lib/cobertura/README.txt (100%) rename {src/java => zookeeper-common/src/main/resources}/lib/jdiff/zookeeper_3.1.1.xml (100%) rename {src/java => zookeeper-common/src/main/resources}/lib/log4j-1.2.17.LICENSE.txt (100%) rename {src/java => zookeeper-common/src/main/resources}/lib/slf4j-1.7.25.LICENSE.txt (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/ClientReconnectTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/JUnit4ZKTestRunner.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/JaasConfiguration.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/MockPacket.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/MultiResponseTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/MultiTransactionRecordTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/PortAssignment.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/SaslAuthTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/ServerConfigTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/TestableZooKeeper.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/VerGenTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/ZKTestCase.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/ZooKeeperTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/common/TimeTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ACLCountTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ACLRootTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ACLTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/AsyncHammerTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/AsyncOps.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/AsyncOpsTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/AsyncTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/AuthTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/BufferSizeTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ChrootAsyncTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ChrootClientTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ChrootTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ClientBase.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ClientHammerTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ClientPortBindTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ClientRetry.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ClientTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ConnectStringParserTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/CreateModeTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/DisconnectableZooKeeper.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/DisconnectedWatcherTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/EventTypeTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FLENewEpochTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FLEPredicateTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FLERestartTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FLETest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FLEZeroWeightTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FollowerTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FourLetterWordsTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/GetChildren2Test.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/HierarchicalQuorumTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/IntegrityCheck.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/InvalidSnapshotTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/JMXEnv.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/KeeperStateTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/LENonTerminateTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/LETest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/LoadFromLogNoServerTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/LoadFromLogTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/MaxCnxnsTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/MultiTransactionTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/NioNettySuiteBase.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/NioNettySuiteHammerTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/NioNettySuiteTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/NonRecoverableErrorTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/NullDataTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/OOMTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/OSMXBeanTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ObserverLETest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ObserverQuorumHammerTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ObserverTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/QuorumBase.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/QuorumHammerTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/QuorumQuotaTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/QuorumTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/QuorumUtil.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/QuorumZxidSyncTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ReadOnlyModeTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/RecoveryTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/RepeatStartupTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/RestoreCommittedLogTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SaslAuthFailTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SaslClientTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SessionInvalidationTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SessionTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SessionTimeoutTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SledgeHammer.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/StandaloneTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/StatTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/StaticHostProviderTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/SyncCallTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/TestHammer.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/TestUtils.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/TruncateTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/UpgradeTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/WatchEventWhenAutoReset.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/WatchedEventTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/WatcherFuncTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/WatcherTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ZooKeeperQuotaTest.java (100%) rename {src/java/test => zookeeper-common/src/test/java}/org/apache/zookeeper/test/ZooKeeperTestClient.java (100%) rename {src/java/test/bin => zookeeper-common/src/test/resources}/check_compatibility.py (100%) rename {src/java/test => zookeeper-common/src/test/resources}/checkstyle-noframes-sorted.xsl (100%) rename {src/java/test => zookeeper-common/src/test/resources}/checkstyle.xml (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/buffersize/create/version-2/log.1 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/buffersize/create/version-2/snapshot.0 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/buffersize/set/version-2/log.1 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/buffersize/set/version-2/snapshot.0 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/buffersize/snapshot/version-2/log.1 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/buffersize/snapshot/version-2/snapshot.0 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/buffersize/snapshot/version-2/snapshot.2 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/log.1 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/log.274 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/log.42 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/log.63b (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/snapshot.0 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/snapshot.272 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/snapshot.273 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/snapshot.639 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/invalidsnap/version-2/snapshot.83f (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/kerberos/minikdc-krb5.conf (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/kerberos/minikdc.ldiff (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/upgrade/log.100000001 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/upgrade/log.100001bf0 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/upgrade/snapshot.100000000 (100%) rename {src/java/test => zookeeper-common/src/test/resources}/data/upgrade/snapshot.100001bec (100%) rename {src/java/test/config => zookeeper-common/src/test/resources}/findbugsExcludeFile.xml (100%) rename {src/java/test/bin => zookeeper-common/src/test/resources}/test-github-pr.sh (100%) rename {src/java/test/bin => zookeeper-common/src/test/resources}/test-patch.properties (100%) rename {src/java/test/bin => zookeeper-common/src/test/resources}/test-patch.sh (100%) delete mode 100644 zookeeper-it/.empty rename {src/java/systest => zookeeper-it}/README.txt (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/BaseSysTest.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/DuplicateNameException.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/GenerateLoad.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/Instance.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/InstanceContainer.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/InstanceManager.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/NoAssignmentException.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/NoAvailableContainers.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/QuorumPeerInstance.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/SimpleClient.java (100%) rename {src/java/systest => zookeeper-it/src/test/java}/org/apache/zookeeper/test/system/SimpleSysTest.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/JLineZNodeCompletor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/jmx/CommonNames.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/jmx/MBeanRegistry.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/jmx/ManagedUtil.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/jmx/ZKMBeanInfo.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ByteBufferInputStream.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ByteBufferOutputStream.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ConnectionBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ConnectionMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/DataNode.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/DataTree.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/DataTreeBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/DataTreeMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/DatadirCleanupManager.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ExitCode.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/FinalRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/LogFormatter.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/NIOServerCnxn.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/NIOServerCnxnFactory.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/NettyServerCnxn.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/NettyServerCnxnFactory.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ObserverBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/PrepRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/PurgeTxnLog.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ReferenceCountedACLCache.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/Request.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/RequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ServerCnxn.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ServerCnxnFactory.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ServerConfig.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ServerStats.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/SessionTracker.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/SessionTrackerImpl.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/SnapshotFormatter.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/Stats.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/SyncRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/TraceFormatter.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/UnimplementedRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/WatchManager.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZKDatabase.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperCriticalThread.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperSaslServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperServerBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperServerListener.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperServerListenerImpl.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperServerMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperServerMain.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperServerShutdownHandler.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooKeeperThread.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/ZooTrace.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/auth/AuthenticationProvider.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/auth/DigestLoginModule.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/auth/KerberosName.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/auth/ProviderRegistry.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/auth/SASLAuthenticationProvider.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/package.html (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/FilePadding.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/FileSnap.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/FileTxnLog.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/SnapShot.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/TxnLog.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/TxnLogToolkit.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParser.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/persistence/Util.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/AckRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/CommitProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/Election.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/FastLeaderElection.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/Follower.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/FollowerBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/FollowerMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/Leader.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LeaderBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LeaderElection.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LeaderElectionBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LeaderElectionMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LeaderMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/Learner.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LearnerHandler.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LearnerSessionTracker.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LearnerSyncRequest.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LocalPeerBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/LocalPeerMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/Observer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ObserverMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ProposalStats.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/QuorumBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/QuorumCnxManager.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/QuorumMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/QuorumPeer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/QuorumPeerMain.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/QuorumStats.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/QuorumZooKeeperServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ReadOnlyBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/RemotePeerBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/RemotePeerMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ServerBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/ServerMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/StateSummary.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/Vote.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/upgrade/DataNodeV1.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/upgrade/DataTreeV1.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/upgrade/UpgradeMain.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/util/KerberosUtil.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/util/OSMXBean.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/util/Profiler.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/util/SerializeUtils.java (100%) rename {src/java/main => zookeeper-server/src/main/java}/org/apache/zookeeper/server/util/ZxidUtils.java (100%) rename {src => zookeeper-server/src/main/resources}/LICENSE.txt (99%) rename {src => zookeeper-server/src/main/resources}/NOTICE.txt (100%) rename {src/java/lib => zookeeper-server/src/main/resources}/jline-0.9.94.LICENSE.txt (100%) rename {src => zookeeper-server/src/main/resources}/lastRevision.bat (100%) rename {src => zookeeper-server/src/main/resources}/lastRevision.sh (100%) rename {src/java/main => zookeeper-server/src/main/resources}/overview.html (100%) rename {src => zookeeper-server/src/main/resources}/pom.template (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/CRCTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/DataNodeTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/DataTreeTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/DataTreeUnitTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/DatadirCleanupManagerTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/DeserializationPerfTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/InvalidSnapCountTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/InvalidSnapshotTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/MockNIOServerCnxn.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/NIOServerCnxnTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/NettyServerCnxnTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/PrepRequestProcessorTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/PurgeTxnTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/SerializationPerfTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ServerCnxnFactoryAccessor.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ServerStatsTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/SessionTrackerTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ToStringTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ZooKeeperServerMainTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ZooKeeperServerTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ZooKeeperThreadTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/ZxidRolloverTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/persistence/FileTxnLogTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/persistence/FileTxnSnapLogTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParserTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/persistence/TxnLogToolkitTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/CnxManagerTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/FLEDontCareTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/FLELostMessageTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/FLETestUtils.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/LeaderBeanTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/LearnerTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/ProposalStatsTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/WatchLeakTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/Zab1_0Test.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/ZabUtils.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/ApacheDSKerberosSecurityTestcase.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdc.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdcTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosAuthTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosHostBasedAuthTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/MiniKdc.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/util/PortForwarder.java (100%) rename {src/java/test => zookeeper-server/src/test/java}/org/apache/zookeeper/server/util/SerializeUtilsTest.java (100%) diff --git a/.gitignore b/.gitignore index 78c9ed4fad0..354445685cb 100644 --- a/.gitignore +++ b/.gitignore @@ -66,8 +66,8 @@ zookeeper-client/zookeeper-client-c/*.lo zookeeper-client/zookeeper-client-c/*.o zookeeper-client/zookeeper-client-c/generated/ src/java/generated/ -src/java/lib/ant-eclipse-* -src/java/lib/ivy-* +zookeeper-common/src/main/resources/lib/ant-eclipse-* +zookeeper-common/src/main/resources/lib/ivy-* zookeeper-client/zookeeper-client-c/Makefile.in zookeeper-client/zookeeper-client-c/aclocal.m4 zookeeper-client/zookeeper-client-c/autom4te.cache/ diff --git a/bin/zkEnv.sh b/bin/zkEnv.sh index 43cbc2235a5..4e6fb9794b9 100755 --- a/bin/zkEnv.sh +++ b/bin/zkEnv.sh @@ -70,7 +70,7 @@ fi #add the zoocfg dir to classpath CLASSPATH="$ZOOCFGDIR:$CLASSPATH" -for i in "$ZOOBINDIR"/../src/java/lib/*.jar +for i in "$ZOOBINDIR"/../zookeeper-common/src/main/resources/lib/*.jar do CLASSPATH="$i:$CLASSPATH" done diff --git a/build.xml b/build.xml index 4b945c85484..9cce9469483 100644 --- a/build.xml +++ b/build.xml @@ -78,16 +78,20 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + - + + + + + - + @@ -100,7 +104,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + @@ -113,9 +117,11 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + - + @@ -131,7 +137,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - @@ -141,6 +146,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> value="http://docs.oracle.com/javase/6/docs/api/" /> + + + + + + @@ -190,8 +201,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - - + + @@ -331,7 +342,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + @@ -350,9 +361,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + includes="org/apache/zookeeper/version/util/**" debug="on"> + + + @@ -361,7 +375,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> + value="/c ${java.server.resources.dir}\lastRevision.bat" else="${java.server.resources.dir}/lastRevision.sh"> @@ -459,7 +473,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + @@ -471,7 +487,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + @@ -534,7 +551,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> description="Generate javadoc for zookeeper developers"> doctitle="${Name} ${version} API" bottom="Copyright © ${year} The Apache Software Foundation" > - + + + + + + + @@ -557,7 +580,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> docletpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar" > - + @@ -579,10 +602,18 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + + + + + + + @@ -619,7 +650,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + @@ -694,7 +727,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + @@ -803,7 +838,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> + templatefile="${java.server.resources.dir}/pom.template" > @@ -835,20 +870,21 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - - + + - + + - + @@ -919,7 +955,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> + templatefile="${java.server.resources.dir}/pom.template"> @@ -961,13 +997,13 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - - + + - + @@ -1338,18 +1374,18 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + - + - + - + @@ -1395,7 +1431,11 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + + + @@ -1404,7 +1444,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + + @@ -1412,7 +1455,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + @@ -1579,11 +1623,24 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - - + + + + + + + + + + @@ -1634,7 +1691,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + - + + + - + - + + @@ -1725,8 +1787,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + destdir="${coveragereport.dir}" > + @@ -1745,11 +1807,13 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - - + + + + - @@ -1809,7 +1873,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - @@ -1838,10 +1901,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - - - - + + + + @@ -1926,10 +1989,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + + + + + @@ -1951,10 +2020,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - + + + @@ -1984,19 +2055,19 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> + dest="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" /> - + - + - - + + - + + - + diff --git a/src/java/OldChangeLog b/src/java/OldChangeLog deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/zookeeper-client/zookeeper-client-c/tests/zkServer.sh b/zookeeper-client/zookeeper-client-c/tests/zkServer.sh index 4872fbad93b..9c8473854f0 100755 --- a/zookeeper-client/zookeeper-client-c/tests/zkServer.sh +++ b/zookeeper-client/zookeeper-client-c/tests/zkServer.sh @@ -90,7 +90,7 @@ do CLASSPATH="$CLASSPATH:$i" done -for i in "${zk_base}"/src/java/lib/*.jar +for i in "${zk_base}"/zookeeper-common/src/main/resource/lib/*.jar do CLASSPATH="$CLASSPATH:$i" done diff --git a/src/java/main/org/apache/zookeeper/client/ConnectStringParser.java b/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/ConnectStringParser.java similarity index 100% rename from src/java/main/org/apache/zookeeper/client/ConnectStringParser.java rename to zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/ConnectStringParser.java diff --git a/src/java/main/org/apache/zookeeper/client/FourLetterWordMain.java b/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/FourLetterWordMain.java similarity index 100% rename from src/java/main/org/apache/zookeeper/client/FourLetterWordMain.java rename to zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/FourLetterWordMain.java diff --git a/src/java/main/org/apache/zookeeper/client/HostProvider.java b/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/HostProvider.java similarity index 100% rename from src/java/main/org/apache/zookeeper/client/HostProvider.java rename to zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/HostProvider.java diff --git a/src/java/main/org/apache/zookeeper/client/StaticHostProvider.java b/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java similarity index 100% rename from src/java/main/org/apache/zookeeper/client/StaticHostProvider.java rename to zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java diff --git a/src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java b/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java similarity index 100% rename from src/java/main/org/apache/zookeeper/client/ZooKeeperSaslClient.java rename to zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java diff --git a/src/java/main/org/apache/zookeeper/AsyncCallback.java b/zookeeper-common/src/main/java/org/apache/zookeeper/AsyncCallback.java similarity index 100% rename from src/java/main/org/apache/zookeeper/AsyncCallback.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/AsyncCallback.java diff --git a/src/java/main/org/apache/zookeeper/ClientCnxn.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxn.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ClientCnxn.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxn.java diff --git a/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxnSocket.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ClientCnxnSocket.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxnSocket.java diff --git a/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxnSocketNIO.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxnSocketNIO.java diff --git a/src/java/main/org/apache/zookeeper/ClientWatchManager.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ClientWatchManager.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ClientWatchManager.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ClientWatchManager.java diff --git a/src/java/main/org/apache/zookeeper/CreateMode.java b/zookeeper-common/src/main/java/org/apache/zookeeper/CreateMode.java similarity index 100% rename from src/java/main/org/apache/zookeeper/CreateMode.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/CreateMode.java diff --git a/src/java/main/org/apache/zookeeper/Environment.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Environment.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Environment.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Environment.java diff --git a/src/java/main/org/apache/zookeeper/KeeperException.java b/zookeeper-common/src/main/java/org/apache/zookeeper/KeeperException.java similarity index 100% rename from src/java/main/org/apache/zookeeper/KeeperException.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/KeeperException.java diff --git a/src/java/main/org/apache/zookeeper/Login.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Login.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Login.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Login.java diff --git a/src/java/main/org/apache/zookeeper/MultiResponse.java b/zookeeper-common/src/main/java/org/apache/zookeeper/MultiResponse.java similarity index 100% rename from src/java/main/org/apache/zookeeper/MultiResponse.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/MultiResponse.java diff --git a/src/java/main/org/apache/zookeeper/MultiTransactionRecord.java b/zookeeper-common/src/main/java/org/apache/zookeeper/MultiTransactionRecord.java similarity index 100% rename from src/java/main/org/apache/zookeeper/MultiTransactionRecord.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/MultiTransactionRecord.java diff --git a/src/java/main/org/apache/zookeeper/Op.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Op.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Op.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Op.java diff --git a/src/java/main/org/apache/zookeeper/OpResult.java b/zookeeper-common/src/main/java/org/apache/zookeeper/OpResult.java similarity index 100% rename from src/java/main/org/apache/zookeeper/OpResult.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/OpResult.java diff --git a/src/java/main/org/apache/zookeeper/Quotas.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Quotas.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Quotas.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Quotas.java diff --git a/src/java/main/org/apache/zookeeper/SaslClientCallbackHandler.java b/zookeeper-common/src/main/java/org/apache/zookeeper/SaslClientCallbackHandler.java similarity index 100% rename from src/java/main/org/apache/zookeeper/SaslClientCallbackHandler.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/SaslClientCallbackHandler.java diff --git a/src/java/main/org/apache/zookeeper/ServerAdminClient.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ServerAdminClient.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ServerAdminClient.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ServerAdminClient.java diff --git a/src/java/main/org/apache/zookeeper/Shell.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Shell.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Shell.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Shell.java diff --git a/src/java/main/org/apache/zookeeper/StatsTrack.java b/zookeeper-common/src/main/java/org/apache/zookeeper/StatsTrack.java similarity index 100% rename from src/java/main/org/apache/zookeeper/StatsTrack.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/StatsTrack.java diff --git a/src/java/main/org/apache/zookeeper/Testable.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Testable.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Testable.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Testable.java diff --git a/src/java/main/org/apache/zookeeper/Transaction.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Transaction.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Transaction.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Transaction.java diff --git a/src/java/main/org/apache/zookeeper/Version.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Version.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Version.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Version.java diff --git a/src/java/main/org/apache/zookeeper/WatchedEvent.java b/zookeeper-common/src/main/java/org/apache/zookeeper/WatchedEvent.java similarity index 100% rename from src/java/main/org/apache/zookeeper/WatchedEvent.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/WatchedEvent.java diff --git a/src/java/main/org/apache/zookeeper/Watcher.java b/zookeeper-common/src/main/java/org/apache/zookeeper/Watcher.java similarity index 100% rename from src/java/main/org/apache/zookeeper/Watcher.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/Watcher.java diff --git a/src/java/main/org/apache/zookeeper/ZKUtil.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ZKUtil.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ZKUtil.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ZKUtil.java diff --git a/src/java/main/org/apache/zookeeper/ZooDefs.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ZooDefs.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ZooDefs.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ZooDefs.java diff --git a/src/java/main/org/apache/zookeeper/ZooKeeper.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeper.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ZooKeeper.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeper.java diff --git a/src/java/main/org/apache/zookeeper/ZooKeeperMain.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeperMain.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ZooKeeperMain.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeperMain.java diff --git a/src/java/main/org/apache/zookeeper/ZooKeeperTestable.java b/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeperTestable.java similarity index 100% rename from src/java/main/org/apache/zookeeper/ZooKeeperTestable.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeperTestable.java diff --git a/src/java/main/org/apache/zookeeper/common/AtomicFileOutputStream.java b/zookeeper-common/src/main/java/org/apache/zookeeper/common/AtomicFileOutputStream.java similarity index 100% rename from src/java/main/org/apache/zookeeper/common/AtomicFileOutputStream.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/common/AtomicFileOutputStream.java diff --git a/src/java/main/org/apache/zookeeper/common/IOUtils.java b/zookeeper-common/src/main/java/org/apache/zookeeper/common/IOUtils.java similarity index 100% rename from src/java/main/org/apache/zookeeper/common/IOUtils.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/common/IOUtils.java diff --git a/src/java/main/org/apache/zookeeper/common/PathTrie.java b/zookeeper-common/src/main/java/org/apache/zookeeper/common/PathTrie.java similarity index 100% rename from src/java/main/org/apache/zookeeper/common/PathTrie.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/common/PathTrie.java diff --git a/src/java/main/org/apache/zookeeper/common/PathUtils.java b/zookeeper-common/src/main/java/org/apache/zookeeper/common/PathUtils.java similarity index 100% rename from src/java/main/org/apache/zookeeper/common/PathUtils.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/common/PathUtils.java diff --git a/src/java/main/org/apache/zookeeper/common/Time.java b/zookeeper-common/src/main/java/org/apache/zookeeper/common/Time.java similarity index 100% rename from src/java/main/org/apache/zookeeper/common/Time.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/common/Time.java diff --git a/src/java/main/org/apache/zookeeper/util/SecurityUtils.java b/zookeeper-common/src/main/java/org/apache/zookeeper/util/SecurityUtils.java similarity index 100% rename from src/java/main/org/apache/zookeeper/util/SecurityUtils.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/util/SecurityUtils.java diff --git a/src/java/main/org/apache/zookeeper/version/util/VerGen.java b/zookeeper-common/src/main/java/org/apache/zookeeper/version/util/VerGen.java similarity index 100% rename from src/java/main/org/apache/zookeeper/version/util/VerGen.java rename to zookeeper-common/src/main/java/org/apache/zookeeper/version/util/VerGen.java diff --git a/src/java/lib/cobertura/README.txt b/zookeeper-common/src/main/resources/lib/cobertura/README.txt similarity index 100% rename from src/java/lib/cobertura/README.txt rename to zookeeper-common/src/main/resources/lib/cobertura/README.txt diff --git a/src/java/lib/jdiff/zookeeper_3.1.1.xml b/zookeeper-common/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml similarity index 100% rename from src/java/lib/jdiff/zookeeper_3.1.1.xml rename to zookeeper-common/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml diff --git a/src/java/lib/log4j-1.2.17.LICENSE.txt b/zookeeper-common/src/main/resources/lib/log4j-1.2.17.LICENSE.txt similarity index 100% rename from src/java/lib/log4j-1.2.17.LICENSE.txt rename to zookeeper-common/src/main/resources/lib/log4j-1.2.17.LICENSE.txt diff --git a/src/java/lib/slf4j-1.7.25.LICENSE.txt b/zookeeper-common/src/main/resources/lib/slf4j-1.7.25.LICENSE.txt similarity index 100% rename from src/java/lib/slf4j-1.7.25.LICENSE.txt rename to zookeeper-common/src/main/resources/lib/slf4j-1.7.25.LICENSE.txt diff --git a/src/java/test/org/apache/zookeeper/ClientReconnectTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/ClientReconnectTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/ClientReconnectTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/ClientReconnectTest.java diff --git a/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java b/zookeeper-common/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java similarity index 100% rename from src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java diff --git a/src/java/test/org/apache/zookeeper/JaasConfiguration.java b/zookeeper-common/src/test/java/org/apache/zookeeper/JaasConfiguration.java similarity index 100% rename from src/java/test/org/apache/zookeeper/JaasConfiguration.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/JaasConfiguration.java diff --git a/src/java/test/org/apache/zookeeper/MockPacket.java b/zookeeper-common/src/test/java/org/apache/zookeeper/MockPacket.java similarity index 100% rename from src/java/test/org/apache/zookeeper/MockPacket.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/MockPacket.java diff --git a/src/java/test/org/apache/zookeeper/MultiResponseTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/MultiResponseTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/MultiResponseTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/MultiResponseTest.java diff --git a/src/java/test/org/apache/zookeeper/MultiTransactionRecordTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/MultiTransactionRecordTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/MultiTransactionRecordTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/MultiTransactionRecordTest.java diff --git a/src/java/test/org/apache/zookeeper/PortAssignment.java b/zookeeper-common/src/test/java/org/apache/zookeeper/PortAssignment.java similarity index 100% rename from src/java/test/org/apache/zookeeper/PortAssignment.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/PortAssignment.java diff --git a/src/java/test/org/apache/zookeeper/SaslAuthTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/SaslAuthTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/SaslAuthTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/SaslAuthTest.java diff --git a/src/java/test/org/apache/zookeeper/ServerConfigTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/ServerConfigTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/ServerConfigTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/ServerConfigTest.java diff --git a/src/java/test/org/apache/zookeeper/TestableZooKeeper.java b/zookeeper-common/src/test/java/org/apache/zookeeper/TestableZooKeeper.java similarity index 100% rename from src/java/test/org/apache/zookeeper/TestableZooKeeper.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/TestableZooKeeper.java diff --git a/src/java/test/org/apache/zookeeper/VerGenTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/VerGenTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/VerGenTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/VerGenTest.java diff --git a/src/java/test/org/apache/zookeeper/ZKTestCase.java b/zookeeper-common/src/test/java/org/apache/zookeeper/ZKTestCase.java similarity index 100% rename from src/java/test/org/apache/zookeeper/ZKTestCase.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/ZKTestCase.java diff --git a/src/java/test/org/apache/zookeeper/ZooKeeperTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/ZooKeeperTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/ZooKeeperTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/ZooKeeperTest.java diff --git a/src/java/test/org/apache/zookeeper/common/TimeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/common/TimeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/common/TimeTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/common/TimeTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ACLCountTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLCountTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ACLCountTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLCountTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ACLRootTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLRootTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ACLRootTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLRootTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ACLTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ACLTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLTest.java diff --git a/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncHammerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncHammerTest.java diff --git a/src/java/test/org/apache/zookeeper/test/AsyncOps.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncOps.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/AsyncOps.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncOps.java diff --git a/src/java/test/org/apache/zookeeper/test/AsyncOpsTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncOpsTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/AsyncOpsTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncOpsTest.java diff --git a/src/java/test/org/apache/zookeeper/test/AsyncTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/AsyncTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncTest.java diff --git a/src/java/test/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java diff --git a/src/java/test/org/apache/zookeeper/test/AuthTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/AuthTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/AuthTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/AuthTest.java diff --git a/src/java/test/org/apache/zookeeper/test/BufferSizeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/BufferSizeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/BufferSizeTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/BufferSizeTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ChrootAsyncTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootAsyncTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ChrootAsyncTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootAsyncTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ChrootClientTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootClientTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ChrootClientTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootClientTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ChrootTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ChrootTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ClientBase.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientBase.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ClientBase.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientBase.java diff --git a/src/java/test/org/apache/zookeeper/test/ClientHammerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientHammerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ClientHammerTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientHammerTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ClientRetry.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientRetry.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ClientRetry.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientRetry.java diff --git a/src/java/test/org/apache/zookeeper/test/ClientTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ClientTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ConnectStringParserTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ConnectStringParserTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java diff --git a/src/java/test/org/apache/zookeeper/test/CreateModeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/CreateModeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/CreateModeTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/CreateModeTest.java diff --git a/src/java/test/org/apache/zookeeper/test/DisconnectableZooKeeper.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/DisconnectableZooKeeper.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/DisconnectableZooKeeper.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/DisconnectableZooKeeper.java diff --git a/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java diff --git a/src/java/test/org/apache/zookeeper/test/EventTypeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/EventTypeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/EventTypeTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/EventTypeTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FLERestartTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLERestartTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FLERestartTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FLERestartTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FLETest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLETest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FLETest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FLETest.java diff --git a/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FollowerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FollowerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FollowerTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FollowerTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FourLetterWordsTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FourLetterWordsTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java diff --git a/src/java/test/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java diff --git a/src/java/test/org/apache/zookeeper/test/GetChildren2Test.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/GetChildren2Test.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java diff --git a/src/java/test/org/apache/zookeeper/test/HierarchicalQuorumTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/HierarchicalQuorumTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java diff --git a/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/IntegrityCheck.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java diff --git a/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/InvalidSnapshotTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/InvalidSnapshotTest.java diff --git a/src/java/test/org/apache/zookeeper/test/JMXEnv.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/JMXEnv.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/JMXEnv.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/JMXEnv.java diff --git a/src/java/test/org/apache/zookeeper/test/KeeperStateTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/KeeperStateTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java diff --git a/src/java/test/org/apache/zookeeper/test/LENonTerminateTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/LENonTerminateTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/LENonTerminateTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/LENonTerminateTest.java diff --git a/src/java/test/org/apache/zookeeper/test/LETest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/LETest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/LETest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/LETest.java diff --git a/src/java/test/org/apache/zookeeper/test/LoadFromLogNoServerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/LoadFromLogNoServerTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java diff --git a/src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/LoadFromLogTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/LoadFromLogTest.java diff --git a/src/java/test/org/apache/zookeeper/test/MaxCnxnsTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/MaxCnxnsTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/MaxCnxnsTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/MaxCnxnsTest.java diff --git a/src/java/test/org/apache/zookeeper/test/MultiTransactionTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/MultiTransactionTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/MultiTransactionTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/MultiTransactionTest.java diff --git a/src/java/test/org/apache/zookeeper/test/NioNettySuiteBase.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteBase.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/NioNettySuiteBase.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteBase.java diff --git a/src/java/test/org/apache/zookeeper/test/NioNettySuiteHammerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteHammerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/NioNettySuiteHammerTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteHammerTest.java diff --git a/src/java/test/org/apache/zookeeper/test/NioNettySuiteTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/NioNettySuiteTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java diff --git a/src/java/test/org/apache/zookeeper/test/NonRecoverableErrorTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/NonRecoverableErrorTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java diff --git a/src/java/test/org/apache/zookeeper/test/NullDataTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/NullDataTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/NullDataTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/NullDataTest.java diff --git a/src/java/test/org/apache/zookeeper/test/OOMTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/OOMTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/OOMTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/OOMTest.java diff --git a/src/java/test/org/apache/zookeeper/test/OSMXBeanTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/OSMXBeanTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/OSMXBeanTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/OSMXBeanTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ObserverLETest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverLETest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ObserverLETest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverLETest.java diff --git a/src/java/test/org/apache/zookeeper/test/ObserverQuorumHammerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverQuorumHammerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ObserverQuorumHammerTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverQuorumHammerTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ObserverTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ObserverTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverTest.java diff --git a/src/java/test/org/apache/zookeeper/test/QuorumBase.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumBase.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/QuorumBase.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumBase.java diff --git a/src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumHammerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumHammerTest.java diff --git a/src/java/test/org/apache/zookeeper/test/QuorumQuotaTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumQuotaTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/QuorumQuotaTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumQuotaTest.java diff --git a/src/java/test/org/apache/zookeeper/test/QuorumTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/QuorumTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumTest.java diff --git a/src/java/test/org/apache/zookeeper/test/QuorumUtil.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumUtil.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/QuorumUtil.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumUtil.java diff --git a/src/java/test/org/apache/zookeeper/test/QuorumZxidSyncTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumZxidSyncTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/QuorumZxidSyncTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumZxidSyncTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java diff --git a/src/java/test/org/apache/zookeeper/test/RecoveryTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/RecoveryTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/RecoveryTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/RecoveryTest.java diff --git a/src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java diff --git a/src/java/test/org/apache/zookeeper/test/RestoreCommittedLogTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/RestoreCommittedLogTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SaslClientTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslClientTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SaslClientTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslClientTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionInvalidationTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionInvalidationTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SessionTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SessionTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SessionTimeoutTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionTimeoutTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SessionTimeoutTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionTimeoutTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SledgeHammer.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SledgeHammer.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SledgeHammer.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SledgeHammer.java diff --git a/src/java/test/org/apache/zookeeper/test/StandaloneTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/StandaloneTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/StandaloneTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/StandaloneTest.java diff --git a/src/java/test/org/apache/zookeeper/test/StatTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/StatTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/StatTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/StatTest.java diff --git a/src/java/test/org/apache/zookeeper/test/StaticHostProviderTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/StaticHostProviderTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java diff --git a/src/java/test/org/apache/zookeeper/test/SyncCallTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/SyncCallTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/SyncCallTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/SyncCallTest.java diff --git a/src/java/test/org/apache/zookeeper/test/TestHammer.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/TestHammer.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/TestHammer.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/TestHammer.java diff --git a/src/java/test/org/apache/zookeeper/test/TestUtils.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/TestUtils.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/TestUtils.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/TestUtils.java diff --git a/src/java/test/org/apache/zookeeper/test/TruncateTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/TruncateTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/TruncateTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/TruncateTest.java diff --git a/src/java/test/org/apache/zookeeper/test/UpgradeTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/UpgradeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/UpgradeTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/UpgradeTest.java diff --git a/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoReset.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoReset.java diff --git a/src/java/test/org/apache/zookeeper/test/WatchedEventTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/WatchedEventTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java diff --git a/src/java/test/org/apache/zookeeper/test/WatcherFuncTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/WatcherFuncTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java diff --git a/src/java/test/org/apache/zookeeper/test/WatcherTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatcherTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/WatcherTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/WatcherTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ZooKeeperQuotaTest.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperQuotaTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ZooKeeperQuotaTest.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperQuotaTest.java diff --git a/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java b/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java similarity index 100% rename from src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java rename to zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java diff --git a/src/java/test/bin/check_compatibility.py b/zookeeper-common/src/test/resources/check_compatibility.py similarity index 100% rename from src/java/test/bin/check_compatibility.py rename to zookeeper-common/src/test/resources/check_compatibility.py diff --git a/src/java/test/checkstyle-noframes-sorted.xsl b/zookeeper-common/src/test/resources/checkstyle-noframes-sorted.xsl similarity index 100% rename from src/java/test/checkstyle-noframes-sorted.xsl rename to zookeeper-common/src/test/resources/checkstyle-noframes-sorted.xsl diff --git a/src/java/test/checkstyle.xml b/zookeeper-common/src/test/resources/checkstyle.xml similarity index 100% rename from src/java/test/checkstyle.xml rename to zookeeper-common/src/test/resources/checkstyle.xml diff --git a/src/java/test/data/buffersize/create/version-2/log.1 b/zookeeper-common/src/test/resources/data/buffersize/create/version-2/log.1 similarity index 100% rename from src/java/test/data/buffersize/create/version-2/log.1 rename to zookeeper-common/src/test/resources/data/buffersize/create/version-2/log.1 diff --git a/src/java/test/data/buffersize/create/version-2/snapshot.0 b/zookeeper-common/src/test/resources/data/buffersize/create/version-2/snapshot.0 similarity index 100% rename from src/java/test/data/buffersize/create/version-2/snapshot.0 rename to zookeeper-common/src/test/resources/data/buffersize/create/version-2/snapshot.0 diff --git a/src/java/test/data/buffersize/set/version-2/log.1 b/zookeeper-common/src/test/resources/data/buffersize/set/version-2/log.1 similarity index 100% rename from src/java/test/data/buffersize/set/version-2/log.1 rename to zookeeper-common/src/test/resources/data/buffersize/set/version-2/log.1 diff --git a/src/java/test/data/buffersize/set/version-2/snapshot.0 b/zookeeper-common/src/test/resources/data/buffersize/set/version-2/snapshot.0 similarity index 100% rename from src/java/test/data/buffersize/set/version-2/snapshot.0 rename to zookeeper-common/src/test/resources/data/buffersize/set/version-2/snapshot.0 diff --git a/src/java/test/data/buffersize/snapshot/version-2/log.1 b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/log.1 similarity index 100% rename from src/java/test/data/buffersize/snapshot/version-2/log.1 rename to zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/log.1 diff --git a/src/java/test/data/buffersize/snapshot/version-2/snapshot.0 b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0 similarity index 100% rename from src/java/test/data/buffersize/snapshot/version-2/snapshot.0 rename to zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0 diff --git a/src/java/test/data/buffersize/snapshot/version-2/snapshot.2 b/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2 similarity index 100% rename from src/java/test/data/buffersize/snapshot/version-2/snapshot.2 rename to zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2 diff --git a/src/java/test/data/invalidsnap/version-2/log.1 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.1 similarity index 100% rename from src/java/test/data/invalidsnap/version-2/log.1 rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.1 diff --git a/src/java/test/data/invalidsnap/version-2/log.274 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.274 similarity index 100% rename from src/java/test/data/invalidsnap/version-2/log.274 rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.274 diff --git a/src/java/test/data/invalidsnap/version-2/log.42 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.42 similarity index 100% rename from src/java/test/data/invalidsnap/version-2/log.42 rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.42 diff --git a/src/java/test/data/invalidsnap/version-2/log.63b b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.63b similarity index 100% rename from src/java/test/data/invalidsnap/version-2/log.63b rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.63b diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.0 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.0 similarity index 100% rename from src/java/test/data/invalidsnap/version-2/snapshot.0 rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.0 diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.272 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.272 similarity index 100% rename from src/java/test/data/invalidsnap/version-2/snapshot.272 rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.272 diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.273 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.273 similarity index 100% rename from src/java/test/data/invalidsnap/version-2/snapshot.273 rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.273 diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.639 b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.639 similarity index 100% rename from src/java/test/data/invalidsnap/version-2/snapshot.639 rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.639 diff --git a/src/java/test/data/invalidsnap/version-2/snapshot.83f b/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.83f similarity index 100% rename from src/java/test/data/invalidsnap/version-2/snapshot.83f rename to zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.83f diff --git a/src/java/test/data/kerberos/minikdc-krb5.conf b/zookeeper-common/src/test/resources/data/kerberos/minikdc-krb5.conf similarity index 100% rename from src/java/test/data/kerberos/minikdc-krb5.conf rename to zookeeper-common/src/test/resources/data/kerberos/minikdc-krb5.conf diff --git a/src/java/test/data/kerberos/minikdc.ldiff b/zookeeper-common/src/test/resources/data/kerberos/minikdc.ldiff similarity index 100% rename from src/java/test/data/kerberos/minikdc.ldiff rename to zookeeper-common/src/test/resources/data/kerberos/minikdc.ldiff diff --git a/src/java/test/data/upgrade/log.100000001 b/zookeeper-common/src/test/resources/data/upgrade/log.100000001 similarity index 100% rename from src/java/test/data/upgrade/log.100000001 rename to zookeeper-common/src/test/resources/data/upgrade/log.100000001 diff --git a/src/java/test/data/upgrade/log.100001bf0 b/zookeeper-common/src/test/resources/data/upgrade/log.100001bf0 similarity index 100% rename from src/java/test/data/upgrade/log.100001bf0 rename to zookeeper-common/src/test/resources/data/upgrade/log.100001bf0 diff --git a/src/java/test/data/upgrade/snapshot.100000000 b/zookeeper-common/src/test/resources/data/upgrade/snapshot.100000000 similarity index 100% rename from src/java/test/data/upgrade/snapshot.100000000 rename to zookeeper-common/src/test/resources/data/upgrade/snapshot.100000000 diff --git a/src/java/test/data/upgrade/snapshot.100001bec b/zookeeper-common/src/test/resources/data/upgrade/snapshot.100001bec similarity index 100% rename from src/java/test/data/upgrade/snapshot.100001bec rename to zookeeper-common/src/test/resources/data/upgrade/snapshot.100001bec diff --git a/src/java/test/config/findbugsExcludeFile.xml b/zookeeper-common/src/test/resources/findbugsExcludeFile.xml similarity index 100% rename from src/java/test/config/findbugsExcludeFile.xml rename to zookeeper-common/src/test/resources/findbugsExcludeFile.xml diff --git a/src/java/test/bin/test-github-pr.sh b/zookeeper-common/src/test/resources/test-github-pr.sh similarity index 100% rename from src/java/test/bin/test-github-pr.sh rename to zookeeper-common/src/test/resources/test-github-pr.sh diff --git a/src/java/test/bin/test-patch.properties b/zookeeper-common/src/test/resources/test-patch.properties similarity index 100% rename from src/java/test/bin/test-patch.properties rename to zookeeper-common/src/test/resources/test-patch.properties diff --git a/src/java/test/bin/test-patch.sh b/zookeeper-common/src/test/resources/test-patch.sh similarity index 100% rename from src/java/test/bin/test-patch.sh rename to zookeeper-common/src/test/resources/test-patch.sh diff --git a/zookeeper-contrib/build-contrib.xml b/zookeeper-contrib/build-contrib.xml index ed54b2297dd..a30abd6f3e9 100644 --- a/zookeeper-contrib/build-contrib.xml +++ b/zookeeper-contrib/build-contrib.xml @@ -30,7 +30,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml index 6f34a9204f6..9d510e400c2 100644 --- a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml @@ -47,7 +47,7 @@ - + diff --git a/zookeeper-contrib/zookeeper-contrib-rest/build.xml b/zookeeper-contrib/zookeeper-contrib-rest/build.xml index 433be3ef7e2..50186edb7c6 100644 --- a/zookeeper-contrib/zookeeper-contrib-rest/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-rest/build.xml @@ -158,7 +158,7 @@ - + @@ -173,7 +173,7 @@ - + diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh b/zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh index bff85f33e7b..62992792087 100755 --- a/zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh +++ b/zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh @@ -62,7 +62,7 @@ do CLASSPATH="$CLASSPATH:$i" done -for i in "${zk_base}"/src/java/lib/*.jar +for i in "${zk_base}"/zookeeper-common/src/main/resource/lib/*.jar do CLASSPATH="$CLASSPATH:$i" done diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh index 51d508f6969..35b348e0367 100755 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh @@ -47,7 +47,7 @@ do CLASSPATH="$CLASSPATH:$i" done -for i in "${zk_base}"/src/java/lib/*.jar +for i in "${zk_base}"/zookeeper-common/src/main/resource/lib/*.jar do CLASSPATH="$CLASSPATH:$i" done diff --git a/zookeeper-it/.empty b/zookeeper-it/.empty deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/java/systest/README.txt b/zookeeper-it/README.txt similarity index 100% rename from src/java/systest/README.txt rename to zookeeper-it/README.txt diff --git a/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/BaseSysTest.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/BaseSysTest.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/DuplicateNameException.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/DuplicateNameException.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/DuplicateNameException.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/DuplicateNameException.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/GenerateLoad.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/GenerateLoad.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/Instance.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/Instance.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/Instance.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/Instance.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/InstanceContainer.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/InstanceContainer.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/InstanceContainer.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/InstanceContainer.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/InstanceManager.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/InstanceManager.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/InstanceManager.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/InstanceManager.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/NoAssignmentException.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/NoAssignmentException.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/NoAssignmentException.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/NoAssignmentException.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/NoAvailableContainers.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/NoAvailableContainers.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/NoAvailableContainers.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/NoAvailableContainers.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/QuorumPeerInstance.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/QuorumPeerInstance.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/SimpleClient.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/SimpleClient.java diff --git a/src/java/systest/org/apache/zookeeper/test/system/SimpleSysTest.java b/zookeeper-it/src/test/java/org/apache/zookeeper/test/system/SimpleSysTest.java similarity index 100% rename from src/java/systest/org/apache/zookeeper/test/system/SimpleSysTest.java rename to zookeeper-it/src/test/java/org/apache/zookeeper/test/system/SimpleSysTest.java diff --git a/zookeeper-recipes/build-recipes.xml b/zookeeper-recipes/build-recipes.xml index f9d9eaeeb5f..651b3d379e4 100644 --- a/zookeeper-recipes/build-recipes.xml +++ b/zookeeper-recipes/build-recipes.xml @@ -72,7 +72,7 @@ - + diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/zkServer.sh b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/zkServer.sh index a22fd30345a..b15238019cf 100755 --- a/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/zkServer.sh +++ b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/zkServer.sh @@ -51,7 +51,7 @@ do CLASSPATH="$CLASSPATH:$i" done -for i in "${base_dir}"/src/java/lib/*.jar +for i in "${base_dir}"/zookeeper-common/src/main/resource/lib/*.jar do CLASSPATH="$CLASSPATH:$i" done diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/zkServer.sh b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/zkServer.sh index a22fd30345a..b15238019cf 100755 --- a/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/zkServer.sh +++ b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/zkServer.sh @@ -51,7 +51,7 @@ do CLASSPATH="$CLASSPATH:$i" done -for i in "${base_dir}"/src/java/lib/*.jar +for i in "${base_dir}"/zookeeper-common/src/main/resource/lib/*.jar do CLASSPATH="$CLASSPATH:$i" done diff --git a/src/java/main/org/apache/zookeeper/JLineZNodeCompletor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/JLineZNodeCompletor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/JLineZNodeCompletor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/JLineZNodeCompletor.java diff --git a/src/java/main/org/apache/zookeeper/jmx/CommonNames.java b/zookeeper-server/src/main/java/org/apache/zookeeper/jmx/CommonNames.java similarity index 100% rename from src/java/main/org/apache/zookeeper/jmx/CommonNames.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/jmx/CommonNames.java diff --git a/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java b/zookeeper-server/src/main/java/org/apache/zookeeper/jmx/MBeanRegistry.java similarity index 100% rename from src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/jmx/MBeanRegistry.java diff --git a/src/java/main/org/apache/zookeeper/jmx/ManagedUtil.java b/zookeeper-server/src/main/java/org/apache/zookeeper/jmx/ManagedUtil.java similarity index 100% rename from src/java/main/org/apache/zookeeper/jmx/ManagedUtil.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/jmx/ManagedUtil.java diff --git a/src/java/main/org/apache/zookeeper/jmx/ZKMBeanInfo.java b/zookeeper-server/src/main/java/org/apache/zookeeper/jmx/ZKMBeanInfo.java similarity index 100% rename from src/java/main/org/apache/zookeeper/jmx/ZKMBeanInfo.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/jmx/ZKMBeanInfo.java diff --git a/src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ByteBufferInputStream.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ByteBufferInputStream.java diff --git a/src/java/main/org/apache/zookeeper/server/ByteBufferOutputStream.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ByteBufferOutputStream.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ByteBufferOutputStream.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ByteBufferOutputStream.java diff --git a/src/java/main/org/apache/zookeeper/server/ConnectionBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ConnectionBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ConnectionBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ConnectionBean.java diff --git a/src/java/main/org/apache/zookeeper/server/ConnectionMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ConnectionMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ConnectionMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ConnectionMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/DataNode.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/DataNode.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/DataNode.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/DataNode.java diff --git a/src/java/main/org/apache/zookeeper/server/DataTree.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/DataTree.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/DataTree.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/DataTree.java diff --git a/src/java/main/org/apache/zookeeper/server/DataTreeBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/DataTreeBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/DataTreeBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/DataTreeBean.java diff --git a/src/java/main/org/apache/zookeeper/server/DataTreeMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/DataTreeMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/DataTreeMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/DataTreeMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/DatadirCleanupManager.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/DatadirCleanupManager.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/DatadirCleanupManager.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/DatadirCleanupManager.java diff --git a/src/java/main/org/apache/zookeeper/server/ExitCode.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ExitCode.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ExitCode.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ExitCode.java diff --git a/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/FinalRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/FinalRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/LogFormatter.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/LogFormatter.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/LogFormatter.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/LogFormatter.java diff --git a/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/NIOServerCnxn.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/NIOServerCnxn.java diff --git a/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/NIOServerCnxnFactory.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/NIOServerCnxnFactory.java diff --git a/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/NettyServerCnxn.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/NettyServerCnxn.java diff --git a/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/NettyServerCnxnFactory.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/NettyServerCnxnFactory.java diff --git a/src/java/main/org/apache/zookeeper/server/ObserverBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ObserverBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ObserverBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ObserverBean.java diff --git a/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/PrepRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/PurgeTxnLog.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/PurgeTxnLog.java diff --git a/src/java/main/org/apache/zookeeper/server/ReferenceCountedACLCache.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ReferenceCountedACLCache.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ReferenceCountedACLCache.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ReferenceCountedACLCache.java diff --git a/src/java/main/org/apache/zookeeper/server/Request.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/Request.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/Request.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/Request.java diff --git a/src/java/main/org/apache/zookeeper/server/RequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/RequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/ServerCnxn.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerCnxn.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ServerCnxn.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerCnxn.java diff --git a/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerCnxnFactory.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerCnxnFactory.java diff --git a/src/java/main/org/apache/zookeeper/server/ServerConfig.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerConfig.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ServerConfig.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerConfig.java diff --git a/src/java/main/org/apache/zookeeper/server/ServerStats.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerStats.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ServerStats.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerStats.java diff --git a/src/java/main/org/apache/zookeeper/server/SessionTracker.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/SessionTracker.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/SessionTracker.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/SessionTracker.java diff --git a/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/SessionTrackerImpl.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/SessionTrackerImpl.java diff --git a/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/SnapshotFormatter.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/SnapshotFormatter.java diff --git a/src/java/main/org/apache/zookeeper/server/Stats.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/Stats.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/Stats.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/Stats.java diff --git a/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/SyncRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/SyncRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/TraceFormatter.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/TraceFormatter.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/TraceFormatter.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/TraceFormatter.java diff --git a/src/java/main/org/apache/zookeeper/server/UnimplementedRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/UnimplementedRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/UnimplementedRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/UnimplementedRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/WatchManager.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/WatchManager.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/WatchManager.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/WatchManager.java diff --git a/src/java/main/org/apache/zookeeper/server/ZKDatabase.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZKDatabase.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZKDatabase.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZKDatabase.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperCriticalThread.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperCriticalThread.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperCriticalThread.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperCriticalThread.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperSaslServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperSaslServer.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServer.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerListener.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerListener.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperServerListener.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerListener.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerListenerImpl.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerListenerImpl.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperServerListenerImpl.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerListenerImpl.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperServerMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerMain.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerMain.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerShutdownHandler.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerShutdownHandler.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperServerShutdownHandler.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerShutdownHandler.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooKeeperThread.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperThread.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooKeeperThread.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperThread.java diff --git a/src/java/main/org/apache/zookeeper/server/ZooTrace.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooTrace.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/ZooTrace.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooTrace.java diff --git a/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/AuthenticationProvider.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/AuthenticationProvider.java diff --git a/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java diff --git a/src/java/main/org/apache/zookeeper/server/auth/DigestLoginModule.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestLoginModule.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/auth/DigestLoginModule.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/DigestLoginModule.java diff --git a/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java diff --git a/src/java/main/org/apache/zookeeper/server/auth/KerberosName.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/KerberosName.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/auth/KerberosName.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/KerberosName.java diff --git a/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/ProviderRegistry.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/ProviderRegistry.java diff --git a/src/java/main/org/apache/zookeeper/server/auth/SASLAuthenticationProvider.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/SASLAuthenticationProvider.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/auth/SASLAuthenticationProvider.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/SASLAuthenticationProvider.java diff --git a/src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java diff --git a/src/java/main/org/apache/zookeeper/server/package.html b/zookeeper-server/src/main/java/org/apache/zookeeper/server/package.html similarity index 100% rename from src/java/main/org/apache/zookeeper/server/package.html rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/package.html diff --git a/src/java/main/org/apache/zookeeper/server/persistence/FilePadding.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FilePadding.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/FilePadding.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FilePadding.java diff --git a/src/java/main/org/apache/zookeeper/server/persistence/FileSnap.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileSnap.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/FileSnap.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileSnap.java diff --git a/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileTxnLog.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileTxnLog.java diff --git a/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java diff --git a/src/java/main/org/apache/zookeeper/server/persistence/SnapShot.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/SnapShot.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/SnapShot.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/SnapShot.java diff --git a/src/java/main/org/apache/zookeeper/server/persistence/TxnLog.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLog.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/TxnLog.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLog.java diff --git a/src/java/main/org/apache/zookeeper/server/persistence/TxnLogToolkit.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLogToolkit.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/TxnLogToolkit.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLogToolkit.java diff --git a/src/java/main/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParser.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParser.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParser.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParser.java diff --git a/src/java/main/org/apache/zookeeper/server/persistence/Util.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/Util.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/persistence/Util.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/Util.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/CommitProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/CommitProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Election.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Election.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/Election.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Election.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Follower.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/Follower.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/FollowerBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FollowerBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/FollowerBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FollowerBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/FollowerMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FollowerMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/FollowerMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FollowerMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/Leader.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Leader.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LeaderBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LeaderBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderElection.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderElection.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LeaderElectionBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderElectionBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LeaderElectionBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderElectionBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LeaderElectionMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderElectionMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LeaderElectionMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderElectionMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LeaderMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LeaderMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Learner.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/Learner.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Learner.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerHandler.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerHandler.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LearnerSessionTracker.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerSessionTracker.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LearnerSessionTracker.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerSessionTracker.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LearnerSyncRequest.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerSyncRequest.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LearnerSyncRequest.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerSyncRequest.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LocalPeerBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LocalPeerBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LocalPeerMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/LocalPeerMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/LocalPeerMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Observer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/Observer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ObserverMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ObserverMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ObserverMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ObserverMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ProposalStats.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ProposalStats.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ProposalStats.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ProposalStats.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/QuorumBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/QuorumMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumStats.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumStats.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/QuorumStats.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumStats.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/QuorumZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumZooKeeperServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/QuorumZooKeeperServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumZooKeeperServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/RemotePeerBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/RemotePeerBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/RemotePeerMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/RemotePeerMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/RemotePeerMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ServerBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ServerBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ServerBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ServerBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/ServerMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ServerMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/ServerMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ServerMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/StateSummary.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/StateSummary.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/StateSummary.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/StateSummary.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Vote.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Vote.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/Vote.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Vote.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthLearner.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/NullQuorumAuthServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/QuorumAuth.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthLearner.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthLearner.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumAuthServer.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/auth/SaslQuorumServerCallbackHandler.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java diff --git a/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java diff --git a/src/java/main/org/apache/zookeeper/server/upgrade/DataNodeV1.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/DataNodeV1.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/upgrade/DataNodeV1.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/DataNodeV1.java diff --git a/src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/DataTreeV1.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/DataTreeV1.java diff --git a/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeMain.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/UpgradeMain.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/upgrade/UpgradeMain.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/UpgradeMain.java diff --git a/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java diff --git a/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java diff --git a/src/java/main/org/apache/zookeeper/server/util/KerberosUtil.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/KerberosUtil.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/util/KerberosUtil.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/util/KerberosUtil.java diff --git a/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/OSMXBean.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/util/OSMXBean.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/util/OSMXBean.java diff --git a/src/java/main/org/apache/zookeeper/server/util/Profiler.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/Profiler.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/util/Profiler.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/util/Profiler.java diff --git a/src/java/main/org/apache/zookeeper/server/util/SerializeUtils.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/SerializeUtils.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/util/SerializeUtils.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/util/SerializeUtils.java diff --git a/src/java/main/org/apache/zookeeper/server/util/ZxidUtils.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/util/ZxidUtils.java similarity index 100% rename from src/java/main/org/apache/zookeeper/server/util/ZxidUtils.java rename to zookeeper-server/src/main/java/org/apache/zookeeper/server/util/ZxidUtils.java diff --git a/src/LICENSE.txt b/zookeeper-server/src/main/resources/LICENSE.txt similarity index 99% rename from src/LICENSE.txt rename to zookeeper-server/src/main/resources/LICENSE.txt index 867ac6d84cf..f042b5cac7d 100644 --- a/src/LICENSE.txt +++ b/zookeeper-server/src/main/resources/LICENSE.txt @@ -204,7 +204,7 @@ This distribution bundles jline 0.9.94, which is available under the 2-clause BSD License. For details, see a copy of the license in -lib/jline-0.9.94.LICENSE.txt +zookeeper-server/src/main/resources/jline-0.9.94.LICENSE.txt This distribution bundles SLF4J 1.6.1, which is available under the MIT License. For details, see a copy of the license in diff --git a/src/NOTICE.txt b/zookeeper-server/src/main/resources/NOTICE.txt similarity index 100% rename from src/NOTICE.txt rename to zookeeper-server/src/main/resources/NOTICE.txt diff --git a/src/java/lib/jline-0.9.94.LICENSE.txt b/zookeeper-server/src/main/resources/jline-0.9.94.LICENSE.txt similarity index 100% rename from src/java/lib/jline-0.9.94.LICENSE.txt rename to zookeeper-server/src/main/resources/jline-0.9.94.LICENSE.txt diff --git a/src/lastRevision.bat b/zookeeper-server/src/main/resources/lastRevision.bat similarity index 100% rename from src/lastRevision.bat rename to zookeeper-server/src/main/resources/lastRevision.bat diff --git a/src/lastRevision.sh b/zookeeper-server/src/main/resources/lastRevision.sh similarity index 100% rename from src/lastRevision.sh rename to zookeeper-server/src/main/resources/lastRevision.sh diff --git a/src/java/main/overview.html b/zookeeper-server/src/main/resources/overview.html similarity index 100% rename from src/java/main/overview.html rename to zookeeper-server/src/main/resources/overview.html diff --git a/src/pom.template b/zookeeper-server/src/main/resources/pom.template similarity index 100% rename from src/pom.template rename to zookeeper-server/src/main/resources/pom.template diff --git a/src/java/test/org/apache/zookeeper/server/CRCTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/CRCTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/CRCTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/CRCTest.java diff --git a/src/java/test/org/apache/zookeeper/server/DataNodeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataNodeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/DataNodeTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/DataNodeTest.java diff --git a/src/java/test/org/apache/zookeeper/server/DataTreeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/DataTreeTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeTest.java diff --git a/src/java/test/org/apache/zookeeper/server/DataTreeUnitTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeUnitTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/DataTreeUnitTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/DataTreeUnitTest.java diff --git a/src/java/test/org/apache/zookeeper/server/DatadirCleanupManagerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DatadirCleanupManagerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/DatadirCleanupManagerTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/DatadirCleanupManagerTest.java diff --git a/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/DeserializationPerfTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/DeserializationPerfTest.java diff --git a/src/java/test/org/apache/zookeeper/server/InvalidSnapCountTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/InvalidSnapCountTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/InvalidSnapCountTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/InvalidSnapCountTest.java diff --git a/src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/InvalidSnapshotTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/InvalidSnapshotTest.java diff --git a/src/java/test/org/apache/zookeeper/server/MockNIOServerCnxn.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/MockNIOServerCnxn.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/MockNIOServerCnxn.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/MockNIOServerCnxn.java diff --git a/src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/NIOServerCnxnTest.java diff --git a/src/java/test/org/apache/zookeeper/server/NettyServerCnxnTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/NettyServerCnxnTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/NettyServerCnxnTest.java diff --git a/src/java/test/org/apache/zookeeper/server/PrepRequestProcessorTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/PrepRequestProcessorTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/PrepRequestProcessorTest.java diff --git a/src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/PurgeTxnTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/PurgeTxnTest.java diff --git a/src/java/test/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java diff --git a/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/SerializationPerfTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/SerializationPerfTest.java diff --git a/src/java/test/org/apache/zookeeper/server/ServerCnxnFactoryAccessor.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ServerCnxnFactoryAccessor.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ServerCnxnFactoryAccessor.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ServerCnxnFactoryAccessor.java diff --git a/src/java/test/org/apache/zookeeper/server/ServerStatsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ServerStatsTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ServerStatsTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ServerStatsTest.java diff --git a/src/java/test/org/apache/zookeeper/server/SessionTrackerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/SessionTrackerTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/SessionTrackerTest.java diff --git a/src/java/test/org/apache/zookeeper/server/ToStringTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ToStringTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ToStringTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ToStringTest.java diff --git a/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerMainTest.java diff --git a/src/java/test/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java diff --git a/src/java/test/org/apache/zookeeper/server/ZooKeeperServerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ZooKeeperServerTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperServerTest.java diff --git a/src/java/test/org/apache/zookeeper/server/ZooKeeperThreadTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ZooKeeperThreadTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ZooKeeperThreadTest.java diff --git a/src/java/test/org/apache/zookeeper/server/ZxidRolloverTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZxidRolloverTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/ZxidRolloverTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/ZxidRolloverTest.java diff --git a/src/java/test/org/apache/zookeeper/server/persistence/FileTxnLogTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/FileTxnLogTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/persistence/FileTxnLogTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/FileTxnLogTest.java diff --git a/src/java/test/org/apache/zookeeper/server/persistence/FileTxnSnapLogTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/FileTxnSnapLogTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/persistence/FileTxnSnapLogTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/FileTxnSnapLogTest.java diff --git a/src/java/test/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParserTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParserTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParserTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParserTest.java diff --git a/src/java/test/org/apache/zookeeper/server/persistence/TxnLogToolkitTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/TxnLogToolkitTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/persistence/TxnLogToolkitTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/persistence/TxnLogToolkitTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/CnxManagerTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEDontCareTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLEDontCareTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLELostMessageTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLELostMessageTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/FLETestUtils.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLETestUtils.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/FLETestUtils.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/FLETestUtils.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/LeaderBeanTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/LeaderBeanTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderBeanTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/ProposalStatsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ProposalStatsTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/ProposalStatsTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ProposalStatsTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/WatchLeakTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/WatchLeakTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/Zab1_0Test.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/Zab1_0Test.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/ZabUtils.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ZabUtils.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/ZabUtils.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/ZabUtils.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSKerberosSecurityTestcase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSKerberosSecurityTestcase.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSKerberosSecurityTestcase.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSKerberosSecurityTestcase.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdc.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdc.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdc.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdc.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdcTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdcTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdcTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSMiniKdcTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosAuthTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosAuthTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosAuthTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosHostBasedAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosHostBasedAuthTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosHostBasedAuthTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/ApacheDSQuorumKerberosHostBasedAuthTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/KerberosSecurityTestcase.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/KerberosTestUtils.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdc.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdc.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdc.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdc.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/MiniKdcTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthTestBase.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumAuthUpgradeTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumDigestAuthTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosAuthTest.java diff --git a/src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/auth/QuorumKerberosHostBasedAuthTest.java diff --git a/src/java/test/org/apache/zookeeper/server/util/PortForwarder.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/PortForwarder.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/util/PortForwarder.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/util/PortForwarder.java diff --git a/src/java/test/org/apache/zookeeper/server/util/SerializeUtilsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/SerializeUtilsTest.java similarity index 100% rename from src/java/test/org/apache/zookeeper/server/util/SerializeUtilsTest.java rename to zookeeper-server/src/test/java/org/apache/zookeeper/server/util/SerializeUtilsTest.java