ZOOKEEPER-3032: MAVEN MIGRATION - branch 3.4 move java server, client

Author: Norbert Kalmar <nkalmar@yahoo.com> Reviewers: andor@apache.org Closes #658 from nkalmar/ZOOKEEPER-3032-3.4
author: Norbert Kalmar <nkalmar@yahoo.com> 2018-10-10 12:29:50 +0200
committer: Andor Molnar <andor@apache.org> 2018-10-10 12:29:50 +0200
commit: c0aa3b3f3bd7754c21010a007442f6f5686a3865 (patch)
tree: 4db36bf6625108810b2fc5c0deb95db98b016d07
parent: 74c245b4c01bf282b121286260525dde97037206 (diff)
download: zookeeper-c0aa3b3f3bd7754c21010a007442f6f5686a3865.tar.gz
411 files changed, 157 insertions, 80 deletions
diff --git a/.gitignore b/.gitignore
index 78c9ed4fa..354445685 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 43cbc2235..4e6fb9794 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 4b945c854..9cce94694 100644
--- a/build.xml
+++ b/build.xml
@@ -78,16 +78,20 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <property name="final.name" value="${name}-${version}"/>
     <property name="revision.dir" value="${basedir}/.revision" />
     <property name="revision.properties" value="revision.properties" />
-    <property file="${basedir}/src/java/${revision.properties}" />
+    <property file="${basedir}/.revision/${revision.properties}" />
     
     <property name="javac.target" value="1.6" />
     <property name="javac.source" value="1.6" />
 
     <property name="src.dir" value="${basedir}/src" />
-    <property name="java.src.dir" value="${src.dir}/java/main" />
+    <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="${src.dir}/java/lib" />
+    <property name="lib.dir" value="${java.common.resources.dir}/lib" />
     <property name="lib.dir.includes" value="**/*.jar" />
     <property name="lib.dir.excludes" value="**/excluded/" />
 
@@ -100,7 +104,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
     <property name="build.dir" value="${basedir}/build" />
     <property name="distribution" value="${basedir}/distribution" />
-    <property name="src_generated.dir" value="${src.dir}/java/generated" />
+    <property name="src_generated.dir" value="${basedir}/zookeeper-jute/target/main/java" />
     <property name="c.src.dir" value="${basedir}/zookeeper-client/zookeeper-client-c" />
     <property name="csrc_generated.dir" value="${c.src.dir}/generated" />
 
@@ -113,9 +117,11 @@ 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="test.src.dir" value="${src.dir}/java/test"/>
+    <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="jute.test.src.dir" value="${basedir}/zookeeper-jute/src/test/java" />
-    <property name="systest.src.dir" value="${src.dir}/java/systest"/>
+    <property name="systest.src.dir" value="${basedir}/zookeeper-it/src/test/java"/>
     <property name="test.log.dir" value="${test.java.build.dir}/logs" />
     <property name="test.data.dir" value="${test.java.build.dir}/data" />
     <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
@@ -131,7 +137,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <property name="test.junit.printsummary" value="yes" />
     <property name="test.junit.haltonfailure" value="no" />
     <property name="test.junit.failbuild.ontestfailure" value="true" />
-    <property name="config.dir" value="${src.dir}/java/test/config" />
     <property name="test.junit.maxmem" value="512m" />
     <property name="test.quick" value="no" />
     <property name="conf.dir" value="${basedir}/conf"/>
@@ -141,6 +146,12 @@ 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"/>
 
@@ -190,8 +201,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="${test.src.dir}/bin/test-patch.sh"/>
-    <property name="test_pullrequest_sh" value="${test.src.dir}/bin/test-github-pr.sh"/>
+    <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"/>
 
 	<!-- jdiff.home property set -->
     <property name="jdiff.home" value="${ivy.jdiff.lib}"/>
@@ -331,7 +342,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}">
             <arg value="-l" />
             <arg value="java" />
-            <arg value="../../../zookeeper-jute/src/main/resources/zookeeper.jute" />
+            <arg value="../../../src/main/resources/zookeeper.jute" />
             <classpath>
                 <pathelement path="${build.classes}" />
             </classpath>
@@ -350,9 +361,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     </target>
 
     <target name="ver-gen" depends="init">
-        <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
+        <javac destdir="${build.classes}" includeantruntime="false"
             target="${javac.target}" source="${javac.source}"
-            includes="org/apache/zookeeper/version/util/**" debug="on" />
+            includes="org/apache/zookeeper/version/util/**" debug="on">
+            <src path="${java.server.src.dir}" />
+            <src path="${java.common.src.dir}" />
+        </javac>
     </target>
     
     <target name="git-revision" unless="lastRevision">
@@ -361,7 +375,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
       	    <os family="windows"/>
         </condition>
         <condition property="revision.cmd.line" 
-        	value="/c ${src.dir}\lastRevision.bat" else="${src.dir}/lastRevision.sh">
+        	value="/c ${java.server.resources.dir}\lastRevision.bat" else="${java.server.resources.dir}/lastRevision.sh">
       	    <os family="windows"/>
         </condition>
         <exec executable="${shell.name}">
@@ -459,7 +473,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <target name="compile" depends="ivy-retrieve,clover,build-generated">
         <javac destdir="${build.classes}" includeantruntime="false"
                target="${javac.target}" source="${javac.source}" debug="on">
-            <src path="${java.src.dir}"/>
+            <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"/>
@@ -471,7 +487,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
       <mkdir dir="${test.java.classes}"/>
       <javac destdir="${test.java.classes}" includeantruntime="false"
              target="${javac.target}" source="${javac.source}" debug="on">
-        <src path="${test.src.dir}"/>
+          <src path="${java.server.test.dir}"/>
+          <src path="${java.common.test.dir}"/>
         <src path="${jute.test.src.dir}"/>
         <classpath refid="test.java.classpath"/>
       </javac>
@@ -534,7 +551,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
             description="Generate javadoc for zookeeper developers">
       <mkdir dir="${build.javadoc.dev}"/>
       <javadoc
-         overview="${java.src.dir}/overview.html"
+         overview="${java.server.resources.dir}/overview.html"
          packagenames="org.apache.zookeeper.*"
          destdir="${build.javadoc.dev}"
          author="true"
@@ -544,10 +561,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
          doctitle="${Name} ${version} API"
          bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
          >
-    	<packageset dir="${java.src.dir}">
+    	<packageset dir="${java.server.src.dir}">
           <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"/>
@@ -557,7 +580,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <target name="javadoc" depends="jar" description="Generate javadoc">
       <mkdir dir="${build.javadoc}"/>
       <javadoc
-         overview="${java.src.dir}/overview.html"
+         overview="${java.server.resources.dir}/overview.html"
          packagenames="org.apache.zookeeper.*"
          destdir="${build.javadoc}"
          author="true"
@@ -571,7 +594,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
          docletpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar"
          >
 
-        <fileset dir="${java.src.dir}">
+        <fileset dir="${java.server.src.dir}">
           <include name="org/apache/zookeeper/server/quorum/QuorumPeerMain.java"/>
           <include name="org/apache/zookeeper/server/ZooKeeperServerMain.java"/>
           <include name="org/apache/zookeeper/server/LogFormatter.java"/>
@@ -579,10 +602,18 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
           <include name="org/apache/zookeeper/server/SnapshotFormatter.java"/>
           <include name="org/apache/zookeeper/server/upgrade/UpgradeMain.java"/>
         </fileset>
-    	<packageset dir="${java.src.dir}">
+    	<packageset dir="${java.server.src.dir}">
           <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>
@@ -619,7 +650,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         <jar jarfile="${build.dir}/${final.name}.jar">
             <fileset file="LICENSE.txt" />
             <fileset dir="${build.classes}" excludes="**/.generated"/>
-            <fileset dir="${java.src.dir}"/>
+            <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>
@@ -694,7 +727,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
     <target name="src-jar" depends="build-generated">
         <jar jarfile="${build.dir}/${final.name}-sources.jar">
             <fileset file="LICENSE.txt" />
-            <fileset dir="${java.src.dir}"/>
+            <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>
@@ -803,7 +838,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
       <ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml"
                    pomfile="${dist.maven.dir}/${final.name}.pom"
-                   templatefile="${basedir}/src/pom.template">
+                   templatefile="${java.server.resources.dir}/pom.template" >
         <mapping conf="default" scope="compile"/>
         <mapping conf="test" scope="test"/>
       </ivy:makepom>
@@ -835,20 +870,21 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         <fileset file="build.xml"/>
         <fileset file="ivy.xml"/>
         <fileset file="ivysettings.xml"/>
-        <fileset file="src/NOTICE.txt"/>
-        <fileset file="src/LICENSE.txt"/>
+        <fileset file="${java.server.resources.dir}/NOTICE.txt"/>
+        <fileset file="${java.server.resources.dir}/LICENSE.txt"/>
       </copy>
 
       <copy todir="${dist.dir}/src" includeEmptyDirs="true">
-        <fileset dir="src" excludes="**/*.template **/docs/build/**/* **/ivy*.jar"/>
         <fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
           <include name="zookeeper-recipes/**"/>
           <include name="zookeeper-docs/**"/>
           <include name="zookeeper-contrib/**"/>
           <include name="zookeeper-client/**"/>
           <include name="zookeeper-jute/**"/>
+          <include name="zookeeper-common/**"/>
+          <include name="zookeeper-server/**"/>
         </fileset>
-        <fileset file="src/pom.template"/>
+        <fileset file="${java.server.resources.dir}/pom.template"/>
       </copy>
   	  
       <chmod perm="ugo+x" type="file" parallel="false">
@@ -919,7 +955,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
       <ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml"
                    pomfile="${dist.maven.dir}/${name}.pom"
-                   templatefile="${basedir}/src/pom.template">
+                   templatefile="${java.server.resources.dir}/pom.template">
         <mapping conf="default" scope="compile"/>
         <mapping conf="test" scope="test"/>
       </ivy:makepom>
@@ -961,13 +997,13 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         <fileset file="build.xml"/>
         <fileset file="ivy.xml"/>
         <fileset file="ivysettings.xml"/>
-        <fileset file="src/NOTICE.txt"/>
-        <fileset file="src/LICENSE.txt"/>
+        <fileset file="${java.server.resources.dir}/NOTICE.txt"/>
+        <fileset file="${java.server.resources.dir}/LICENSE.txt"/>
       </copy>
 
       <copy todir="${dist.dir}/src" includeEmptyDirs="true">
         <fileset dir="src" excludes="**/*.template **/docs/build/**/* **/ivy*.jar"/>
-        <fileset file="src/pom.template"/>
+        <fileset file="${java.server.resources.dir}/pom.template"/>
       </copy>
 
       <copy todir="${dist.dir}/${package.share.dir}/templates/conf">
@@ -1338,18 +1374,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="${basedir}/src/java/test/data/upgrade"/>
+            <fileset dir="${common.test.resource.dir}/data/upgrade"/>
         </copy>
         <copy todir="${test.data.invalid.dir}">
-            <fileset dir="${basedir}/src/java/test/data/invalidsnap"/>
+            <fileset dir="${common.test.resource.dir}/data/invalidsnap"/>
         </copy>
         <mkdir dir="${test.data.buffersize.dir}" />
         <copy todir="${test.data.buffersize.dir}">
-            <fileset dir="${basedir}/src/java/test/data/buffersize"/>
+            <fileset dir="${common.test.resource.dir}/data/buffersize"/>
         </copy>
         <mkdir dir="${test.data.kerberos.dir}" />
         <copy todir="${test.data.kerberos.dir}">
-            <fileset dir="${basedir}/src/java/test/data/kerberos"/>
+            <fileset dir="${common.test.resource.dir}/data/kerberos"/>
         </copy>
     </target>
 
@@ -1395,7 +1431,11 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
           </classpath>
           <formatter type="${test.junit.output.format}" />
           <batchtest todir="${test.log.dir}" if="quicktest">
-            <fileset dir="${test.src.dir}">
+            <fileset dir="${java.server.test.dir}">
+              <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>
@@ -1404,7 +1444,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
             </fileset>
           </batchtest>
           <batchtest todir="${test.log.dir}" if="fulltest">
-            <fileset dir="${test.src.dir}">
+            <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}">
@@ -1412,7 +1455,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
             </fileset>
           </batchtest>
           <batchtest todir="${test.log.dir}" if="testcase">
-            <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
+            <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>
@@ -1579,11 +1623,24 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
       <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
       <mkdir dir="${clover.db.dir}"/>
       <clover-setup initString="${clover.db}">
-        <fileset dir="${java.src.dir}"
+        <fileset dir="${java.server.src.dir}"
                  includes="org/apache/zookeeper/**/*"
                  excludes="org/apache/zookeeper/version/**/*">
         </fileset>
-        <testsources dir="${test.src.dir}">
+        <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>
@@ -1634,7 +1691,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="${config.dir}/findbugsExcludeFile.xml" />
+        <property name="findbugs.exclude.file" value="${common.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" 
@@ -1647,7 +1704,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
                     <include name="**/*.jar" />
                 </fileset>
             </auxClasspath>
-            <sourcePath path="${java.src.dir}" />
+            <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}" 
@@ -1713,11 +1772,14 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
             <formatter type="${test.junit.output.format}" />
             <batchtest todir="${test.log.dir}" unless="testcase">
-                <fileset dir="${test.src.dir}"
+                <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="${test.src.dir}" includes="**/${testcase}.java"/>
+                <fileset dir="${java.common.test.dir}" includes="**/${testcase}.java"/>
+                <fileset dir="${java.server.test.dir}" includes="**/${testcase}.java"/>
             </batchtest>
         </junit>
         <antcall target="fail.build.on.test.failure"/>
@@ -1725,8 +1787,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
     <target name="cobertura-report" depends="cobertura-test">
         <cobertura-report format="${test.cobertura.output.format}"
-                          destdir="${coveragereport.dir}" > 
-            <fileset dir="${java.src.dir}">
+                          destdir="${coveragereport.dir}" >
+            <fileset dir="${java.server.src.dir}">
                 <include name="**/*.java" />
             </fileset>
             <fileset dir="${jute.src.dir}">
@@ -1745,11 +1807,13 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
         </classpath>
       </taskdef>
       <mkdir dir="${test.java.build.dir}"/>
-      <cs:checkstyle config="${test.src.dir}/checkstyle.xml" failOnViolation="false">
-        <fileset dir="${src.dir}/java" includes="**/*.java" excludes="**/generated/**"/>
+      <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/**"/>
+        <fileset dir="${basedir}/zookeeper-server" includes="**/*.java" excludes="**/generated/**"/>
         <formatter type="xml" toFile="${test.java.build.dir}/checkstyle-errors.xml"/>
       </cs:checkstyle>
-      <xslt style="${test.src.dir}/checkstyle-noframes-sorted.xsl" in="${test.java.build.dir}/checkstyle-errors.xml"
+      <xslt style="${common.test.resource.dir}/checkstyle-noframes-sorted.xsl" in="${test.java.build.dir}/checkstyle-errors.xml"
             out="${test.java.build.dir}/checkstyle-errors.html"/>
     </target>
 
@@ -1809,7 +1873,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
           <exclude name="README_packaging.txt"/>
           <exclude name="**/VERSION"/>
           <exclude name="**/ChangeLog"/>
-          <exclude name="**/OldChangeLog"/>
           <exclude name="**/Changes"/>
           <exclude name="**/contrib/zkperl/MANIFEST"/>
           <exclude name="**/zookeeper-contrib/zookeeper-contrib-zkperl/MANIFEST"/>
@@ -1838,10 +1901,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
           <exclude name="src/zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
           <exclude name="src/zookeeper-client/zookeeper-client-c/config**"/>
           <exclude name="src/zookeeper-client/zookeeper-client-c/src/hashtable/"/>
-          <exclude name="src/java/generated/.generated/"/>
-          <exclude name="src/java/test/checkstyle*.xml"/>
-          <exclude name="src/java/test/checkstyle*.xsl"/>
-          <exclude name="src/java/test/config/findbugs*.xml"/>
+          <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/**/*.vcproj"/>
           <exclude name="src/**/*.sln"/>
         </fileset>
@@ -1926,10 +1989,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
            <param name="-apidir" value="${jdiff.xml.dir}"/>
            <param name="-apiname" value="${name} ${version}"/>
          </doclet>
-         <packageset dir="${java.src.dir}">
+         <packageset dir="${java.server.src.dir}">
            <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}">
@@ -1951,10 +2020,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
 
      <target name="api-report" depends="api-xml">
        <mkdir dir="${jdiff.build.dir}"/>
-       <javadoc sourcepath="${java.src.dir}"
-                destdir="${jdiff.build.dir}"
+       <javadoc destdir="${jdiff.build.dir}"
                 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}"/>
@@ -1984,19 +2055,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="${src.dir}/java/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
+            dest="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
 
-       <bunzip2 src="${src.dir}/java/ant-eclipse-1.0.bin.tar.bz2"/>
+       <bunzip2 src="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2"/>
 
-       <untar src="${src.dir}/java/ant-eclipse-1.0.bin.tar"
-              dest="${src.dir}/java">
+       <untar src="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar"
+              dest="${java.common.resources.dir}">
          <patternset>
            <include name="lib/ant-eclipse-1.0-jvm1.2.jar"/>
          </patternset>
        </untar>
 
-       <delete file="${src.dir}/java/ant-eclipse-1.0.bin.tar" />
-       <delete file="${src.dir}/java/ant-eclipse-1.0.bin.tar.bz2" />
+       <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" />
      </target>
 
      <target name="eclipse"
@@ -2015,13 +2086,19 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
          </settings>
          <project name="${ant.project.name}" />
          <classpath>
-           <source path="${java.src.dir}"
+           <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="${test.src.dir}"
+           <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}"
                    output="${build.dir.eclipse-test-classes}" />
diff --git a/src/java/OldChangeLog b/src/java/OldChangeLog
deleted file mode 100644
index e69de29bb..000000000
--- a/src/java/OldChangeLog
+++ /dev/null
diff --git a/zookeeper-client/zookeeper-client-c/tests/zkServer.sh b/zookeeper-client/zookeeper-client-c/tests/zkServer.sh
index 4872fbad9..9c8473854 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
index ff0425a4e..ff0425a4e 100644
--- 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
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
index a4175e46c..a4175e46c 100644
--- 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
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
index 61d91083a..61d91083a 100644
--- 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
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
index 000594291..000594291 100644
--- 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
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
index af3303c60..af3303c60 100644
--- 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
diff --git a/src/java/main/org/apache/zookeeper/AsyncCallback.java b/zookeeper-common/src/main/java/org/apache/zookeeper/AsyncCallback.java
index f02a824ab..f02a824ab 100644
--- a/src/java/main/org/apache/zookeeper/AsyncCallback.java
+++ b/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
index 447a3ee8a..447a3ee8a 100644
--- a/src/java/main/org/apache/zookeeper/ClientCnxn.java
+++ b/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
index b67653141..b67653141 100644
--- a/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
+++ b/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
index 720619d89..720619d89 100644
--- a/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java
+++ b/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
index d56374dee..d56374dee 100644
--- a/src/java/main/org/apache/zookeeper/ClientWatchManager.java
+++ b/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
index 84f5be0e9..84f5be0e9 100644
--- a/src/java/main/org/apache/zookeeper/CreateMode.java
+++ b/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
index 51797a18d..51797a18d 100644
--- a/src/java/main/org/apache/zookeeper/Environment.java
+++ b/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
index bdf4203e0..bdf4203e0 100644
--- a/src/java/main/org/apache/zookeeper/KeeperException.java
+++ b/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
index c4975be19..c4975be19 100644
--- a/src/java/main/org/apache/zookeeper/Login.java
+++ b/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
index 70f76236e..70f76236e 100644
--- a/src/java/main/org/apache/zookeeper/MultiResponse.java
+++ b/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
index 801969a9a..801969a9a 100644
--- a/src/java/main/org/apache/zookeeper/MultiTransactionRecord.java
+++ b/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
index 1bc206101..1bc206101 100644
--- a/src/java/main/org/apache/zookeeper/Op.java
+++ b/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
index 45331d114..45331d114 100644
--- a/src/java/main/org/apache/zookeeper/OpResult.java
+++ b/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
index b82e3395d..b82e3395d 100644
--- a/src/java/main/org/apache/zookeeper/Quotas.java
+++ b/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
index d6f554955..d6f554955 100644
--- a/src/java/main/org/apache/zookeeper/SaslClientCallbackHandler.java
+++ b/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
index 9464f1ce3..9464f1ce3 100644
--- a/src/java/main/org/apache/zookeeper/ServerAdminClient.java
+++ b/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
index 246170e4d..246170e4d 100644
--- a/src/java/main/org/apache/zookeeper/Shell.java
+++ b/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
index 623c6d446..623c6d446 100644
--- a/src/java/main/org/apache/zookeeper/StatsTrack.java
+++ b/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
index b38d2c3bb..b38d2c3bb 100644
--- a/src/java/main/org/apache/zookeeper/Testable.java
+++ b/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
index d8f0e01a6..d8f0e01a6 100644
--- a/src/java/main/org/apache/zookeeper/Transaction.java
+++ b/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
index 1f5cf1aa2..1f5cf1aa2 100644
--- a/src/java/main/org/apache/zookeeper/Version.java
+++ b/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
index 851fc6c85..851fc6c85 100644
--- a/src/java/main/org/apache/zookeeper/WatchedEvent.java
+++ b/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
index 5c21485cd..5c21485cd 100644
--- a/src/java/main/org/apache/zookeeper/Watcher.java
+++ b/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
index e901832cf..e901832cf 100644
--- a/src/java/main/org/apache/zookeeper/ZKUtil.java
+++ b/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
index 09bc95c36..09bc95c36 100644
--- a/src/java/main/org/apache/zookeeper/ZooDefs.java
+++ b/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
index 3e46ee7f7..3e46ee7f7 100644
--- a/src/java/main/org/apache/zookeeper/ZooKeeper.java
+++ b/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
index 6ca538b5b..6ca538b5b 100644
--- a/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
+++ b/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
index 775d1a26d..775d1a26d 100644
--- a/src/java/main/org/apache/zookeeper/ZooKeeperTestable.java
+++ b/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
index 2584d3f87..2584d3f87 100644
--- a/src/java/main/org/apache/zookeeper/common/AtomicFileOutputStream.java
+++ b/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
index 16aea4ea4..16aea4ea4 100644
--- a/src/java/main/org/apache/zookeeper/common/IOUtils.java
+++ b/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
index 73053e02c..73053e02c 100644
--- a/src/java/main/org/apache/zookeeper/common/PathTrie.java
+++ b/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
index 2a6c7efab..2a6c7efab 100644
--- a/src/java/main/org/apache/zookeeper/common/PathUtils.java
+++ b/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
index 83e53f056..83e53f056 100644
--- a/src/java/main/org/apache/zookeeper/common/Time.java
+++ b/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
index 67484e4e0..67484e4e0 100644
--- a/src/java/main/org/apache/zookeeper/util/SecurityUtils.java
+++ b/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
index 7285a2b56..7285a2b56 100644
--- a/src/java/main/org/apache/zookeeper/version/util/VerGen.java
+++ b/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
index f5ba88f1f..f5ba88f1f 100644
--- a/src/java/lib/cobertura/README.txt
+++ b/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
index c28b238b8..c28b238b8 100644
--- a/src/java/lib/jdiff/zookeeper_3.1.1.xml
+++ b/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
index 6279e5206..6279e5206 100644
--- a/src/java/lib/log4j-1.2.17.LICENSE.txt
+++ b/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
index 315bd4979..315bd4979 100644
--- a/src/java/lib/slf4j-1.7.25.LICENSE.txt
+++ b/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
index 8d66a7e69..8d66a7e69 100644
--- a/src/java/test/org/apache/zookeeper/ClientReconnectTest.java
+++ b/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
index 37149ccaa..37149ccaa 100644
--- a/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java
+++ b/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
index bf145d024..bf145d024 100644
--- a/src/java/test/org/apache/zookeeper/JaasConfiguration.java
+++ b/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
index f4bb19a5a..f4bb19a5a 100644
--- a/src/java/test/org/apache/zookeeper/MockPacket.java
+++ b/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
index a03feb3df..a03feb3df 100644
--- a/src/java/test/org/apache/zookeeper/MultiResponseTest.java
+++ b/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
index 374956456..374956456 100644
--- a/src/java/test/org/apache/zookeeper/MultiTransactionRecordTest.java
+++ b/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
index 06f936104..06f936104 100644
--- a/src/java/test/org/apache/zookeeper/PortAssignment.java
+++ b/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
index eac070335..eac070335 100644
--- a/src/java/test/org/apache/zookeeper/SaslAuthTest.java
+++ b/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
index 27faa745b..27faa745b 100644
--- a/src/java/test/org/apache/zookeeper/ServerConfigTest.java
+++ b/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
index dd700560c..dd700560c 100644
--- a/src/java/test/org/apache/zookeeper/TestableZooKeeper.java
+++ b/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
index 607edbb53..607edbb53 100644
--- a/src/java/test/org/apache/zookeeper/VerGenTest.java
+++ b/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
index 9098fc47e..9098fc47e 100644
--- a/src/java/test/org/apache/zookeeper/ZKTestCase.java
+++ b/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
index 2cdc4cb6e..2cdc4cb6e 100644
--- a/src/java/test/org/apache/zookeeper/ZooKeeperTest.java
+++ b/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
index d93855693..d93855693 100644
--- a/src/java/test/org/apache/zookeeper/common/TimeTest.java
+++ b/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
index 88b8869ad..88b8869ad 100644
--- a/src/java/test/org/apache/zookeeper/test/ACLCountTest.java
+++ b/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
index 7307cbf0e..7307cbf0e 100644
--- a/src/java/test/org/apache/zookeeper/test/ACLRootTest.java
+++ b/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
index 793265c51..793265c51 100644
--- a/src/java/test/org/apache/zookeeper/test/ACLTest.java
+++ b/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
index ebfc96396..ebfc96396 100644
--- a/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java
+++ b/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
index 2dbe64455..2dbe64455 100644
--- a/src/java/test/org/apache/zookeeper/test/AsyncOps.java
+++ b/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
index c807d7288..c807d7288 100644
--- a/src/java/test/org/apache/zookeeper/test/AsyncOpsTest.java
+++ b/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
index 218203296..218203296 100644
--- a/src/java/test/org/apache/zookeeper/test/AsyncTest.java
+++ b/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
index cbd2b7700..cbd2b7700 100644
--- a/src/java/test/org/apache/zookeeper/test/AtomicFileOutputStreamTest.java
+++ b/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
index 60e3453bb..60e3453bb 100644
--- a/src/java/test/org/apache/zookeeper/test/AuthTest.java
+++ b/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
index 6d74e54b5..6d74e54b5 100644
--- a/src/java/test/org/apache/zookeeper/test/BufferSizeTest.java
+++ b/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
index e60ea049a..e60ea049a 100644
--- a/src/java/test/org/apache/zookeeper/test/ChrootAsyncTest.java
+++ b/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
index e0286e16e..e0286e16e 100644
--- a/src/java/test/org/apache/zookeeper/test/ChrootClientTest.java
+++ b/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
index 3df068bef..3df068bef 100644
--- a/src/java/test/org/apache/zookeeper/test/ChrootTest.java
+++ b/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
index 7de4f3c32..7de4f3c32 100644
--- a/src/java/test/org/apache/zookeeper/test/ClientBase.java
+++ b/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
index 025ccbe4c..025ccbe4c 100644
--- a/src/java/test/org/apache/zookeeper/test/ClientHammerTest.java
+++ b/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
index 95c55e271..95c55e271 100644
--- a/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java
+++ b/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
index d0b6b43f4..d0b6b43f4 100644
--- a/src/java/test/org/apache/zookeeper/test/ClientRetry.java
+++ b/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
index 9dc48619e..9dc48619e 100644
--- a/src/java/test/org/apache/zookeeper/test/ClientTest.java
+++ b/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
index a169b7ba7..a169b7ba7 100644
--- a/src/java/test/org/apache/zookeeper/test/ConnectStringParserTest.java
+++ b/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
index a3b838a68..a3b838a68 100644
--- a/src/java/test/org/apache/zookeeper/test/CreateModeTest.java
+++ b/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
index 619bdc68e..619bdc68e 100644
--- a/src/java/test/org/apache/zookeeper/test/DisconnectableZooKeeper.java
+++ b/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
index e81b7f453..e81b7f453 100644
--- a/src/java/test/org/apache/zookeeper/test/DisconnectedWatcherTest.java
+++ b/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
index e6a982615..e6a982615 100644
--- a/src/java/test/org/apache/zookeeper/test/EventTypeTest.java
+++ b/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
index 1731e6e80..1731e6e80 100644
--- a/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java
+++ b/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
index 0ecac6e6c..0ecac6e6c 100644
--- a/src/java/test/org/apache/zookeeper/test/FLEPredicateTest.java
+++ b/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
index a7cecf64d..a7cecf64d 100644
--- a/src/java/test/org/apache/zookeeper/test/FLERestartTest.java
+++ b/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
index 6281a57d9..6281a57d9 100644
--- a/src/java/test/org/apache/zookeeper/test/FLETest.java
+++ b/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
index e8a8cf792..e8a8cf792 100644
--- a/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java
+++ b/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
index acd05d669..acd05d669 100644
--- a/src/java/test/org/apache/zookeeper/test/FollowerResyncConcurrencyTest.java
+++ b/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
index fa6b4a30b..fa6b4a30b 100644
--- a/src/java/test/org/apache/zookeeper/test/FollowerTest.java
+++ b/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
index 49d90f76e..49d90f76e 100644
--- a/src/java/test/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java
+++ b/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
index bc8d0713d..bc8d0713d 100644
--- a/src/java/test/org/apache/zookeeper/test/FourLetterWordsTest.java
+++ b/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
index 515cbdcc9..515cbdcc9 100644
--- a/src/java/test/org/apache/zookeeper/test/FourLetterWordsWhiteListTest.java
+++ b/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
index e41fffe08..e41fffe08 100644
--- a/src/java/test/org/apache/zookeeper/test/GetChildren2Test.java
+++ b/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
index 051da1330..051da1330 100644
--- a/src/java/test/org/apache/zookeeper/test/HierarchicalQuorumTest.java
+++ b/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
index 9a01a6587..9a01a6587 100644
--- a/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java
+++ b/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
index c5a7b4fca..c5a7b4fca 100644
--- a/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java
+++ b/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
index f67c67c77..f67c67c77 100644
--- a/src/java/test/org/apache/zookeeper/test/JMXEnv.java
+++ b/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
index 55dc85290..55dc85290 100644
--- a/src/java/test/org/apache/zookeeper/test/KeeperStateTest.java
+++ b/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
index de266988f..de266988f 100644
--- a/src/java/test/org/apache/zookeeper/test/LENonTerminateTest.java
+++ b/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
index 0fd343022..0fd343022 100644
--- a/src/java/test/org/apache/zookeeper/test/LETest.java
+++ b/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
index 9135307f2..9135307f2 100644
--- a/src/java/test/org/apache/zookeeper/test/LoadFromLogNoServerTest.java
+++ b/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
index dac39109a..dac39109a 100644
--- a/src/java/test/org/apache/zookeeper/test/LoadFromLogTest.java
+++ b/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
index 0a31ac9b7..0a31ac9b7 100644
--- a/src/java/test/org/apache/zookeeper/test/MaxCnxnsTest.java
+++ b/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
index 0277c2306..0277c2306 100644
--- a/src/java/test/org/apache/zookeeper/test/MultiTransactionTest.java
+++ b/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
index d61a3e2d6..d61a3e2d6 100644
--- a/src/java/test/org/apache/zookeeper/test/NioNettySuiteBase.java
+++ b/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
index 96e7b0caa..96e7b0caa 100644
--- a/src/java/test/org/apache/zookeeper/test/NioNettySuiteHammerTest.java
+++ b/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
index eaf17b945..eaf17b945 100644
--- a/src/java/test/org/apache/zookeeper/test/NioNettySuiteTest.java
+++ b/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
index 133d92075..133d92075 100644
--- a/src/java/test/org/apache/zookeeper/test/NonRecoverableErrorTest.java
+++ b/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
index 8f1a1bb0f..8f1a1bb0f 100644
--- a/src/java/test/org/apache/zookeeper/test/NullDataTest.java
+++ b/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
index 465df9838..465df9838 100644
--- a/src/java/test/org/apache/zookeeper/test/OOMTest.java
+++ b/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
index ce21ab825..ce21ab825 100644
--- a/src/java/test/org/apache/zookeeper/test/OSMXBeanTest.java
+++ b/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
index 9d373fc99..9d373fc99 100644
--- a/src/java/test/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java
+++ b/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
index 123ba0be0..123ba0be0 100644
--- a/src/java/test/org/apache/zookeeper/test/ObserverLETest.java
+++ b/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
index 03b400092..03b400092 100644
--- a/src/java/test/org/apache/zookeeper/test/ObserverQuorumHammerTest.java
+++ b/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
index f7a82c6b2..f7a82c6b2 100644
--- a/src/java/test/org/apache/zookeeper/test/ObserverTest.java
+++ b/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
index 49cff350f..49cff350f 100644
--- a/src/java/test/org/apache/zookeeper/test/QuorumBase.java
+++ b/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
index e5b377eab..e5b377eab 100644
--- a/src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java
+++ b/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
index bef1a33a9..bef1a33a9 100644
--- a/src/java/test/org/apache/zookeeper/test/QuorumQuotaTest.java
+++ b/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
index 6f827ec7d..6f827ec7d 100644
--- a/src/java/test/org/apache/zookeeper/test/QuorumTest.java
+++ b/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
index 1f2dbbc7e..1f2dbbc7e 100644
--- a/src/java/test/org/apache/zookeeper/test/QuorumUtil.java
+++ b/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
index 6e46edc3e..6e46edc3e 100644
--- a/src/java/test/org/apache/zookeeper/test/QuorumZxidSyncTest.java
+++ b/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
index 6f281d950..6f281d950 100644
--- a/src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java
+++ b/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
index c084a68fc..c084a68fc 100644
--- a/src/java/test/org/apache/zookeeper/test/RecoveryTest.java
+++ b/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
index f714a2caf..f714a2caf 100644
--- a/src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java
+++ b/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
index 65cc0e2f3..65cc0e2f3 100644
--- a/src/java/test/org/apache/zookeeper/test/RestoreCommittedLogTest.java
+++ b/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
index 9e28278f5..9e28278f5 100644
--- a/src/java/test/org/apache/zookeeper/test/SaslAuthDesignatedClientTest.java
+++ b/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
index aa30870da..aa30870da 100644
--- a/src/java/test/org/apache/zookeeper/test/SaslAuthDesignatedServerTest.java
+++ b/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
index 5291141cf..5291141cf 100644
--- a/src/java/test/org/apache/zookeeper/test/SaslAuthFailDesignatedClientTest.java
+++ b/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
index 2b00d862d..2b00d862d 100644
--- a/src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java
+++ b/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
index 33a505ea2..33a505ea2 100644
--- a/src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java
+++ b/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
index 98be0be33..98be0be33 100644
--- a/src/java/test/org/apache/zookeeper/test/SaslAuthMissingClientConfigTest.java
+++ b/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
index 8213abca4..8213abca4 100644
--- a/src/java/test/org/apache/zookeeper/test/SaslClientTest.java
+++ b/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
index 3a0b2ee60..3a0b2ee60 100644
--- a/src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java
+++ b/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
index 891b0f057..891b0f057 100644
--- a/src/java/test/org/apache/zookeeper/test/SessionTest.java
+++ b/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
index 09badae12..09badae12 100644
--- a/src/java/test/org/apache/zookeeper/test/SessionTimeoutTest.java
+++ b/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
index 614a93d15..614a93d15 100644
--- a/src/java/test/org/apache/zookeeper/test/SledgeHammer.java
+++ b/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
index f3054238b..f3054238b 100644
--- a/src/java/test/org/apache/zookeeper/test/StandaloneTest.java
+++ b/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
index f4c01aa5c..f4c01aa5c 100644
--- a/src/java/test/org/apache/zookeeper/test/StatTest.java
+++ b/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
index a4107a5ad..a4107a5ad 100644
--- a/src/java/test/org/apache/zookeeper/test/StaticHostProviderTest.java
+++ b/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
index 4fb006ac6..4fb006ac6 100644
--- a/src/java/test/org/apache/zookeeper/test/SyncCallTest.java
+++ b/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
index a73d6df35..a73d6df35 100644
--- a/src/java/test/org/apache/zookeeper/test/TestHammer.java
+++ b/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
index fa08b8222..fa08b8222 100644
--- a/src/java/test/org/apache/zookeeper/test/TestUtils.java
+++ b/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
index 66ff63d0f..66ff63d0f 100644
--- a/src/java/test/org/apache/zookeeper/test/TruncateTest.java
+++ b/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
index b8db0da88..b8db0da88 100644
--- a/src/java/test/org/apache/zookeeper/test/UpgradeTest.java
+++ b/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
index eed02c584..eed02c584 100644
--- a/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
+++ b/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
index 0eaea677d..0eaea677d 100644
--- a/src/java/test/org/apache/zookeeper/test/WatchedEventTest.java
+++ b/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
index a6c62e4bb..a6c62e4bb 100644
--- a/src/java/test/org/apache/zookeeper/test/WatcherFuncTest.java
+++ b/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
index 1c06690cd..1c06690cd 100644
--- a/src/java/test/org/apache/zookeeper/test/WatcherTest.java
+++ b/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
index c213b2a26..c213b2a26 100644
--- a/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
+++ b/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
index fbf09b34f..fbf09b34f 100644
--- a/src/java/test/org/apache/zookeeper/test/ZooKeeperQuotaTest.java
+++ b/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
index 0bbba61d5..0bbba61d5 100644
--- a/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java
+++ b/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
index cad819594..cad819594 100644
--- a/src/java/test/bin/check_compatibility.py
+++ b/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
index 5f9e93ba2..5f9e93ba2 100644
--- a/src/java/test/checkstyle-noframes-sorted.xsl
+++ b/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
index a5d51821a..a5d51821a 100644
--- a/src/java/test/checkstyle.xml
+++ b/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
index 4f05bc1cb..4f05bc1cb 100644
--- a/src/java/test/data/buffersize/create/version-2/log.1
+++ b/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
index 49b512e65..49b512e65 100644
--- a/src/java/test/data/buffersize/create/version-2/snapshot.0
+++ b/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
index 8586f16bf..8586f16bf 100644
--- a/src/java/test/data/buffersize/set/version-2/log.1
+++ b/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
index 49b512e65..49b512e65 100644
--- a/src/java/test/data/buffersize/set/version-2/snapshot.0
+++ b/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
index 2f145a683..2f145a683 100644
--- a/src/java/test/data/buffersize/snapshot/version-2/log.1
+++ b/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
index 49b512e65..49b512e65 100644
--- a/src/java/test/data/buffersize/snapshot/version-2/snapshot.0
+++ b/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
index 59dfa701a..59dfa701a 100644
--- a/src/java/test/data/buffersize/snapshot/version-2/snapshot.2
+++ b/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
index 9dc15ae8d..9dc15ae8d 100644
--- a/src/java/test/data/invalidsnap/version-2/log.1
+++ b/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
index 3bb868e26..3bb868e26 100644
--- a/src/java/test/data/invalidsnap/version-2/log.274
+++ b/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
index 5385be516..5385be516 100644
--- a/src/java/test/data/invalidsnap/version-2/log.42
+++ b/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
index 4ee0a98a4..4ee0a98a4 100644
--- a/src/java/test/data/invalidsnap/version-2/log.63b
+++ b/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
index 49b512e65..49b512e65 100644
--- a/src/java/test/data/invalidsnap/version-2/snapshot.0
+++ b/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
index 71f32a5dc..71f32a5dc 100644
--- a/src/java/test/data/invalidsnap/version-2/snapshot.272
+++ b/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
index 3146f5656..3146f5656 100644
--- a/src/java/test/data/invalidsnap/version-2/snapshot.273
+++ b/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
index cf9e38985..cf9e38985 100644
--- a/src/java/test/data/invalidsnap/version-2/snapshot.639
+++ b/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
index 26dc5f665..26dc5f665 100644
--- a/src/java/test/data/invalidsnap/version-2/snapshot.83f
+++ b/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
index 43ec7c4c4..43ec7c4c4 100644
--- a/src/java/test/data/kerberos/minikdc-krb5.conf
+++ b/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
index 20c8d7759..20c8d7759 100644
--- a/src/java/test/data/kerberos/minikdc.ldiff
+++ b/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
index 00655f15f..00655f15f 100644
--- a/src/java/test/data/upgrade/log.100000001
+++ b/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
index 83fa6973e..83fa6973e 100644
--- a/src/java/test/data/upgrade/log.100001bf0
+++ b/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
index 56f90157f..56f90157f 100644
--- a/src/java/test/data/upgrade/snapshot.100000000
+++ b/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
index 0010d1eb8..0010d1eb8 100644
--- a/src/java/test/data/upgrade/snapshot.100001bec
+++ b/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
index c023f4f4f..c023f4f4f 100644
--- a/src/java/test/config/findbugsExcludeFile.xml
+++ b/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
index e155769f2..e155769f2 100755
--- a/src/java/test/bin/test-github-pr.sh
+++ b/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
index c467e63ab..c467e63ab 100644
--- a/src/java/test/bin/test-patch.properties
+++ b/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
index d42789b17..d42789b17 100755
--- a/src/java/test/bin/test-patch.sh
+++ b/zookeeper-common/src/test/resources/test-patch.sh
diff --git a/zookeeper-contrib/build-contrib.xml b/zookeeper-contrib/build-contrib.xml
index ed54b2297..a30abd6f3 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}/src/java/lib"/>
+  <property name="lib.dir"  location="${zk.root}/zookeeper-common/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}/src/java/lib">
+    <fileset dir="${zk.root}/zookeeper-common/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 6f34a9204..9d510e400 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}/src/java/lib" includes="*.jar" />
+      <zipgroupfileset dir="${zk.root}/zookeeper-common/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 433be3ef7..50186edb7 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}/src/java/lib">
+        <fileset dir="${zk.root}/zookeeper-common/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}/src/java/lib" prefix="lib" includes="**/*.jar" />
+        <tarfileset dir="${zk.root}/zookeeper-common/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 bff85f33e..629927920 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 51d508f69..35b348e03 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 e69de29bb..000000000
--- a/zookeeper-it/.empty
+++ /dev/null
diff --git a/src/java/systest/README.txt b/zookeeper-it/README.txt
index 8a2985c2e..8a2985c2e 100644
--- a/src/java/systest/README.txt
+++ b/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
index 421f699a7..421f699a7 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/BaseSysTest.java
+++ b/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
index 8a96c574e..8a96c574e 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/DuplicateNameException.java
+++ b/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
index b6ac04aa3..b6ac04aa3 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java
+++ b/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
index 9b980dec5..9b980dec5 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/Instance.java
+++ b/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
index 244e4d857..244e4d857 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/InstanceContainer.java
+++ b/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
index 93c51b8b7..93c51b8b7 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/InstanceManager.java
+++ b/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
index 1ac1390de..1ac1390de 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/NoAssignmentException.java
+++ b/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
index b8aabccf7..b8aabccf7 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/NoAvailableContainers.java
+++ b/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
index 95aebc8e6..95aebc8e6 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java
+++ b/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
index a8cd3e530..a8cd3e530 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/SimpleClient.java
+++ b/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
index 9cdf4d912..9cdf4d912 100644
--- a/src/java/systest/org/apache/zookeeper/test/system/SimpleSysTest.java
+++ b/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 f9d9eaeeb..651b3d379 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}/src/java/lib">
+    <fileset dir="${zk.root}/zookeeper-common/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 a22fd3034..b15238019 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 a22fd3034..b15238019 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
index 37a9f0a94..37a9f0a94 100644
--- a/src/java/main/org/apache/zookeeper/JLineZNodeCompletor.java
+++ b/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
index 986d69dd7..986d69dd7 100644
--- a/src/java/main/org/apache/zookeeper/jmx/CommonNames.java
+++ b/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
index 0fcfe2fc0..0fcfe2fc0 100644
--- a/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java
+++ b/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
index 2f04281d7..2f04281d7 100644
--- a/src/java/main/org/apache/zookeeper/jmx/ManagedUtil.java
+++ b/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
index 1e87d92e1..1e87d92e1 100644
--- a/src/java/main/org/apache/zookeeper/jmx/ZKMBeanInfo.java
+++ b/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
index e5ac120ac..e5ac120ac 100644
--- a/src/java/main/org/apache/zookeeper/server/ByteBufferInputStream.java
+++ b/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
index a2fcc956b..a2fcc956b 100644
--- a/src/java/main/org/apache/zookeeper/server/ByteBufferOutputStream.java
+++ b/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
index 58917e05f..58917e05f 100644
--- a/src/java/main/org/apache/zookeeper/server/ConnectionBean.java
+++ b/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
index 8bdec9a02..8bdec9a02 100644
--- a/src/java/main/org/apache/zookeeper/server/ConnectionMXBean.java
+++ b/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
index 8efdaf8bd..8efdaf8bd 100644
--- a/src/java/main/org/apache/zookeeper/server/DataNode.java
+++ b/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
index f2537f35e..f2537f35e 100644
--- a/src/java/main/org/apache/zookeeper/server/DataTree.java
+++ b/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
index 433c13fbb..433c13fbb 100644
--- a/src/java/main/org/apache/zookeeper/server/DataTreeBean.java
+++ b/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
index 0048b6b27..0048b6b27 100644
--- a/src/java/main/org/apache/zookeeper/server/DataTreeMXBean.java
+++ b/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
index e8dbeb79a..e8dbeb79a 100644
--- a/src/java/main/org/apache/zookeeper/server/DatadirCleanupManager.java
+++ b/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
index 02d96cb51..02d96cb51 100644
--- a/src/java/main/org/apache/zookeeper/server/ExitCode.java
+++ b/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
index 65f7ac034..65f7ac034 100644
--- a/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java
+++ b/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
index c5274e589..c5274e589 100644
--- a/src/java/main/org/apache/zookeeper/server/LogFormatter.java
+++ b/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
index 24cc7b466..24cc7b466 100644
--- a/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
+++ b/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
index 67a850782..67a850782 100644
--- a/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
+++ b/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
index 271fc19eb..271fc19eb 100644
--- a/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
+++ b/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
index ddfe15191..ddfe15191 100644
--- a/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
+++ b/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
index 72d724e0b..72d724e0b 100644
--- a/src/java/main/org/apache/zookeeper/server/ObserverBean.java
+++ b/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
index 825c22ada..825c22ada 100644
--- a/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
+++ b/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
index 09cffbaf1..09cffbaf1 100644
--- a/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java
+++ b/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
index 384d23ab0..384d23ab0 100644
--- a/src/java/main/org/apache/zookeeper/server/ReferenceCountedACLCache.java
+++ b/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
index 92eb3ccd0..92eb3ccd0 100644
--- a/src/java/main/org/apache/zookeeper/server/Request.java
+++ b/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
index 9c9e5bdc0..9c9e5bdc0 100644
--- a/src/java/main/org/apache/zookeeper/server/RequestProcessor.java
+++ b/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
index dfa1d74e8..dfa1d74e8 100644
--- a/src/java/main/org/apache/zookeeper/server/ServerCnxn.java
+++ b/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
index 92d793f79..92d793f79 100644
--- a/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java
+++ b/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
index c0dee3c57..c0dee3c57 100644
--- a/src/java/main/org/apache/zookeeper/server/ServerConfig.java
+++ b/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
index f41aaa53f..f41aaa53f 100644
--- a/src/java/main/org/apache/zookeeper/server/ServerStats.java
+++ b/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
index 3535e1b5c..3535e1b5c 100644
--- a/src/java/main/org/apache/zookeeper/server/SessionTracker.java
+++ b/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
index cdaaf2beb..cdaaf2beb 100644
--- a/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java
+++ b/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
index 1b131a304..1b131a304 100644
--- a/src/java/main/org/apache/zookeeper/server/SnapshotFormatter.java
+++ b/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
index e2584ee58..e2584ee58 100644
--- a/src/java/main/org/apache/zookeeper/server/Stats.java
+++ b/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
index 317b4acdf..317b4acdf 100644
--- a/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java
+++ b/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
index 66cc31ca3..66cc31ca3 100644
--- a/src/java/main/org/apache/zookeeper/server/TraceFormatter.java
+++ b/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
index aa58e63d4..aa58e63d4 100644
--- a/src/java/main/org/apache/zookeeper/server/UnimplementedRequestProcessor.java
+++ b/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
index 76e37f2a3..76e37f2a3 100644
--- a/src/java/main/org/apache/zookeeper/server/WatchManager.java
+++ b/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
index 75f404850..75f404850 100644
--- a/src/java/main/org/apache/zookeeper/server/ZKDatabase.java
+++ b/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
index c8de809d8..c8de809d8 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperCriticalThread.java
+++ b/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
index dd6ee8ff9..dd6ee8ff9 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperSaslServer.java
+++ b/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
index 6e7dd2b58..6e7dd2b58 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
+++ b/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
index cfd471188..cfd471188 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java
+++ b/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
index b1c4c8c37..b1c4c8c37 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerListener.java
+++ b/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
index 08f493405..08f493405 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerListenerImpl.java
+++ b/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
index ee46d1862..ee46d1862 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMXBean.java
+++ b/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
index ef7621c3e..ef7621c3e 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
+++ b/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
index 499cacb25..499cacb25 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperServerShutdownHandler.java
+++ b/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
index cf6cecf27..cf6cecf27 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooKeeperThread.java
+++ b/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
index 946a4bf73..946a4bf73 100644
--- a/src/java/main/org/apache/zookeeper/server/ZooTrace.java
+++ b/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
index dd6e32fde..dd6e32fde 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/AuthenticationProvider.java
+++ b/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
index 2427e7a4b..2427e7a4b 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java
+++ b/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
index 955c728b6..955c728b6 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/DigestLoginModule.java
+++ b/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
index 192dc0603..192dc0603 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/IPAuthenticationProvider.java
+++ b/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
index 01d1f6664..01d1f6664 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/KerberosName.java
+++ b/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
index 855971beb..855971beb 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
+++ b/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
index 063304f44..063304f44 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/SASLAuthenticationProvider.java
+++ b/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
index 9f53a4d1c..9f53a4d1c 100644
--- a/src/java/main/org/apache/zookeeper/server/auth/SaslServerCallbackHandler.java
+++ b/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
index 89a5d7eff..89a5d7eff 100644
--- a/src/java/main/org/apache/zookeeper/server/package.html
+++ b/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
index 49fde24e7..49fde24e7 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/FilePadding.java
+++ b/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
index 16872779a..16872779a 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/FileSnap.java
+++ b/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
index 95462e7d8..95462e7d8 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
+++ b/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
index 77b946dac..77b946dac 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java
+++ b/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
index c964afc6d..c964afc6d 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/SnapShot.java
+++ b/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
index 141283f21..141283f21 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/TxnLog.java
+++ b/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
index 8e3ddf8b0..8e3ddf8b0 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/TxnLogToolkit.java
+++ b/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
index 094500a9f..094500a9f 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParser.java
+++ b/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
index a774a24ac..a774a24ac 100644
--- a/src/java/main/org/apache/zookeeper/server/persistence/Util.java
+++ b/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
index 8e7e472e1..8e7e472e1 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java
+++ b/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
index d32a725ab..d32a725ab 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java
+++ b/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
index 3419f0883..3419f0883 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java
+++ b/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
index 899063853..899063853 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Election.java
+++ b/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
index 91b6af861..91b6af861 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java
+++ b/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
index 27c33757b..27c33757b 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
+++ b/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
index 43d7cb7b9..43d7cb7b9 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/FollowerBean.java
+++ b/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
index 45c7fd8e2..45c7fd8e2 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/FollowerMXBean.java
+++ b/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
index 8013b656f..8013b656f 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java
+++ b/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
index 1fe687bb7..1fe687bb7 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java
+++ b/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
index ed715fdd4..ed715fdd4 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
+++ b/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
index 486256780..486256780 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LeaderBean.java
+++ b/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
index a66ee789e..a66ee789e 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java
+++ b/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
index 7c20a58ca..7c20a58ca 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LeaderElectionBean.java
+++ b/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
index 406d153c9..406d153c9 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LeaderElectionMXBean.java
+++ b/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
index 7a1a439fa..7a1a439fa 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LeaderMXBean.java
+++ b/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
index e10cc49ee..e10cc49ee 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java
+++ b/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
index 1645cda4a..1645cda4a 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
+++ b/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
index 973950d50..973950d50 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
+++ b/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
index 72f007eb7..72f007eb7 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LearnerSessionTracker.java
+++ b/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
index bfbc9a8fd..bfbc9a8fd 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LearnerSyncRequest.java
+++ b/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
index a1744ea60..a1744ea60 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java
+++ b/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
index 0d9fa70be..0d9fa70be 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java
+++ b/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
index eedf308c0..eedf308c0 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/LocalPeerMXBean.java
+++ b/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
index ded4a2452..ded4a2452 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Observer.java
+++ b/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
index 2c1799ab5..2c1799ab5 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ObserverMXBean.java
+++ b/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
index c9c537088..c9c537088 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java
+++ b/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
index f02494810..f02494810 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java
+++ b/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
index 641262e10..641262e10 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java
+++ b/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
index 2f3a9c72c..2f3a9c72c 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ProposalStats.java
+++ b/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
index ef4036aae..ef4036aae 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumBean.java
+++ b/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
index ec6be4a2a..ec6be4a2a 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
+++ b/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
index 2edce68d9..2edce68d9 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumMXBean.java
+++ b/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
index 267f89ed2..267f89ed2 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
+++ b/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
index 83d41b34f..83d41b34f 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
+++ b/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
index 156c43981..156c43981 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java
+++ b/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
index b6c62e442..b6c62e442 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumStats.java
+++ b/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
index 93088dd28..93088dd28 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/QuorumZooKeeperServer.java
+++ b/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
index a2b6fe3c7..a2b6fe3c7 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyBean.java
+++ b/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
index dd4ad4529..dd4ad4529 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyRequestProcessor.java
+++ b/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
index c9950cc50..c9950cc50 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ReadOnlyZooKeeperServer.java
+++ b/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
index 5841f6c52..5841f6c52 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java
+++ b/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
index 1d2ec6b0a..1d2ec6b0a 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/RemotePeerMXBean.java
+++ b/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
index 7f81a5ad8..7f81a5ad8 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java
+++ b/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
index 281c05bc0..281c05bc0 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ServerBean.java
+++ b/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
index df52aea70..df52aea70 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/ServerMXBean.java
+++ b/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
index aaaa4f869..aaaa4f869 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/StateSummary.java
+++ b/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
index aca9a9a21..aca9a9a21 100644
--- a/src/java/main/org/apache/zookeeper/server/quorum/Vote.java
+++ b/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
index 0af891c55..0af891c55 100644
--- 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
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
index b26a54a81..b26a54a81 100644
--- 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
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
index 8bfa394de..8bfa394de 100644
--- 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
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
index af7125748..af7125748 100644
--- 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
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
index e9de8f00a..e9de8f00a 100644
--- 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
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
index 8c76d3e37..8c76d3e37 100644
--- 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
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
index 1aa2b3292..1aa2b3292 100644
--- 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
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
index 3e71bb177..3e71bb177 100644
--- 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
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
index 9993f914a..9993f914a 100644
--- 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
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
index 8f9b5732b..8f9b5732b 100644
--- 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
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
index 66491296e..66491296e 100644
--- 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
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
index 8c4fda02f..8c4fda02f 100644
--- a/src/java/main/org/apache/zookeeper/server/upgrade/DataNodeV1.java
+++ b/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
index 678f4c6c9..678f4c6c9 100644
--- a/src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java
+++ b/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
index 8d6c0ab2c..8d6c0ab2c 100644
--- a/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeMain.java
+++ b/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
index 8cfbd93d7..8cfbd93d7 100644
--- a/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java
+++ b/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
index dcbd313e6..dcbd313e6 100644
--- a/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java
+++ b/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
index 509bc305e..509bc305e 100644
--- a/src/java/main/org/apache/zookeeper/server/util/KerberosUtil.java
+++ b/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
index 240a5be52..240a5be52 100644
--- a/src/java/main/org/apache/zookeeper/server/util/OSMXBean.java
+++ b/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
index f81d27047..f81d27047 100644
--- a/src/java/main/org/apache/zookeeper/server/util/Profiler.java
+++ b/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
index ebb30bb90..ebb30bb90 100644
--- a/src/java/main/org/apache/zookeeper/server/util/SerializeUtils.java
+++ b/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
index 39e076a27..39e076a27 100644
--- a/src/java/main/org/apache/zookeeper/server/util/ZxidUtils.java
+++ b/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
index 867ac6d84..f042b5cac 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
index 08388e84e..08388e84e 100644
--- a/src/NOTICE.txt
+++ b/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
index 1cdc44c21..1cdc44c21 100644
--- a/src/java/lib/jline-0.9.94.LICENSE.txt
+++ b/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
index 68999471d..68999471d 100644
--- a/src/lastRevision.bat
+++ b/zookeeper-server/src/main/resources/lastRevision.bat
diff --git a/src/lastRevision.sh b/zookeeper-server/src/main/resources/lastRevision.sh
index 0690c7da9..0690c7da9 100755
--- a/src/lastRevision.sh
+++ b/zookeeper-server/src/main/resources/lastRevision.sh
diff --git a/src/java/main/overview.html b/zookeeper-server/src/main/resources/overview.html
index db9b16f0f..db9b16f0f 100644
--- a/src/java/main/overview.html
+++ b/zookeeper-server/src/main/resources/overview.html
diff --git a/src/pom.template b/zookeeper-server/src/main/resources/pom.template
index a02c0b3d2..a02c0b3d2 100644
--- a/src/pom.template
+++ b/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
index 2b7fb4697..2b7fb4697 100644
--- a/src/java/test/org/apache/zookeeper/server/CRCTest.java
+++ b/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
index 628976604..628976604 100644
--- a/src/java/test/org/apache/zookeeper/server/DataNodeTest.java
+++ b/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
index a484cf58e..a484cf58e 100644
--- a/src/java/test/org/apache/zookeeper/server/DataTreeTest.java
+++ b/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
index 287c384ef..287c384ef 100644
--- a/src/java/test/org/apache/zookeeper/server/DataTreeUnitTest.java
+++ b/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
index 6b2f45f72..6b2f45f72 100644
--- a/src/java/test/org/apache/zookeeper/server/DatadirCleanupManagerTest.java
+++ b/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
index fd850e7d0..fd850e7d0 100644
--- a/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java
+++ b/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
index 3a661647a..3a661647a 100644
--- a/src/java/test/org/apache/zookeeper/server/InvalidSnapCountTest.java
+++ b/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
index 97ad7923e..97ad7923e 100644
--- a/src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java
+++ b/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
index 53ad1f691..53ad1f691 100644
--- a/src/java/test/org/apache/zookeeper/server/MockNIOServerCnxn.java
+++ b/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
index bdee20f5f..bdee20f5f 100644
--- a/src/java/test/org/apache/zookeeper/server/NIOServerCnxnTest.java
+++ b/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
index 52265c660..52265c660 100644
--- a/src/java/test/org/apache/zookeeper/server/NettyServerCnxnTest.java
+++ b/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
index d86cf2a7f..d86cf2a7f 100644
--- a/src/java/test/org/apache/zookeeper/server/PrepRequestProcessorTest.java
+++ b/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
index 1685a5bba..1685a5bba 100644
--- a/src/java/test/org/apache/zookeeper/server/PurgeTxnTest.java
+++ b/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
index 795472f14..795472f14 100644
--- a/src/java/test/org/apache/zookeeper/server/ReferenceCountedACLCacheTest.java
+++ b/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
index 43982322d..43982322d 100644
--- a/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java
+++ b/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
index 0dfdcfe7a..0dfdcfe7a 100644
--- a/src/java/test/org/apache/zookeeper/server/ServerCnxnFactoryAccessor.java
+++ b/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
index 89c78f987..89c78f987 100644
--- a/src/java/test/org/apache/zookeeper/server/ServerStatsTest.java
+++ b/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
index f42710292..f42710292 100644
--- a/src/java/test/org/apache/zookeeper/server/SessionTrackerTest.java
+++ b/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
index f19469b17..f19469b17 100644
--- a/src/java/test/org/apache/zookeeper/server/ToStringTest.java
+++ b/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
index 2ffb91ef4..2ffb91ef4 100644
--- a/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
+++ b/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
index 9435711b3..9435711b3 100644
--- a/src/java/test/org/apache/zookeeper/server/ZooKeeperServerStartupTest.java
+++ b/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
index 2d7aad17f..2d7aad17f 100644
--- a/src/java/test/org/apache/zookeeper/server/ZooKeeperServerTest.java
+++ b/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
index 4db02c738..4db02c738 100644
--- a/src/java/test/org/apache/zookeeper/server/ZooKeeperThreadTest.java
+++ b/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
index 281f9eb04..281f9eb04 100644
--- a/src/java/test/org/apache/zookeeper/server/ZxidRolloverTest.java
+++ b/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
index 122459e85..122459e85 100644
--- a/src/java/test/org/apache/zookeeper/server/persistence/FileTxnLogTest.java
+++ b/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
index 0c2da9c4d..0c2da9c4d 100644
--- a/src/java/test/org/apache/zookeeper/server/persistence/FileTxnSnapLogTest.java
+++ b/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
index ee4dc061c..ee4dc061c 100644
--- a/src/java/test/org/apache/zookeeper/server/persistence/TxnLogToolkitCliParserTest.java
+++ b/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
index da99b5c9e..da99b5c9e 100644
--- a/src/java/test/org/apache/zookeeper/server/persistence/TxnLogToolkitTest.java
+++ b/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
index a82a728e2..a82a728e2 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/CnxManagerTest.java
+++ b/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
index c34f243c2..c34f243c2 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/EphemeralNodeDeletionTest.java
+++ b/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
index 2d3ad5cbc..2d3ad5cbc 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLEBackwardElectionRoundTest.java
+++ b/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
index f1c04cad7..f1c04cad7 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLECompatibilityTest.java
+++ b/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
index ffc7ab10d..ffc7ab10d 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLEDontCareTest.java
+++ b/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
index 190785c42..190785c42 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLELostMessageTest.java
+++ b/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
index 1f0bca3d9..1f0bca3d9 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/FLETestUtils.java
+++ b/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
index 0b479521f..0b479521f 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/LeaderBeanTest.java
+++ b/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
index 0f6a098e5..0f6a098e5 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/LeaderWithObserverTest.java
+++ b/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
index fd08d2133..fd08d2133 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/LearnerTest.java
+++ b/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
index 1f7197922..1f7197922 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/ProposalStatsTest.java
+++ b/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
index 9917cfc73..9917cfc73 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/QuorumCnxManagerTest.java
+++ b/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
index 714525cb5..714525cb5 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
+++ b/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
index 31dbc415b..31dbc415b 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java
+++ b/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
index 74713813d..74713813d 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/WatchLeakTest.java
+++ b/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
index 4f831e833..4f831e833 100644
--- 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
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
index a84a332d8..a84a332d8 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/ZabUtils.java
+++ b/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
index ff247282c..ff247282c 100644
--- 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
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
index 49a71e5c0..49a71e5c0 100644
--- 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
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
index bcad8920d..bcad8920d 100644
--- 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
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
index a689a7990..a689a7990 100644
--- 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
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
index dc1dba99e..dc1dba99e 100644
--- 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
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
index 03579cb45..03579cb45 100644
--- 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
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
index 41609fa77..41609fa77 100644
--- 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
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
index 4afef41ea..4afef41ea 100644
--- 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
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
index 69dbcd1e5..69dbcd1e5 100644
--- 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
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
index 219d5bc6f..219d5bc6f 100644
--- 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
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
index 4eeccf34a..4eeccf34a 100644
--- 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
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
index c2f4cc319..c2f4cc319 100644
--- 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
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
index 7263925fb..7263925fb 100644
--- 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
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
index aab893efb..aab893efb 100644
--- 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
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
index acbad809d..acbad809d 100644
--- a/src/java/test/org/apache/zookeeper/server/util/PortForwarder.java
+++ b/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
index 61893f702..61893f702 100644
--- a/src/java/test/org/apache/zookeeper/server/util/SerializeUtilsTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/util/SerializeUtilsTest.java
author	Norbert Kalmar <nkalmar@yahoo.com>	2018-10-10 12:29:50 +0200
committer	Andor Molnar <andor@apache.org>	2018-10-10 12:29:50 +0200
commit	c0aa3b3f3bd7754c21010a007442f6f5686a3865 (patch)
tree	4db36bf6625108810b2fc5c0deb95db98b016d07
parent	74c245b4c01bf282b121286260525dde97037206 (diff)
download	zookeeper-c0aa3b3f3bd7754c21010a007442f6f5686a3865.tar.gz