ZOOKEEPER-3032: MAVEN MIGRATION - zookeeper-server

Separating the java code is not feasible. Moving common and client back to server.

Author: Norbert Kalmar <nkalmar@yahoo.com>

Reviewers: andor@apache.org

Closes #672 from nkalmar/ZOOKEEPER-3032r

.gitignore

@@ -66,8 +66,8 @@ zookeeper-client/zookeeper-client-c/*.lo
 zookeeper-client/zookeeper-client-c/*.o
 zookeeper-client/zookeeper-client-c/generated/
 src/java/generated/
-zookeeper-common/src/main/resources/lib/ant-eclipse-*
-zookeeper-common/src/main/resources/lib/ivy-*
+zookeeper-server/src/main/resources/lib/ant-eclipse-*
+zookeeper-server/src/main/resources/lib/ivy-*
 zookeeper-client/zookeeper-client-c/Makefile.in
 zookeeper-client/zookeeper-client-c/aclocal.m4
 zookeeper-client/zookeeper-client-c/autom4te.cache/

bin/zkEnv.sh

@@ -87,7 +87,7 @@ fi
 #add the zoocfg dir to classpath
 CLASSPATH="$ZOOCFGDIR:$CLASSPATH"
 
-for i in "$ZOOBINDIR"/../zookeeper-common/src/main/resources/lib/*.jar
+for i in "$ZOOBINDIR"/../zookeeper-server/src/main/resources/lib/*.jar
 do
     CLASSPATH="$i:$CLASSPATH"
 done

build.xml

@@ -93,13 +93,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="src.dir" value="${basedir}/src" />
     <property name="java.server.src.dir" value="${basedir}/zookeeper-server/src/main/java" />
     <property name="java.server.resources.dir" value="${basedir}/zookeeper-server/src/main/resources" />
-    <property name="java.common.src.dir" value="${basedir}/zookeeper-common/src/main/java" />
-    <property name="java.common.resources.dir" value="${basedir}/zookeeper-common/src/main/resources" />
-    <property name="java.client.src.dir" value="${basedir}/zookeeper-client/zookeeper-client-java/src/main/java" />
     <property name="jute.src.dir" value="${basedir}/zookeeper-jute/src/main/java" />
     <property name="java.test.dir" value="${src.dir}/test/java"/>
 
-    <property name="lib.dir" value="${java.common.resources.dir}/lib" />
+    <property name="lib.dir" value="${java.server.resources.dir}/lib" />
     <property name="lib.dir.includes" value="**/*.jar" />
     <property name="lib.dir.excludes" value="**/excluded/" />
 
@@ -126,9 +123,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="test.java.build.dir" value="${build.dir}/test"/>
     <property name="test.java.classes" value="${test.java.build.dir}/classes"/>
     <property name="java.server.test.dir" value="${basedir}/zookeeper-server/src/test/java"/>
-    <property name="java.common.test.dir" value="${basedir}/zookeeper-common/src/test/java"/>
-    <property name="java.client.test.dir" value="${basedir}/zookeeper-client/zookeeper-client-java/src/test/java"/>
-    <property name="common.test.resource.dir" value="${basedir}/zookeeper-common/src/test/resources"/>
+    <property name="server.test.resource.dir" value="${basedir}/zookeeper-server/src/test/resources"/>
     <property name="jute.test.src.dir" value="${basedir}/zookeeper-jute/src/test/java" />
     <property name="systest.src.dir" value="${basedir}/zookeeper-it/src/test/java"/>
     <property name="bench.src.dir" value="${basedir}/zookeeper-it/src/test/bench"/>
@@ -157,12 +152,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
               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"/>
 
@@ -209,8 +198,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="grep.cmd" value="grep"/>
     <property name="patch.cmd" value="patch"/>
     <property name="make.cmd" value="make"/>
-    <property name="test_patch_sh" value="${common.test.resource.dir}/test-patch.sh"/>
-    <property name="test_pullrequest_sh" value="${common.test.resource.dir}/test-github-pr.sh"/>
+    <property name="test_patch_sh" value="${server.test.resource.dir}/test-patch.sh"/>
+    <property name="test_pullrequest_sh" value="${server.test.resource.dir}/test-github-pr.sh"/>
 
 	<!-- jdiff.home property set -->
     <property name="jdiff.home" value="${ivy.jdiff.lib}"/>
@@ -380,7 +369,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
             target="${javac.target}" source="${javac.source}"
             includes="org/apache/zookeeper/version/util/**" debug="on" encoding="${build.encoding}">
             <src path="${java.server.src.dir}" />
-            <src path="${java.common.src.dir}" />
         </javac>
     </target>
     
@@ -513,8 +501,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <javac destdir="${build.classes}" includeantruntime="false"
                target="${javac.target}" source="${javac.source}" debug="on" encoding="${build.encoding}">
             <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"/>
@@ -527,8 +513,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       <javac destdir="${test.java.classes}" includeantruntime="false"
              target="${javac.target}" source="${javac.source}" debug="on" encoding="${build.encoding}">
           <src path="${java.server.test.dir}"/>
-          <src path="${java.common.test.dir}"/>
-          <src path="${java.client.test.dir}"/>
         <src path="${jute.test.src.dir}"/>
         <classpath refid="test.java.classpath"/>
       </javac>
@@ -609,12 +593,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <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"/>
@@ -649,14 +627,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <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>
@@ -706,8 +676,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
             <fileset file="LICENSE.txt" />
             <fileset dir="${build.classes}" excludes="**/.generated"/>
             <fileset dir="${java.server.src.dir}"/>
-            <fileset dir="${java.common.src.dir}"/>
-            <fileset dir="${java.client.src.dir}"/>
             <fileset dir="${jute.src.dir}"/>
             <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
             <manifest>
@@ -783,8 +751,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <jar jarfile="${build.dir}/${final.name}-sources.jar">
             <fileset file="LICENSE.txt" />
             <fileset dir="${java.server.src.dir}"/>
-            <fileset dir="${java.common.src.dir}"/>
-            <fileset dir="${java.client.src.dir}"/>
             <fileset dir="${jute.src.dir}"/>
             <fileset dir="${src_generated.dir}" excludes="**/.generated"/>
             <manifest>
@@ -938,7 +904,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <include name="zookeeper-contrib/**"/>
           <include name="zookeeper-client/**"/>
           <include name="zookeeper-jute/**"/>
-          <include name="zookeeper-common/**"/>
           <include name="zookeeper-server/**"/>
         </fileset>
         <fileset file="${java.server.resources.dir}/pom.template"/>
@@ -1274,19 +1239,19 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <mkdir dir="${test.data.dir}" />
         <mkdir dir="${test.data.invalid.dir}" />
         <copy todir="${test.data.invalid.dir}">
-            <fileset dir="${common.test.resource.dir}/data/invalidsnap"/>
+            <fileset dir="${server.test.resource.dir}/data/invalidsnap"/>
         </copy>
         <mkdir dir="${test.data.buffersize.dir}" />
         <copy todir="${test.data.buffersize.dir}">
-            <fileset dir="${common.test.resource.dir}/data/buffersize"/>
+            <fileset dir="${server.test.resource.dir}/data/buffersize"/>
         </copy>
         <mkdir dir="${test.data.ssl.dir}" />
         <copy todir="${test.data.ssl.dir}">
-            <fileset dir="${common.test.resource.dir}/data/ssl"/>
+            <fileset dir="${server.test.resource.dir}/data/ssl"/>
         </copy>
         <mkdir dir="${test.data.kerberos.dir}" />
         <copy todir="${test.data.kerberos.dir}">
-            <fileset dir="${common.test.resource.dir}/data/kerberos"/>
+            <fileset dir="${server.test.resource.dir}/data/kerberos"/>
         </copy>
     </target>
 
@@ -1331,37 +1296,17 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <path refid="test.java.classpath" />
         <pathelement path="${test.java.classes}" />
       </path>
-      <fileset id="quicktest.files.common" dir="${java.common.test.dir}">
-        <include name="**/*${test.category}Test.java" />
-        <exclude name="**/*HammerTest.java" />
-      </fileset>
-      <fileset id="quicktest.files.server" dir="${java.server.test.dir}">
-        <include name="**/*${test.category}Test.java" />
-        <exclude name="**/*HammerTest.java" />
-      </fileset>
-      <fileset id="quicktest.files.client" dir="${java.client.test.dir}">
+      <fileset id="quicktest.files" dir="${java.server.test.dir}">
         <include name="**/*${test.category}Test.java" />
         <exclude name="**/*HammerTest.java" />
       </fileset>
       <fileset id="jutetest.files" dir="${jute.test.src.dir}">
         <include name="**/*${test.category}Test.java" />
       </fileset>
-      <fileset id="fulltest.files.common" dir="${java.common.test.dir}">
-        <include name="**/*${test.category}Test.java" />
-      </fileset>
-      <fileset id="fulltest.files.server" dir="${java.server.test.dir}">
-        <include name="**/*${test.category}Test.java" />
-      </fileset>
-      <fileset id="fulltest.files.client" dir="${java.client.test.dir}">
+      <fileset id="fulltest.files" dir="${java.server.test.dir}">
         <include name="**/*${test.category}Test.java" />
       </fileset>
-      <fileset id="testcase.files.common" dir="${java.common.test.dir}">
-        <include name="**/${testcase}.java" />
-      </fileset>
-      <fileset id="testcase.files.server" dir="${java.server.test.dir}">
-        <include name="**/${testcase}.java" />
-      </fileset>
-      <fileset id="testcase.files.client" dir="${java.client.test.dir}">
+      <fileset id="testcase.files" dir="${java.server.test.dir}">
         <include name="**/${testcase}.java" />
       </fileset>
     </target>
@@ -1384,21 +1329,15 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <classpath refid="junit.classpath" />
           <formatter type="${test.junit.output.format}" />
           <batchtest todir="${test.log.dir}" if="quicktest">
-            <fileset refid="quicktest.files.common" />
-            <fileset refid="quicktest.files.server" />
-            <fileset refid="quicktest.files.client" />
+            <fileset refid="quicktest.files" />
             <fileset refid="jutetest.files" />
           </batchtest>
           <batchtest todir="${test.log.dir}" if="fulltest">
-            <fileset refid="fulltest.files.common" />
-            <fileset refid="fulltest.files.server" />
-            <fileset refid="fulltest.files.client" />
+            <fileset refid="fulltest.files" />
             <fileset refid="jutetest.files" />
           </batchtest>
           <batchtest todir="${test.log.dir}" if="testcase">
-            <fileset refid="testcase.files.common" />
-            <fileset refid="testcase.files.server" />
-            <fileset refid="testcase.files.client" />
+            <fileset refid="testcase.files" />
           </batchtest>
         </junit>
         <antcall target="fail.build.on.test.failure"/>
@@ -1422,21 +1361,15 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <classpath refid="junit.classpath" />
           <formatter type="${test.junit.output.format}" />
           <batchtest todir="${test.log.dir}" if="quicktest">
-            <fileset refid="quicktest.files.common" />
-            <fileset refid="quicktest.files.server" />
-            <fileset refid="quicktest.files.client" />
+            <fileset refid="quicktest.files" />
             <fileset refid="jutetest.files" />
           </batchtest>
           <batchtest todir="${test.log.dir}" if="fulltest">
-            <fileset refid="fulltest.files.common" />
-            <fileset refid="fulltest.files.server" />
-            <fileset refid="fulltest.files.client" />
+            <fileset refid="fulltest.files" />
             <fileset refid="jutetest.files" />
           </batchtest>
           <batchtest todir="${test.log.dir}" if="testcase">
-            <fileset refid="testcase.files.common" />
-            <fileset refid="testcase.files.server" />
-            <fileset refid="testcase.files.client" />
+            <fileset refid="testcase.files" />
           </batchtest>
         </junit>
         <antcall target="fail.build.on.test.failure"/>
@@ -1603,29 +1536,11 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
                  includes="org/apache/zookeeper/**/*"
                  excludes="org/apache/zookeeper/version/**/*">
         </fileset>
-        <fileset dir="${java.common.src.dir}"
-               includes="org/apache/zookeeper/**/*"
-               excludes="org/apache/zookeeper/version/**/*">
-        </fileset>
-        <fileset dir="${java.client.src.dir}"
-               includes="org/apache/zookeeper/**/*"
-               excludes="org/apache/zookeeper/version/**/*">
-        </fileset>
         <testsources dir="${java.server.test.dir}">
           <testclass package="org.apache.zookeeper.*" name=".*Test">
               <testmethod annotation="Test"/>
           </testclass>
         </testsources>
-        <testsources dir="${java.common.test.dir}">
-          <testclass package="org.apache.zookeeper.*" name=".*Test">
-              <testmethod annotation="Test"/>
-          </testclass>
-        </testsources>
-        <testsources dir="${java.client.test.dir}">
-          <testclass package="org.apache.zookeeper.*" name=".*Test">
-              <testmethod annotation="Test"/>
-          </testclass>
-        </testsources>
       </clover-setup>
     </target>
 
@@ -1672,7 +1587,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="findbugs.home" value="" />
     <target name="findbugs" depends="check-for-findbugs, jar" if="findbugs.present">
         <property name="findbugs.out.dir" value="${test.java.build.dir}/findbugs" />
-        <property name="findbugs.exclude.file" value="${common.test.resource.dir}/findbugsExcludeFile.xml" />
+        <property name="findbugs.exclude.file" value="${server.test.resource.dir}/findbugsExcludeFile.xml" />
         <property name="findbugs.report.htmlfile" value="${findbugs.out.dir}/zookeeper-findbugs-report.html" />
         <property name="findbugs.report.xmlfile" value="${findbugs.out.dir}/zookeeper-findbugs-report.xml" />
         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" 
@@ -1686,8 +1601,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
                 </fileset>
             </auxClasspath>
             <sourcePath path="${java.server.src.dir}" />
-            <sourcePath path="${java.common.src.dir}" />
-            <sourcePath path="${java.client.src.dir}" />
             <class location="${build.dir}/${final.name}.jar" />
         </findbugs>
         <xslt style="${findbugs.home}/src/xsl/default.xsl" in="${findbugs.report.xmlfile}" 
@@ -1753,17 +1666,11 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
             <formatter type="${test.junit.output.format}" />
             <batchtest todir="${test.log.dir}" unless="testcase">
-                <fileset dir="${java.common.test.dir}"
-                         includes="**/*Test.java"/>
                 <fileset dir="${java.server.test.dir}"
                          includes="**/*Test.java"/>
-                <fileset dir="${java.client.test.dir}"
-                         includes="**/*Test.java"/>
             </batchtest>
             <batchtest todir="${test.log.dir}" if="testcase">
-                <fileset dir="${java.common.test.dir}" includes="**/${testcase}.java"/>
                 <fileset dir="${java.server.test.dir}" includes="**/${testcase}.java"/>
-                <fileset dir="${java.client.test.dir}" includes="**/${testcase}.java"/>
             </batchtest>
         </junit>
         <antcall target="fail.build.on.test.failure"/>
@@ -1775,12 +1682,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
             <fileset dir="${java.server.src.dir}">
                 <include name="**/*.java" />
             </fileset>
-            <fileset dir="${java.common.src.dir}">
-                <include name="**/*.java" />
-            </fileset>
-            <fileset dir="${java.client.src.dir}">
-                <include name="**/*.java" />
-            </fileset>
             <fileset dir="${src_generated.dir}">
                 <include name="**/*.java" />
             </fileset>
@@ -1794,13 +1695,11 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         </classpath>
       </taskdef>
       <mkdir dir="${test.java.build.dir}"/>
-      <cs:checkstyle config="${common.test.resource.dir}/checkstyle.xml" failOnViolation="false">
-        <fileset dir="${basedir}/zookeeper-common" includes="**/*.java" excludes="**/generated/**"/>
-        <fileset dir="${basedir}/zookeeper-client" includes="**/*.java" excludes="**/generated/**"/>
+      <cs:checkstyle config="${server.test.resource.dir}/checkstyle.xml" failOnViolation="false">
         <fileset dir="${basedir}/zookeeper-server" includes="**/*.java" excludes="**/generated/**"/>
         <formatter type="xml" toFile="${test.java.build.dir}/checkstyle-errors.xml"/>
       </cs:checkstyle>
-      <xslt style="${common.test.resource.dir}/checkstyle-noframes-sorted.xsl" in="${test.java.build.dir}/checkstyle-errors.xml"
+      <xslt style="${server.test.resource.dir}/checkstyle-noframes-sorted.xsl" in="${test.java.build.dir}/checkstyle-errors.xml"
             out="${test.java.build.dir}/checkstyle-errors.html"/>
     </target>
 
@@ -1899,9 +1798,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses"/>
           <exclude name="src/zookeeper-jute/target/main/java/.generated/"/>
-          <exclude name="src/zookeeper-common/src/test/resources/checkstyle*.xml"/>
-          <exclude name="src/zookeeper-common/src/test/resources/checkstyle*.xsl"/>
-          <exclude name="src/zookeeper-common/src/test/resources/findbugs*.xml"/>
+          <exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xml"/>
+          <exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xsl"/>
+          <exclude name="src/zookeeper-server/src/test/resources/findbugs*.xml"/>
           <exclude name="src/**/*.vcproj"/>
           <exclude name="src/**/*.vcxproj*"/>
           <exclude name="src/**/*.sln"/>
@@ -1990,12 +1889,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
            <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}">
@@ -2021,8 +1914,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
                 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}"/>
@@ -2052,19 +1943,19 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
      <target name="ant-eclipse-download" unless="ant-eclipse.jar.exists">
        <get src="https://downloads.sourceforge.net/project/ant-eclipse/ant-eclipse/1.0/ant-eclipse-1.0.bin.tar.bz2"
-            dest="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
+            dest="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" usetimestamp="false" />
 
-       <bunzip2 src="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2"/>
+       <bunzip2 src="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar.bz2"/>
 
-       <untar src="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar"
-              dest="${java.common.resources.dir}">
+       <untar src="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar"
+              dest="${java.server.resources.dir}">
          <patternset>
            <include name="lib/ant-eclipse-1.0-jvm1.2.jar"/>
          </patternset>
        </untar>
 
-       <delete file="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar" />
-       <delete file="${java.common.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" />
+       <delete file="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar" />
+       <delete file="${java.server.resources.dir}/ant-eclipse-1.0.bin.tar.bz2" />
      </target>
 
      <target name="eclipse"
@@ -2085,20 +1976,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
          <classpath>
            <source path="${java.server.src.dir}"
                    output="${build.dir.eclipse-main-classes}" />
-           <source path="${java.common.src.dir}"
-                   output="${build.dir.eclipse-main-classes}" />
-           <source path="${java.client.src.dir}"
-                   output="${build.dir.eclipse-main-classes}" />
            <source path="${jute.src.dir}"
                    output="${build.dir.eclipse-main-classes}" />
            <source path="${src_generated.dir}"
                    output="${build.dir.eclipse-main-classes}" />
-           <source path="${java.common.test.dir}"
-                   output="${build.dir.eclipse-test-classes}" />
            <source path="${java.server.test.dir}"
                    output="${build.dir.eclipse-test-classes}" />
-           <source path="${java.client.test.dir}"
-                   output="${build.dir.eclipse-test-classes}" />
            <source path="${systest.src.dir}"
                    output="${build.dir.eclipse-test-classes}" />
            <source path="${bench.src.dir}"

docs/zookeeperReconfig.html

@@ -992,7 +992,7 @@ String configStr = new String(config);
 System.out.println(configStr);</pre>
 <p>There is also an asynchronous API, and an API accepting comma
           separated Strings instead of List&lt;String&gt;. See
-          zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeper.java.</p>
+          zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java.</p>
 <a name="sc_reconfig_nonincremental"></a>
 <h4>Non-incremental mode</h4>
 <p>The second mode of reconfiguration is non-incremental, whereby a
@@ -1023,7 +1023,7 @@ System.out.println(configStr);</pre>
 <p>There is also an asynchronous API, and an API accepting comma
           separated String containing the new members instead of
           List&lt;String&gt;. See
-          zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeper.java.</p>
+          zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java.</p>
 <a name="sc_reconfig_conditional"></a>
 <h4>Conditional reconfig</h4>
 <p>Sometimes (especially in non-incremental mode) a new proposed

zookeeper-client/zookeeper-client-c/tests/zkServer.sh

@@ -90,7 +90,7 @@ do
     CLASSPATH="$CLASSPATH:$i"
 done
 
-for i in "${zk_base}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${zk_base}"/zookeeper-server/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done

zookeeper-contrib/build-contrib.xml

@@ -30,7 +30,7 @@
   <property name="src.dir"  location="${root}/src/main/java"/>
   <property name="src.test" location="${root}/src/test"/>
 
-  <property name="lib.dir"  location="${zk.root}/zookeeper-common/src/main/resources/lib"/>
+  <property name="lib.dir"  location="${zk.root}/zookeeper-server/src/main/resources/lib"/>
 
   <property name="build.dir" location="${zk.root}/build/contrib/${name}"/>
   <property name="build.classes" location="${build.dir}/classes"/>
@@ -83,7 +83,7 @@
     <fileset dir="${ivy.test.lib}">
       <include name="**/*.jar" />
     </fileset>
-    <fileset dir="${zk.root}/zookeeper-common/src/main/resources/lib">
+    <fileset dir="${zk.root}/zookeeper-server/src/main/resources/lib">
       <include name="**/*.jar" />
     </fileset>
     <fileset dir="${ant.home}/lib">

zookeeper-contrib/zookeeper-contrib-fatjar/build.xml

@@ -47,7 +47,7 @@
       <fileset dir="${zk.root}/build/test/classes"/>
       <zipgroupfileset dir="${zk.root}/build/lib" includes="*.jar" />
       <zipgroupfileset dir="${zk.root}/build/test/lib" includes="*.jar" />
-      <zipgroupfileset dir="${zk.root}/zookeeper-common/src/main/resources/lib" includes="*.jar" />
+      <zipgroupfileset dir="${zk.root}/zookeeper-server/src/main/resources/lib" includes="*.jar" />
     </jar>
   </target>
 

zookeeper-contrib/zookeeper-contrib-rest/build.xml

@@ -164,7 +164,7 @@
         <fileset dir="${build.dir}/lib" includes="*.jar"/>
         <fileset dir="${zk.root}/build" includes="zookeeper-*.jar"/>
         <pathelement path="${zk.root}/src/contrib/${name}/conf" />
-        <fileset dir="${zk.root}/zookeeper-common/src/main/resources/lib">
+        <fileset dir="${zk.root}/zookeeper-server/src/main/resources/lib">
           <include name="**/*.jar" />
         </fileset>
       </classpath>
@@ -179,7 +179,7 @@
         <tarfileset file="${build.dir}/zookeeper-*-rest.jar" />
         <tarfileset dir="${zk.root}/build" includes="zookeeper-*.jar" prefix="lib" />
         <tarfileset dir="${zk.root}/src/contrib/${name}/conf" prefix="conf" />
-        <tarfileset dir="${zk.root}/zookeeper-common/src/main/resources/lib" prefix="lib" includes="**/*.jar" />
+        <tarfileset dir="${zk.root}/zookeeper-server/src/main/resources/lib" prefix="lib" includes="**/*.jar" />
         <tarfileset file="${zk.root}/src/contrib/${name}/rest.sh" />
       </param.listofitems>
     </macro_tar>

zookeeper-contrib/zookeeper-contrib-rest/src/test/zkServer.sh

@@ -62,7 +62,7 @@ do
     CLASSPATH="$CLASSPATH:$i"
 done
 
-for i in "${zk_base}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${zk_base}"/zookeeper-server/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done

zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh

@@ -47,7 +47,7 @@ do
     CLASSPATH="$CLASSPATH:$i"
 done
 
-for i in "${zk_base}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${zk_base}"/zookeeper-server/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done

zookeeper-docs/src/documentation/content/xdocs/zookeeperReconfig.xml

@@ -676,7 +676,7 @@ String configStr = new String(config);
 System.out.println(configStr);]]></programlisting>
         <para>There is also an asynchronous API, and an API accepting comma
           separated Strings instead of List&lt;String&gt;. See
-          zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeper.java.</para>
+          zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java.</para>
       </section>
       <section id="sc_reconfig_nonincremental">
         <title>Non-incremental mode</title>
@@ -705,7 +705,7 @@ System.out.println(configStr);]]></programlisting>
         <para>There is also an asynchronous API, and an API accepting comma
           separated String containing the new members instead of
           List&lt;String&gt;. See
-          zookeeper-common/src/main/java/org/apache/zookeeper/ZooKeeper.java.</para>
+          zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java.</para>
       </section>
       <section id="sc_reconfig_conditional">
         <title>Conditional reconfig</title>

zookeeper-recipes/build-recipes.xml

@@ -72,7 +72,7 @@
     <fileset dir="${zk.root}/build/test/lib">
       <include name="**/*.jar"/>
     </fileset>
-    <fileset dir="${zk.root}/zookeeper-common/src/main/resources/lib">
+    <fileset dir="${zk.root}/zookeeper-server/src/main/resources/lib">
       <include name="**/*.jar" />
     </fileset>
   </path>

zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/zkServer.sh

@@ -51,7 +51,7 @@ do
     CLASSPATH="$CLASSPATH:$i"
 done
 
-for i in "${base_dir}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${base_dir}"/zookeeper-server/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done

zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/zkServer.sh

@@ -51,7 +51,7 @@ do
     CLASSPATH="$CLASSPATH:$i"
 done
 
-for i in "${base_dir}"/zookeeper-common/src/main/resource/lib/*.jar
+for i in "${base_dir}"/zookeeper-server/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done