ZOOKEEPER-3032: MAVEN MIGRATION - branch-3.4 - zookeeper-server

Author: Norbert Kalmar <nkalmar@yahoo.com>

Reviewers: andor@apache.org

Closes #675 from nkalmar/ZOOKEEPER-3032r-3.4

191 files changed, 34 insertions, 109 deletions

diff --git a/.gitignore b/.gitignore
index 354445685..ab547635c 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/
-zookeeper-common/src/main/resources/lib/ant-eclipse-*
-zookeeper-common/src/main/resources/lib/ivy-*
+zookeeper-server/src/main/resources/lib/ant-eclipse-*
+zookeeper-server/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 4e6fb9794..5c860ced5 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"/../zookeeper-common/src/main/resources/lib/*.jar
+for i in "$ZOOBINDIR"/../zookeeper-server/src/main/resources/lib/*.jar
 do
     CLASSPATH="$i:$CLASSPATH"
 done
diff --git a/build.xml b/build.xml
index 6a1ef2b85..01a2a9ff5 100644
--- a/build.xml
+++ b/build.xml
@@ -86,12 +86,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <property name="src.dir" value="${basedir}/src" />
     <property name="java.server.src.dir" value="${basedir}/zookeeper-server/src/main/java" />
     <property name="java.server.resources.dir" value="${basedir}/zookeeper-server/src/main/resources" />
-    <property name="java.common.src.dir" value="${basedir}/zookeeper-common/src/main/java" />
-    <property name="java.common.resources.dir" value="${basedir}/zookeeper-common/src/main/resources" />
-    <property name="java.client.src.dir" value="${basedir}/zookeeper-client/zookeeper-client-java/src/main/java" />
     <property name="jute.src.dir" value="${basedir}/zookeeper-jute/src/main/java" />
 
-    <property name="lib.dir" value="${java.common.resources.dir}/lib" />
+    <property name="lib.dir" value="${java.server.resources.dir}/lib" />
     <property name="lib.dir.includes" value="**/*.jar" />
     <property name="lib.dir.excludes" value="**/excluded/" />
 
@@ -118,8 +115,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <property name="test.java.build.dir" value="${build.dir}/test"/>
     <property name="test.java.classes" value="${test.java.build.dir}/classes"/>
     <property name="java.server.test.dir" value="${basedir}/zookeeper-server/src/test/java"/>
-    <property name="java.common.test.dir" value="${basedir}/zookeeper-common/src/test/java"/>
-    <property name="common.test.resource.dir" value="${basedir}/zookeeper-common/src/test/resources"/>
+    <property name="server.test.resource.dir" value="${basedir}/zookeeper-server/src/test/resources"/>
     <property name="jute.test.src.dir" value="${basedir}/zookeeper-jute/src/test/java" />
     <property name="systest.src.dir" value="${basedir}/zookeeper-it/src/test/java"/>
     <property name="test.log.dir" value="${test.java.build.dir}/logs" />
@@ -146,12 +142,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
               value="http://docs.oracle.com/javase/6/docs/api/" />
     <property name="javadoc.packages" value="org.apache.*" />
 
-    <path id="java.src.dir">
-      <pathelement path="${java.server.src.dir}"/>
-      <pathelement path="${java.common.src.dir}"/>
-      <pathelement path="${java.client.src.dir}"/>
-    </path>
-
     <property name="dist.dir" value="${build.dir}/${final.name}"/>
     <property name="dist.maven.dir" value="${dist.dir}/dist-maven"/>
 
@@ -201,8 +191,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <property name="grep.cmd" value="grep"/>
     <property name="patch.cmd" value="patch"/>
     <property name="make.cmd" value="make"/>
-    <property name="test_patch_sh" value="${common.test.resource.dir}/test-patch.sh"/>
-    <property name="test_pullrequest_sh" value="${common.test.resource.dir}/test-github-pr.sh"/>
+    <property name="test_patch_sh" value="${server.test.resource.dir}/test-patch.sh"/>
+    <property name="test_pullrequest_sh" value="${server.test.resource.dir}/test-github-pr.sh"/>
 
 	<!-- jdiff.home property set -->
     <property name="jdiff.home" value="${ivy.jdiff.lib}"/>
@@ -365,7 +355,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
             target="${javac.target}" source="${javac.source}"
             includes="org/apache/zookeeper/version/util/**" debug="on">
             <src path="${java.server.src.dir}" />
-            <src path="${java.common.src.dir}" />
         </javac>
     </target>
     
@@ -474,8 +463,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         <javac destdir="${build.classes}" includeantruntime="false"
                target="${javac.target}" source="${javac.source}" debug="on">
             <src path="${java.server.src.dir}"/>
-            <src path="${java.common.src.dir}"/>
-            <src path="${java.client.src.dir}"/>
             <src path="${jute.src.dir}"/>
             <classpath refid="java.classpath"/>
             <compilerarg value="-Xlint:all"/>
@@ -488,7 +475,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
       <javac destdir="${test.java.classes}" includeantruntime="false"
              target="${javac.target}" source="${javac.source}" debug="on">
           <src path="${java.server.test.dir}"/>
-          <src path="${java.common.test.dir}"/>
         <src path="${jute.test.src.dir}"/>
         <classpath refid="test.java.classpath"/>
       </javac>
@@ -565,12 +551,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
           <include name="org/apache/**"/>
           <exclude name="org/apache/jute/**"/>
     	</packageset>
-        <packageset dir="${java.common.src.dir}">
-          <include name="org/apache/**"/>
-        </packageset>
-        <packageset dir="${java.client.src.dir}">
-          <include name="org/apache/**"/>
-        </packageset>
     	<packageset dir="${src_generated.dir}"/>
         <link href="${javadoc.link.java}"/>
         <classpath refid="java.classpath"/>
@@ -606,14 +586,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
           <include name="org/apache/**"/>
           <exclude name="org/apache/zookeeper/server/**"/>
     	</packageset>
-        <packageset dir="${java.common.src.dir}">
-          <include name="org/apache/**"/>
-          <exclude name="org/apache/zookeeper/server/**"/>
-        </packageset>
-        <packageset dir="${java.client.src.dir}">
-          <include name="org/apache/**"/>
-          <exclude name="org/apache/zookeeper/server/**"/>
-        </packageset>
         <packageset dir="${jute.src.dir}">
           <include name="org/apache/**"/>
         </packageset>
@@ -651,8 +623,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
             <fileset file="LICENSE.txt" />
             <fileset dir="${build.classes}" excludes="**/.generated"/>
             <fileset dir="${java.server.src.dir}"/>
-            <fileset dir="${java.common.src.dir}"/>
-            <fileset dir="${java.client.src.dir}"/>
             <fileset dir="${jute.src.dir}"/>
             <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
             <manifest>
@@ -728,8 +698,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         <jar jarfile="${build.dir}/${final.name}-sources.jar">
             <fileset file="LICENSE.txt" />
             <fileset dir="${java.server.src.dir}"/>
-            <fileset dir="${java.common.src.dir}"/>
-            <fileset dir="${java.client.src.dir}"/>
             <fileset dir="${jute.src.dir}"/>
             <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
             <manifest>
@@ -883,7 +851,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
           <include name="zookeeper-contrib/**"/>
           <include name="zookeeper-client/**"/>
           <include name="zookeeper-jute/**"/>
-          <include name="zookeeper-common/**"/>
           <include name="zookeeper-server/**"/>
         </fileset>
         <fileset file="${java.server.resources.dir}/pom.template"/>
@@ -1378,18 +1345,18 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         <mkdir dir="${test.data.upgrade.dir}" />
         <mkdir dir="${test.data.invalid.dir}" />
         <copy todir="${test.data.upgrade.dir}">
-            <fileset dir="${common.test.resource.dir}/data/upgrade"/>
+            <fileset dir="${server.test.resource.dir}/data/upgrade"/>
         </copy>
         <copy todir="${test.data.invalid.dir}">
-            <fileset dir="${common.test.resource.dir}/data/invalidsnap"/>
+            <fileset dir="${server.test.resource.dir}/data/invalidsnap"/>
         </copy>
         <mkdir dir="${test.data.buffersize.dir}" />
         <copy todir="${test.data.buffersize.dir}">
-            <fileset dir="${common.test.resource.dir}/data/buffersize"/>
+            <fileset dir="${server.test.resource.dir}/data/buffersize"/>
         </copy>
         <mkdir dir="${test.data.kerberos.dir}" />
         <copy todir="${test.data.kerberos.dir}">
-            <fileset dir="${common.test.resource.dir}/data/kerberos"/>
+            <fileset dir="${server.test.resource.dir}/data/kerberos"/>
         </copy>
     </target>
 
@@ -1439,10 +1406,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
               <include name="**/*${test.category}Test.java"/>
               <exclude name="**/*HammerTest.java"/>
             </fileset>
-            <fileset dir="${java.common.test.dir}">
-              <include name="**/*${test.category}Test.java"/>
-              <exclude name="**/*HammerTest.java"/>
-            </fileset>
             <fileset dir="${jute.test.src.dir}">
               <include name="**/*${test.category}Test.java" />
             </fileset>
@@ -1451,16 +1414,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
             <fileset dir="${java.server.test.dir}">
               <include name="**/*${test.category}Test.java"/>
             </fileset>
-            <fileset dir="${java.common.test.dir}">
-              <include name="**/*${test.category}Test.java"/>
-            </fileset>
             <fileset dir="${jute.test.src.dir}">
               <include name="**/*${test.category}Test.java" />
             </fileset>
           </batchtest>
           <batchtest todir="${test.log.dir}" if="testcase">
             <fileset dir="${java.server.test.dir}" includes="**/${testcase}.java"/>
-            <fileset dir="${java.common.test.dir}" includes="**/${testcase}.java"/>
             <fileset dir="${jute.test.src.dir}" includes="**/${testcase}.java"/>
           </batchtest>
         </junit>
@@ -1631,24 +1590,11 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
                  includes="org/apache/zookeeper/**/*"
                  excludes="org/apache/zookeeper/version/**/*">
         </fileset>
-        <fileset dir="${java.common.src.dir}"
-               includes="org/apache/zookeeper/**/*"
-               excludes="org/apache/zookeeper/version/**/*">
-        </fileset>
-        <fileset dir="${java.client.src.dir}"
-               includes="org/apache/zookeeper/**/*"
-               excludes="org/apache/zookeeper/version/**/*">
-        </fileset>
         <testsources dir="${java.server.test.dir}">
           <testclass package="org.apache.zookeeper.*" name=".*Test">
               <testmethod annotation="Test"/>
           </testclass>
         </testsources>
-        <testsources dir="${java.common.test.dir}">
-          <testclass package="org.apache.zookeeper.*" name=".*Test">
-              <testmethod annotation="Test"/>
-          </testclass>
-        </testsources>
       </clover-setup>
     </target>
 
@@ -1695,7 +1641,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <property name="findbugs.home" value="" />
     <target name="findbugs" depends="check-for-findbugs, jar" if="findbugs.present">
         <property name="findbugs.out.dir" value="${test.java.build.dir}/findbugs" />
-        <property name="findbugs.exclude.file" value="${common.test.resource.dir}/findbugsExcludeFile.xml" />
+        <property name="findbugs.exclude.file" value="${server.test.resource.dir}/findbugsExcludeFile.xml" />
         <property name="findbugs.report.htmlfile" value="${findbugs.out.dir}/zookeeper-findbugs-report.html" />
         <property name="findbugs.report.xmlfile" value="${findbugs.out.dir}/zookeeper-findbugs-report.xml" />
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" 
@@ -1709,8 +1655,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
                 </fileset>
             </auxClasspath>
             <sourcePath path="${java.server.src.dir}" />
-            <sourcePath path="${java.common.src.dir}" />
-            <sourcePath path="${java.client.src.dir}" />
             <class location="${build.dir}/${final.name}.jar" />
         </findbugs>
         <xslt style="${findbugs.home}/src/xsl/default.xsl" in="${findbugs.report.xmlfile}" 
@@ -1776,13 +1720,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
             <formatter type="${test.junit.output.format}" />
             <batchtest todir="${test.log.dir}" unless="testcase">
-                <fileset dir="${java.common.test.dir}"
-                         includes="**/*Test.java"/>
                 <fileset dir="${java.server.test.dir}"
                          includes="**/*Test.java"/>
             </batchtest>
             <batchtest todir="${test.log.dir}" if="testcase">
-                <fileset dir="${java.common.test.dir}" includes="**/${testcase}.java"/>
                 <fileset dir="${java.server.test.dir}" includes="**/${testcase}.java"/>
             </batchtest>
         </junit>
@@ -1811,13 +1752,11 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         </classpath>
       </taskdef>
       <mkdir dir="${test.java.build.dir}"/>
-      <cs:checkstyle config="${common.test.resource.dir}/checkstyle.xml" failOnViolation="false">
-        <fileset dir="${basedir}/zookeeper-common" includes="**/*.java" excludes="**/generated/**"/>
-        <fileset dir="${basedir}/zookeeper-client" includes="**/*.java" excludes="**/generated/**"/>
+      <cs:checkstyle config="${server.test.resource.dir}/checkstyle.xml" failOnViolation="false">
         <fileset dir="${basedir}/zookeeper-server" includes="**/*.java" excludes="**/generated/**"/>
         <formatter type="xml" toFile="${test.java.build.dir}/checkstyle-errors.xml"/>
       </cs:checkstyle>
-      <xslt style="${common.test.resource.dir}/checkstyle-noframes-sorted.xsl" in="${test.java.build.dir}/checkstyle-errors.xml"
+      <xslt style="${server.test.resource.dir}/checkstyle-noframes-sorted.xsl" in="${test.java.build.dir}/checkstyle-errors.xml"
             out="${test.java.build.dir}/checkstyle-errors.html"/>
     </target>
 
@@ -1906,9 +1845,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
           <exclude name="src/zookeeper-client/zookeeper-client-c/config**"/>
           <exclude name="src/zookeeper-client/zookeeper-client-c/src/hashtable/"/>
           <exclude name="src/zookeeper-jute/target/main/java/.generated/"/>
-          <exclude name="src/zookeeper-common/src/test/resources/checkstyle*.xml"/>
-          <exclude name="src/zookeeper-common/src/test/resources/checkstyle*.xsl"/>
-          <exclude name="src/zookeeper-common/src/test/resources/findbugs*.xml"/>
+          <exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xml"/>
+          <exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xsl"/>
+          <exclude name="src/zookeeper-server/src/test/resources/findbugs*.xml"/>
           <exclude name="src/**/*.vcproj"/>
           <exclude name="src/**/*.sln"/>
         </fileset>
@@ -1997,12 +1936,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
            <include name="org/apache/zookeeper"/>
            <exclude name="org/apache/jute"/>
          </packageset>
-         <packageset dir="${java.common.src.dir}">
-           <include name="org/apache/zookeeper"/>
-         </packageset>
-         <packageset dir="${java.client.src.dir}">
-           <include name="org/apache/zookeeper"/>
-         </packageset>
          <classpath>
            <pathelement location="${build.classes}"/>
            <fileset dir="${lib.dir}">
@@ -2028,8 +1961,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
                 excludepackagenames="org.apache.jute"	
                 sourceFiles="${jdiff.home}/Null.java">
          <fileset dir="${java.server.src.dir}"/>
-         <fileset dir="${java.common.src.dir}"/>
-         <fileset dir="${java.client.src.dir}"/>
          <doclet name="jdiff.JDiff"
                  path="${ivy.jdiff.lib}/jdiff-1.0.9.jar:${ivy.jdiff.lib}/xerces-1.4.4.jar">
            <param name="-oldapi" value="${name} ${jdiff.stable}"/>
@@ -2059,19 +1990,19 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
      <target name="ant-eclipse-download" unless="ant-eclipse.jar.exists">
        <get src="https://downloads.sourceforge.net/project/ant-eclipse/ant-eclipse/1.0/ant-eclipse-1.0.bin.tar.bz2"
-            dest="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
+            dest="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
 
-       <bunzip2 src="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2"/>
+       <bunzip2 src="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar.bz2"/>
 
-       <untar src="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar"
-              dest="${java.common.resources.dir}">
+       <untar src="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar"
+              dest="${java.server.resources.dir}">
          <patternset>
            <include name="lib/ant-eclipse-1.0-jvm1.2.jar"/>
          </patternset>
        </untar>
 
-       <delete file="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar" />
-       <delete file="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" />
+       <delete file="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar" />
+       <delete file="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" />
      </target>
 
      <target name="eclipse"
@@ -2092,16 +2023,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
          <classpath>
            <source path="${java.server.src.dir}"
                    output="${build.dir.eclipse-main-classes}" />
-           <source path="${java.common.src.dir}"
-                   output="${build.dir.eclipse-main-classes}" />
-           <source path="${java.client.src.dir}"
-                   output="${build.dir.eclipse-main-classes}" />
            <source path="${jute.src.dir}"
                    output="${build.dir.eclipse-main-classes}" />
            <source path="${src_generated.dir}"
                    output="${build.dir.eclipse-main-classes}" />
-           <source path="${java.common.test.dir}"
-                   output="${build.dir.eclipse-test-classes}" />
            <source path="${java.server.test.dir}"
                    output="${build.dir.eclipse-test-classes}" />
            <source path="${systest.src.dir}"
diff --git a/zookeeper-client/zookeeper-client-c/tests/zkServer.sh b/zookeeper-client/zookeeper-client-c/tests/zkServer.sh
index 9c8473854..f06e33854 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}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${zk_base}"/zookeeper-server/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done
diff --git a/zookeeper-contrib/build-contrib.xml b/zookeeper-contrib/build-contrib.xml
index a30abd6f3..7f08a8a4a 100644
--- a/zookeeper-contrib/build-contrib.xml
+++ b/zookeeper-contrib/build-contrib.xml
@@ -30,7 +30,7 @@
   <property name="src.dir"  location="${root}/src/main/java"/>
   <property name="src.test" location="${root}/src/test"/>
 
-  <property name="lib.dir"  location="${zk.root}/zookeeper-common/src/main/resources/lib"/>
+  <property name="lib.dir"  location="${zk.root}/zookeeper-server/src/main/resources/lib"/>
 
   <property name="build.dir" location="${zk.root}/build/contrib/${name}"/>
   <property name="build.classes" location="${build.dir}/classes"/>
@@ -83,7 +83,7 @@
     <fileset dir="${ivy.test.lib}">
       <include name="**/*.jar" />
     </fileset>
-    <fileset dir="${zk.root}/zookeeper-common/src/main/resources/lib">
+    <fileset dir="${zk.root}/zookeeper-server/src/main/resources/lib">
       <include name="**/*.jar" />
     </fileset>
     <fileset dir="${ant.home}/lib">
diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml
index 9d510e400..279cb22d1 100644
--- a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml
@@ -47,7 +47,7 @@
       <fileset dir="${zk.root}/build/test/classes"/>
       <zipgroupfileset dir="${zk.root}/build/lib" includes="*.jar" />
       <zipgroupfileset dir="${zk.root}/build/test/lib" includes="*.jar" />
-      <zipgroupfileset dir="${zk.root}/zookeeper-common/src/main/resources/lib" includes="*.jar" />
+      <zipgroupfileset dir="${zk.root}/zookeeper-server/src/main/resources/lib" includes="*.jar" />
     </jar>
   </target>
 
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/build.xml b/zookeeper-contrib/zookeeper-contrib-rest/build.xml
index 50186edb7..6895ad1fd 100644
--- a/zookeeper-contrib/zookeeper-contrib-rest/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/build.xml
@@ -158,7 +158,7 @@
         <fileset dir="${build.dir}/lib" includes="*.jar"/>
         <fileset dir="${zk.root}/build" includes="zookeeper-*.jar"/>
         <pathelement path="${zk.root}/src/contrib/${name}/conf" />
-        <fileset dir="${zk.root}/zookeeper-common/src/main/resources/lib">
+        <fileset dir="${zk.root}/zookeeper-server/src/main/resources/lib">
           <include name="**/*.jar" />
         </fileset>
       </classpath>
@@ -173,7 +173,7 @@
         <tarfileset file="${build.dir}/zookeeper-*-rest.jar" />
         <tarfileset dir="${zk.root}/build" includes="zookeeper-*.jar" prefix="lib" />
         <tarfileset dir="${zk.root}/src/contrib/${name}/conf" prefix="conf" />
-        <tarfileset dir="${zk.root}/zookeeper-common/src/main/resources/lib" prefix="lib" includes="**/*.jar" />
+        <tarfileset dir="${zk.root}/zookeeper-server/src/main/resources/lib" prefix="lib" includes="**/*.jar" />
         <tarfileset file="${zk.root}/src/contrib/${name}/rest.sh" />
       </param.listofitems>
     </macro_tar>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh b/zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh
index 629927920..4279d3426 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}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${zk_base}"/zookeeper-server/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 35b348e03..74ead8cba 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}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${zk_base}"/zookeeper-server/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done
diff --git a/zookeeper-recipes/build-recipes.xml b/zookeeper-recipes/build-recipes.xml
index 651b3d379..6804adcc7 100644
--- a/zookeeper-recipes/build-recipes.xml
+++ b/zookeeper-recipes/build-recipes.xml
@@ -72,7 +72,7 @@
     <fileset dir="${zk.root}/build/test/lib">
       <include name="**/*.jar"/>
     </fileset>
-    <fileset dir="${zk.root}/zookeeper-common/src/main/resources/lib">
+    <fileset dir="${zk.root}/zookeeper-server/src/main/resources/lib">
       <include name="**/*.jar" />
     </fileset>
   </path>
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 b15238019..4836612d6 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}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${base_dir}"/zookeeper-server/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 b15238019..4836612d6 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}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${base_dir}"/zookeeper-server/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/AsyncCallback.java b/zookeeper-server/src/main/java/org/apache/zookeeper/AsyncCallback.java
index f02a824ab..f02a824ab 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/AsyncCallback.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/AsyncCallback.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxn.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java
index 447a3ee8a..447a3ee8a 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxn.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxn.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxnSocket.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocket.java
index b67653141..b67653141 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxnSocket.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocket.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxnSocketNIO.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNIO.java
index 720619d89..720619d89 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ClientCnxnSocketNIO.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNIO.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ClientWatchManager.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientWatchManager.java
index d56374dee..d56374dee 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ClientWatchManager.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientWatchManager.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/CreateMode.java b/zookeeper-server/src/main/java/org/apache/zookeeper/CreateMode.java
index 84f5be0e9..84f5be0e9 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/CreateMode.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/CreateMode.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Environment.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Environment.java
index 51797a18d..51797a18d 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Environment.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Environment.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/KeeperException.java b/zookeeper-server/src/main/java/org/apache/zookeeper/KeeperException.java
index bdf4203e0..bdf4203e0 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/KeeperException.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/KeeperException.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Login.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Login.java
index c4975be19..c4975be19 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Login.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Login.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/MultiResponse.java b/zookeeper-server/src/main/java/org/apache/zookeeper/MultiResponse.java
index 70f76236e..70f76236e 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/MultiResponse.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/MultiResponse.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/MultiTransactionRecord.java b/zookeeper-server/src/main/java/org/apache/zookeeper/MultiTransactionRecord.java
index 801969a9a..801969a9a 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/MultiTransactionRecord.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/MultiTransactionRecord.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Op.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Op.java
index 1bc206101..1bc206101 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Op.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Op.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/OpResult.java b/zookeeper-server/src/main/java/org/apache/zookeeper/OpResult.java
index 45331d114..45331d114 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/OpResult.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/OpResult.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Quotas.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Quotas.java
index b82e3395d..b82e3395d 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Quotas.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Quotas.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/SaslClientCallbackHandler.java b/zookeeper-server/src/main/java/org/apache/zookeeper/SaslClientCallbackHandler.java
index d6f554955..d6f554955 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/SaslClientCallbackHandler.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/SaslClientCallbackHandler.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ServerAdminClient.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ServerAdminClient.java
index 9464f1ce3..9464f1ce3 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ServerAdminClient.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ServerAdminClient.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Shell.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Shell.java
index 246170e4d..246170e4d 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Shell.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Shell.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/StatsTrack.java b/zookeeper-server/src/main/java/org/apache/zookeeper/StatsTrack.java
index 623c6d446..623c6d446 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/StatsTrack.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/StatsTrack.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Testable.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Testable.java
index b38d2c3bb..b38d2c3bb 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Testable.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Testable.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Transaction.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Transaction.java
index d8f0e01a6..d8f0e01a6 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Transaction.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Transaction.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Version.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java
index 1f5cf1aa2..1f5cf1aa2 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Version.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/WatchedEvent.java b/zookeeper-server/src/main/java/org/apache/zookeeper/WatchedEvent.java
index 851fc6c85..851fc6c85 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/WatchedEvent.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/WatchedEvent.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/Watcher.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Watcher.java
index 5c21485cd..5c21485cd 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/Watcher.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Watcher.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ZKUtil.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ZKUtil.java
index e901832cf..e901832cf 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ZKUtil.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZKUtil.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ZooDefs.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooDefs.java
index 09bc95c36..09bc95c36 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ZooDefs.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooDefs.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeper.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java
index 3e46ee7f7..3e46ee7f7 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeper.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeperMain.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
index 6ca538b5b..6ca538b5b 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperMain.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeperTestable.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperTestable.java
index 775d1a26d..775d1a26d 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeperTestable.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeperTestable.java
diff --git a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/ConnectStringParser.java b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ConnectStringParser.java
index ff0425a4e..ff0425a4e 100644
--- a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/ConnectStringParser.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ConnectStringParser.java
diff --git a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/FourLetterWordMain.java b/zookeeper-server/src/main/java/org/apache/zookeeper/client/FourLetterWordMain.java
index a4175e46c..a4175e46c 100644
--- a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/FourLetterWordMain.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/client/FourLetterWordMain.java
diff --git a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/HostProvider.java b/zookeeper-server/src/main/java/org/apache/zookeeper/client/HostProvider.java
index 61d91083a..61d91083a 100644
--- a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/HostProvider.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/client/HostProvider.java
diff --git a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java b/zookeeper-server/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java
index 000594291..000594291 100644
--- a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/client/StaticHostProvider.java
diff --git a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java
index af3303c60..af3303c60 100644
--- a/zookeeper-client/zookeeper-client-java/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/common/AtomicFileOutputStream.java b/zookeeper-server/src/main/java/org/apache/zookeeper/common/AtomicFileOutputStream.java
index 2584d3f87..2584d3f87 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/common/AtomicFileOutputStream.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/common/AtomicFileOutputStream.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/common/IOUtils.java b/zookeeper-server/src/main/java/org/apache/zookeeper/common/IOUtils.java
index 16aea4ea4..16aea4ea4 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/common/IOUtils.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/common/IOUtils.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/common/PathTrie.java b/zookeeper-server/src/main/java/org/apache/zookeeper/common/PathTrie.java
index 73053e02c..73053e02c 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/common/PathTrie.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/common/PathTrie.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/common/PathUtils.java b/zookeeper-server/src/main/java/org/apache/zookeeper/common/PathUtils.java
index 2a6c7efab..2a6c7efab 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/common/PathUtils.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/common/PathUtils.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/common/Time.java b/zookeeper-server/src/main/java/org/apache/zookeeper/common/Time.java
index 83e53f056..83e53f056 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/common/Time.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/common/Time.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/util/SecurityUtils.java b/zookeeper-server/src/main/java/org/apache/zookeeper/util/SecurityUtils.java
index 67484e4e0..67484e4e0 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/util/SecurityUtils.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/util/SecurityUtils.java
diff --git a/zookeeper-common/src/main/java/org/apache/zookeeper/version/util/VerGen.java b/zookeeper-server/src/main/java/org/apache/zookeeper/version/util/VerGen.java
index 7285a2b56..7285a2b56 100644
--- a/zookeeper-common/src/main/java/org/apache/zookeeper/version/util/VerGen.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/version/util/VerGen.java
diff --git a/zookeeper-common/src/main/resources/lib/cobertura/README.txt b/zookeeper-server/src/main/resources/lib/cobertura/README.txt
index f5ba88f1f..f5ba88f1f 100644
--- a/zookeeper-common/src/main/resources/lib/cobertura/README.txt
+++ b/zookeeper-server/src/main/resources/lib/cobertura/README.txt
diff --git a/zookeeper-common/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml b/zookeeper-server/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml
index c28b238b8..c28b238b8 100644
--- a/zookeeper-common/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml
+++ b/zookeeper-server/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml
diff --git a/zookeeper-common/src/main/resources/lib/log4j-1.2.17.LICENSE.txt b/zookeeper-server/src/main/resources/lib/log4j-1.2.17.LICENSE.txt
index 6279e5206..6279e5206 100644
--- a/zookeeper-common/src/main/resources/lib/log4j-1.2.17.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/log4j-1.2.17.LICENSE.txt
diff --git a/zookeeper-common/src/main/resources/lib/slf4j-1.7.25.LICENSE.txt b/zookeeper-server/src/main/resources/lib/slf4j-1.7.25.LICENSE.txt
index 315bd4979..315bd4979 100644
--- a/zookeeper-common/src/main/resources/lib/slf4j-1.7.25.LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/slf4j-1.7.25.LICENSE.txt
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/ClientReconnectTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/ClientReconnectTest.java
index 8d66a7e69..8d66a7e69 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/ClientReconnectTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ClientReconnectTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java b/zookeeper-server/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java
index 37149ccaa..37149ccaa 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/JUnit4ZKTestRunner.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/JaasConfiguration.java b/zookeeper-server/src/test/java/org/apache/zookeeper/JaasConfiguration.java
index bf145d024..bf145d024 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/JaasConfiguration.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/JaasConfiguration.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/MockPacket.java b/zookeeper-server/src/test/java/org/apache/zookeeper/MockPacket.java
index f4bb19a5a..f4bb19a5a 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/MockPacket.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/MockPacket.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/MultiResponseTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/MultiResponseTest.java
index a03feb3df..a03feb3df 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/MultiResponseTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/MultiResponseTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/MultiTransactionRecordTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/MultiTransactionRecordTest.java
index 374956456..374956456 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/MultiTransactionRecordTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/MultiTransactionRecordTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/PortAssignment.java b/zookeeper-server/src/test/java/org/apache/zookeeper/PortAssignment.java
index 06f936104..06f936104 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/PortAssignment.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/PortAssignment.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/SaslAuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/SaslAuthTest.java
index eac070335..eac070335 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/SaslAuthTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/SaslAuthTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/ServerConfigTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/ServerConfigTest.java
index 27faa745b..27faa745b 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/ServerConfigTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ServerConfigTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/TestableZooKeeper.java b/zookeeper-server/src/test/java/org/apache/zookeeper/TestableZooKeeper.java
index dd700560c..dd700560c 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/TestableZooKeeper.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/TestableZooKeeper.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/VerGenTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/VerGenTest.java
index 607edbb53..607edbb53 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/VerGenTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/VerGenTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/ZKTestCase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/ZKTestCase.java
index 9098fc47e..9098fc47e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/ZKTestCase.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ZKTestCase.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/ZooKeeperTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java
index 2cdc4cb6e..2cdc4cb6e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/ZooKeeperTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/ZooKeeperTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/common/TimeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/common/TimeTest.java
index d93855693..d93855693 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/common/TimeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/common/TimeTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLCountTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLCountTest.java
index 88b8869ad..88b8869ad 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLCountTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLCountTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLRootTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLRootTest.java
index 7307cbf0e..7307cbf0e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLRootTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLRootTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLTest.java
index 793265c51..793265c51 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ACLTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ACLTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncHammerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncHammerTest.java
index ebfc96396..ebfc96396 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncHammerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncHammerTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncOps.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncOps.java
index 2dbe64455..2dbe64455 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncOps.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncOps.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncOpsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncOpsTest.java
index c807d7288..c807d7288 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncOpsTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncOpsTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncTest.java
index 218203296..218203296 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AsyncTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AsyncTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java
index cbd2b7700..cbd2b7700 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AuthTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AuthTest.java
index 60e3453bb..60e3453bb 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/AuthTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/AuthTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/BufferSizeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/BufferSizeTest.java
index 6d74e54b5..6d74e54b5 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/BufferSizeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/BufferSizeTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootAsyncTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ChrootAsyncTest.java
index e60ea049a..e60ea049a 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootAsyncTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ChrootAsyncTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootClientTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ChrootClientTest.java
index e0286e16e..e0286e16e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootClientTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ChrootClientTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ChrootTest.java
index 3df068bef..3df068bef 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ChrootTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ChrootTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
index 7de4f3c32..7de4f3c32 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientBase.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientBase.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientHammerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientHammerTest.java
index 025ccbe4c..025ccbe4c 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientHammerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientHammerTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java
index 95c55e271..95c55e271 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientRetry.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientRetry.java
index d0b6b43f4..d0b6b43f4 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientRetry.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientRetry.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientTest.java
index 9dc48619e..9dc48619e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ClientTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java
index a169b7ba7..a169b7ba7 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ConnectStringParserTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/CreateModeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateModeTest.java
index a3b838a68..a3b838a68 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/CreateModeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/CreateModeTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/DisconnectableZooKeeper.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectableZooKeeper.java
index 619bdc68e..619bdc68e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/DisconnectableZooKeeper.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectableZooKeeper.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
index e81b7f453..e81b7f453 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/DisconnectedWatcherTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/EventTypeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/EventTypeTest.java
index e6a982615..e6a982615 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/EventTypeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/EventTypeTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java
index 1731e6e80..1731e6e80 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLENewEpochTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java
index 0ecac6e6c..0ecac6e6c 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEPredicateTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLERestartTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLERestartTest.java
index a7cecf64d..a7cecf64d 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLERestartTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLERestartTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLETest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java
index 6281a57d9..6281a57d9 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLETest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLETest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java
index e8a8cf792..e8a8cf792 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FLEZeroWeightTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java
index acd05d669..acd05d669 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FollowerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FollowerTest.java
index fa6b4a30b..fa6b4a30b 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FollowerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FollowerTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java
index 49d90f76e..49d90f76e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
index bc8d0713d..bc8d0713d 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
index 515cbdcc9..515cbdcc9 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java
index e41fffe08..e41fffe08 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/GetChildren2Test.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java
index 051da1330..051da1330 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/HierarchicalQuorumTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java
index 9a01a6587..9a01a6587 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/IntegrityCheck.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/InvalidSnapshotTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/InvalidSnapshotTest.java
index c5a7b4fca..c5a7b4fca 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/InvalidSnapshotTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/InvalidSnapshotTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/JMXEnv.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/JMXEnv.java
index f67c67c77..f67c67c77 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/JMXEnv.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/JMXEnv.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java
index 55dc85290..55dc85290 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/KeeperStateTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/LENonTerminateTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LENonTerminateTest.java
index de266988f..de266988f 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/LENonTerminateTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LENonTerminateTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/LETest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LETest.java
index 0fd343022..0fd343022 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/LETest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LETest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java
index 9135307f2..9135307f2 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoadFromLogNoServerTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/LoadFromLogTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoadFromLogTest.java
index dac39109a..dac39109a 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/LoadFromLogTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoadFromLogTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/MaxCnxnsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MaxCnxnsTest.java
index 0a31ac9b7..0a31ac9b7 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/MaxCnxnsTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MaxCnxnsTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/MultiTransactionTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiTransactionTest.java
index 0277c2306..0277c2306 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/MultiTransactionTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/MultiTransactionTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteBase.java
index d61a3e2d6..d61a3e2d6 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteBase.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteBase.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteHammerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteHammerTest.java
index 96e7b0caa..96e7b0caa 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteHammerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteHammerTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java
index eaf17b945..eaf17b945 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NioNettySuiteTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
index 133d92075..133d92075 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NonRecoverableErrorTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NullDataTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NullDataTest.java
index 8f1a1bb0f..8f1a1bb0f 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/NullDataTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/NullDataTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/OOMTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/OOMTest.java
index 465df9838..465df9838 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/OOMTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/OOMTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/OSMXBeanTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/OSMXBeanTest.java
index ce21ab825..ce21ab825 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/OSMXBeanTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/OSMXBeanTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java
index 9d373fc99..9d373fc99 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverLETest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverLETest.java
index 123ba0be0..123ba0be0 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverLETest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverLETest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverQuorumHammerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverQuorumHammerTest.java
index 03b400092..03b400092 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverQuorumHammerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverQuorumHammerTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverTest.java
index f7a82c6b2..f7a82c6b2 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ObserverTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumBase.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBase.java
index 49cff350f..49cff350f 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumBase.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumBase.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumHammerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumHammerTest.java
index e5b377eab..e5b377eab 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumHammerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumHammerTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumQuotaTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumQuotaTest.java
index bef1a33a9..bef1a33a9 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumQuotaTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumQuotaTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java
index 6f827ec7d..6f827ec7d 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumUtil.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumUtil.java
index 1f2dbbc7e..1f2dbbc7e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumUtil.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumUtil.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumZxidSyncTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumZxidSyncTest.java
index 6e46edc3e..6e46edc3e 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/QuorumZxidSyncTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/QuorumZxidSyncTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
index 6f281d950..6f281d950 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RecoveryTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/RecoveryTest.java
index c084a68fc..c084a68fc 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RecoveryTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/RecoveryTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java
index f714a2caf..f714a2caf 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/RepeatStartupTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java
index 65cc0e2f3..65cc0e2f3 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/RestoreCommittedLogTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java
index 9e28278f5..9e28278f5 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java
index aa30870da..aa30870da 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java
index 5291141cf..5291141cf 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java
index 2b00d862d..2b00d862d 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthFailTest.java
index 33a505ea2..33a505ea2 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthFailTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthFailTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java
index 98be0be33..98be0be33 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslClientTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslClientTest.java
index 8213abca4..8213abca4 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SaslClientTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SaslClientTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionInvalidationTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionInvalidationTest.java
index 3a0b2ee60..3a0b2ee60 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionInvalidationTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionInvalidationTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTest.java
index 891b0f057..891b0f057 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionTimeoutTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTimeoutTest.java
index 09badae12..09badae12 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SessionTimeoutTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SessionTimeoutTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SledgeHammer.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SledgeHammer.java
index 614a93d15..614a93d15 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SledgeHammer.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SledgeHammer.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/StandaloneTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StandaloneTest.java
index f3054238b..f3054238b 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/StandaloneTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StandaloneTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/StatTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StatTest.java
index f4c01aa5c..f4c01aa5c 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/StatTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StatTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java
index a4107a5ad..a4107a5ad 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/StaticHostProviderTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SyncCallTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SyncCallTest.java
index 4fb006ac6..4fb006ac6 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/SyncCallTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/SyncCallTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/TestHammer.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/TestHammer.java
index a73d6df35..a73d6df35 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/TestHammer.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/TestHammer.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/TestUtils.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/TestUtils.java
index fa08b8222..fa08b8222 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/TestUtils.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/TestUtils.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/TruncateTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/TruncateTest.java
index 66ff63d0f..66ff63d0f 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/TruncateTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/TruncateTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/UpgradeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/UpgradeTest.java
index b8db0da88..b8db0da88 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/UpgradeTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/UpgradeTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoReset.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
index eed02c584..eed02c584 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java
index 0eaea677d..0eaea677d 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchedEventTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java
index a6c62e4bb..a6c62e4bb 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherFuncTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatcherTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherTest.java
index 1c06690cd..1c06690cd 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/WatcherTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatcherTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
index c213b2a26..c213b2a26 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperQuotaTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZooKeeperQuotaTest.java
index fbf09b34f..fbf09b34f 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperQuotaTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZooKeeperQuotaTest.java
diff --git a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java
index 0bbba61d5..0bbba61d5 100644
--- a/zookeeper-common/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ZooKeeperTestClient.java
diff --git a/zookeeper-common/src/test/resources/check_compatibility.py b/zookeeper-server/src/test/resources/check_compatibility.py
index cad819594..cad819594 100644
--- a/zookeeper-common/src/test/resources/check_compatibility.py
+++ b/zookeeper-server/src/test/resources/check_compatibility.py
diff --git a/zookeeper-common/src/test/resources/checkstyle-noframes-sorted.xsl b/zookeeper-server/src/test/resources/checkstyle-noframes-sorted.xsl
index 5f9e93ba2..5f9e93ba2 100644
--- a/zookeeper-common/src/test/resources/checkstyle-noframes-sorted.xsl
+++ b/zookeeper-server/src/test/resources/checkstyle-noframes-sorted.xsl
diff --git a/zookeeper-common/src/test/resources/checkstyle.xml b/zookeeper-server/src/test/resources/checkstyle.xml
index a5d51821a..a5d51821a 100644
--- a/zookeeper-common/src/test/resources/checkstyle.xml
+++ b/zookeeper-server/src/test/resources/checkstyle.xml
diff --git a/zookeeper-common/src/test/resources/data/buffersize/create/version-2/log.1 b/zookeeper-server/src/test/resources/data/buffersize/create/version-2/log.1
index 4f05bc1cb..4f05bc1cb 100644
--- a/zookeeper-common/src/test/resources/data/buffersize/create/version-2/log.1
+++ b/zookeeper-server/src/test/resources/data/buffersize/create/version-2/log.1
diff --git a/zookeeper-common/src/test/resources/data/buffersize/create/version-2/snapshot.0 b/zookeeper-server/src/test/resources/data/buffersize/create/version-2/snapshot.0
index 49b512e65..49b512e65 100644
--- a/zookeeper-common/src/test/resources/data/buffersize/create/version-2/snapshot.0
+++ b/zookeeper-server/src/test/resources/data/buffersize/create/version-2/snapshot.0
diff --git a/zookeeper-common/src/test/resources/data/buffersize/set/version-2/log.1 b/zookeeper-server/src/test/resources/data/buffersize/set/version-2/log.1
index 8586f16bf..8586f16bf 100644
--- a/zookeeper-common/src/test/resources/data/buffersize/set/version-2/log.1
+++ b/zookeeper-server/src/test/resources/data/buffersize/set/version-2/log.1
diff --git a/zookeeper-common/src/test/resources/data/buffersize/set/version-2/snapshot.0 b/zookeeper-server/src/test/resources/data/buffersize/set/version-2/snapshot.0
index 49b512e65..49b512e65 100644
--- a/zookeeper-common/src/test/resources/data/buffersize/set/version-2/snapshot.0
+++ b/zookeeper-server/src/test/resources/data/buffersize/set/version-2/snapshot.0
diff --git a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/log.1 b/zookeeper-server/src/test/resources/data/buffersize/snapshot/version-2/log.1
index 2f145a683..2f145a683 100644
--- a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/log.1
+++ b/zookeeper-server/src/test/resources/data/buffersize/snapshot/version-2/log.1
diff --git a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0 b/zookeeper-server/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0
index 49b512e65..49b512e65 100644
--- a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0
+++ b/zookeeper-server/src/test/resources/data/buffersize/snapshot/version-2/snapshot.0
diff --git a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2 b/zookeeper-server/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2
index 59dfa701a..59dfa701a 100644
--- a/zookeeper-common/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2
+++ b/zookeeper-server/src/test/resources/data/buffersize/snapshot/version-2/snapshot.2
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.1 b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/log.1
index 9dc15ae8d..9dc15ae8d 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.1
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/log.1
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.274 b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/log.274
index 3bb868e26..3bb868e26 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.274
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/log.274
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.42 b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/log.42
index 5385be516..5385be516 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.42
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/log.42
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.63b b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/log.63b
index 4ee0a98a4..4ee0a98a4 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/log.63b
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/log.63b
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.0 b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.0
index 49b512e65..49b512e65 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.0
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.0
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.272 b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.272
index 71f32a5dc..71f32a5dc 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.272
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.272
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.273 b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.273
index 3146f5656..3146f5656 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.273
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.273
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.639 b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.639
index cf9e38985..cf9e38985 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.639
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.639
diff --git a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.83f b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.83f
index 26dc5f665..26dc5f665 100644
--- a/zookeeper-common/src/test/resources/data/invalidsnap/version-2/snapshot.83f
+++ b/zookeeper-server/src/test/resources/data/invalidsnap/version-2/snapshot.83f
diff --git a/zookeeper-common/src/test/resources/data/kerberos/minikdc-krb5.conf b/zookeeper-server/src/test/resources/data/kerberos/minikdc-krb5.conf
index 43ec7c4c4..43ec7c4c4 100644
--- a/zookeeper-common/src/test/resources/data/kerberos/minikdc-krb5.conf
+++ b/zookeeper-server/src/test/resources/data/kerberos/minikdc-krb5.conf
diff --git a/zookeeper-common/src/test/resources/data/kerberos/minikdc.ldiff b/zookeeper-server/src/test/resources/data/kerberos/minikdc.ldiff
index 20c8d7759..20c8d7759 100644
--- a/zookeeper-common/src/test/resources/data/kerberos/minikdc.ldiff
+++ b/zookeeper-server/src/test/resources/data/kerberos/minikdc.ldiff
diff --git a/zookeeper-common/src/test/resources/data/upgrade/log.100000001 b/zookeeper-server/src/test/resources/data/upgrade/log.100000001
index 00655f15f..00655f15f 100644
--- a/zookeeper-common/src/test/resources/data/upgrade/log.100000001
+++ b/zookeeper-server/src/test/resources/data/upgrade/log.100000001
diff --git a/zookeeper-common/src/test/resources/data/upgrade/log.100001bf0 b/zookeeper-server/src/test/resources/data/upgrade/log.100001bf0
index 83fa6973e..83fa6973e 100644
--- a/zookeeper-common/src/test/resources/data/upgrade/log.100001bf0
+++ b/zookeeper-server/src/test/resources/data/upgrade/log.100001bf0
diff --git a/zookeeper-common/src/test/resources/data/upgrade/snapshot.100000000 b/zookeeper-server/src/test/resources/data/upgrade/snapshot.100000000
index 56f90157f..56f90157f 100644
--- a/zookeeper-common/src/test/resources/data/upgrade/snapshot.100000000
+++ b/zookeeper-server/src/test/resources/data/upgrade/snapshot.100000000
diff --git a/zookeeper-common/src/test/resources/data/upgrade/snapshot.100001bec b/zookeeper-server/src/test/resources/data/upgrade/snapshot.100001bec
index 0010d1eb8..0010d1eb8 100644
--- a/zookeeper-common/src/test/resources/data/upgrade/snapshot.100001bec
+++ b/zookeeper-server/src/test/resources/data/upgrade/snapshot.100001bec
diff --git a/zookeeper-common/src/test/resources/findbugsExcludeFile.xml b/zookeeper-server/src/test/resources/findbugsExcludeFile.xml
index c023f4f4f..c023f4f4f 100644
--- a/zookeeper-common/src/test/resources/findbugsExcludeFile.xml
+++ b/zookeeper-server/src/test/resources/findbugsExcludeFile.xml
diff --git a/zookeeper-common/src/test/resources/test-github-pr.sh b/zookeeper-server/src/test/resources/test-github-pr.sh
index e155769f2..e155769f2 100755
--- a/zookeeper-common/src/test/resources/test-github-pr.sh
+++ b/zookeeper-server/src/test/resources/test-github-pr.sh
diff --git a/zookeeper-common/src/test/resources/test-patch.properties b/zookeeper-server/src/test/resources/test-patch.properties
index c467e63ab..c467e63ab 100644
--- a/zookeeper-common/src/test/resources/test-patch.properties
+++ b/zookeeper-server/src/test/resources/test-patch.properties
diff --git a/zookeeper-common/src/test/resources/test-patch.sh b/zookeeper-server/src/test/resources/test-patch.sh
index d42789b17..d42789b17 100755
--- a/zookeeper-common/src/test/resources/test-patch.sh
+++ b/zookeeper-server/src/test/resources/test-patch.sh