zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject [50/51] [partial] zookeeper git commit: ZOOKEEPER-3032: MAVEN MIGRATION - move java server, client
Date Fri, 05 Oct 2018 12:26:43 GMT
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6e3b40c..a4b8d37 100644
--- a/build.xml
+++ b/build.xml
@@ -82,18 +82,22 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <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.8" />
     <property name="javac.source" value="1.8" />
     <property name="build.encoding" value="utf8" />
 
     <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="java.test.dir" value="${src.dir}/test/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/" />
 
@@ -106,7 +110,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
     <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" />
 
@@ -119,10 +123,13 @@ 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="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="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="jute.test.src.dir" value="${basedir}/zookeeper-jute/src/test/java" />
-    <property name="systest.src.dir" value="${src.dir}/java/systest"/>
-    <property name="bench.src.dir" value="${java.test.dir}/bench"/>
+    <property name="systest.src.dir" value="${basedir}/zookeeper-it/src/test/java"/>
+    <property name="bench.src.dir" value="${basedir}/zookeeper-it/src/test/bench"/>
     <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.invalid.dir" value="${test.data.dir}/invalidsnap" />
@@ -139,7 +146,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <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"/>
@@ -149,6 +155,12 @@ 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"/>
 
@@ -195,8 +207,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="${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}"/>
@@ -342,7 +354,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <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}" />
                 <pathelement path="${jute_javacc.dir}" />
@@ -362,9 +374,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     </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" encoding="${build.encoding}" />
+            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>
     
     <target name="git-revision" unless="lastRevision">
@@ -373,7 +388,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       	    <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}">
@@ -494,7 +509,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <target name="compile" depends="ivy-retrieve,clover,build-generated">
         <javac destdir="${build.classes}" includeantruntime="false"
                target="${javac.target}" source="${javac.source}" debug="on" encoding="${build.encoding}">
-            <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"/>
@@ -506,7 +523,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       <mkdir dir="${test.java.classes}"/>
       <javac destdir="${test.java.classes}" includeantruntime="false"
              target="${javac.target}" source="${javac.source}" debug="on" encoding="${build.encoding}">
-        <src path="${test.src.dir}"/>
+          <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>
@@ -573,7 +592,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
             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"
@@ -583,10 +602,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
          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"/>
@@ -596,7 +621,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <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"
@@ -610,17 +635,25 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
          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"/>
           <include name="org/apache/zookeeper/server/PurgeTxnLog.java"/>
           <include name="org/apache/zookeeper/server/SnapshotFormatter.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>
@@ -669,7 +702,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     	<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>
@@ -744,7 +779,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <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>
@@ -853,7 +890,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
       <ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml"
                    pomfile="${dist.maven.dir}/${final.name}.pom"
-                   templatefile="${basedir}/src/pom.template" conf="default,test" >
+                   templatefile="${java.server.resources.dir}/pom.template" conf="default,test" >
         <mapping conf="default" scope="compile"/>
         <mapping conf="test" scope="test"/>
       </ivy:makepom>
@@ -885,20 +922,21 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <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">
@@ -967,7 +1005,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
       <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>
@@ -1009,13 +1047,13 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <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>
   	  
       <chmod perm="ugo+x" type="file" parallel="false">
@@ -1229,19 +1267,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="${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.ssl.dir}" />
         <copy todir="${test.data.ssl.dir}">
-            <fileset dir="${basedir}/src/java/test/data/ssl"/>
+            <fileset dir="${common.test.resource.dir}/data/ssl"/>
         </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>
 
@@ -1286,17 +1324,37 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <path refid="test.java.classpath" />
         <pathelement path="${test.java.classes}" />
       </path>
-      <fileset id="quicktest.files" dir="${test.src.dir}">
+      <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}">
         <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" dir="${test.src.dir}">
+      <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="testcase.files" dir="${test.src.dir}">
+      <fileset id="fulltest.files.client" dir="${java.client.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}">
         <include name="**/${testcase}.java" />
       </fileset>
     </target>
@@ -1319,15 +1377,21 @@ 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" />
+            <fileset refid="quicktest.files.common" />
+            <fileset refid="quicktest.files.server" />
+            <fileset refid="quicktest.files.client" />
             <fileset refid="jutetest.files" />
           </batchtest>
           <batchtest todir="${test.log.dir}" if="fulltest">
-            <fileset refid="fulltest.files" />
+            <fileset refid="fulltest.files.common" />
+            <fileset refid="fulltest.files.server" />
+            <fileset refid="fulltest.files.client" />
             <fileset refid="jutetest.files" />
           </batchtest>
           <batchtest todir="${test.log.dir}" if="testcase">
-            <fileset refid="testcase.files" />
+            <fileset refid="testcase.files.common" />
+            <fileset refid="testcase.files.server" />
+            <fileset refid="testcase.files.client" />
           </batchtest>
         </junit>
         <antcall target="fail.build.on.test.failure"/>
@@ -1351,15 +1415,21 @@ 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" />
+            <fileset refid="quicktest.files.common" />
+            <fileset refid="quicktest.files.server" />
+            <fileset refid="quicktest.files.client" />
             <fileset refid="jutetest.files" />
           </batchtest>
           <batchtest todir="${test.log.dir}" if="fulltest">
-            <fileset refid="fulltest.files" />
+            <fileset refid="fulltest.files.common" />
+            <fileset refid="fulltest.files.server" />
+            <fileset refid="fulltest.files.client" />
             <fileset refid="jutetest.files" />
           </batchtest>
           <batchtest todir="${test.log.dir}" if="testcase">
-            <fileset refid="testcase.files" />
+            <fileset refid="testcase.files.common" />
+            <fileset refid="testcase.files.server" />
+            <fileset refid="testcase.files.client" />
           </batchtest>
         </junit>
         <antcall target="fail.build.on.test.failure"/>
@@ -1522,11 +1592,29 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       <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>
+        </testsources>
+        <testsources dir="${java.client.test.dir}">
           <testclass package="org.apache.zookeeper.*" name=".*Test">
               <testmethod annotation="Test"/>
           </testclass>
@@ -1577,7 +1665,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="${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" 
@@ -1590,7 +1678,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
                     <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}" 
@@ -1656,11 +1746,17 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
             <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"/>
+                <fileset dir="${java.client.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"/>
+                <fileset dir="${java.client.test.dir}" includes="**/${testcase}.java"/>
             </batchtest>
         </junit>
         <antcall target="fail.build.on.test.failure"/>
@@ -1668,8 +1764,14 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
     <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="${java.common.src.dir}">
+                <include name="**/*.java" />
+            </fileset>
+            <fileset dir="${java.client.src.dir}">
                 <include name="**/*.java" />
             </fileset>
             <fileset dir="${src_generated.dir}">
@@ -1685,11 +1787,13 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         </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>
 
@@ -1751,7 +1855,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <exclude name="**/TODO"/>
           <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"/>
@@ -1788,10 +1891,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES"/>
           <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/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/**/*.vcxproj*"/>
           <exclude name="src/**/*.sln"/>
@@ -1876,10 +1979,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
            <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}">
@@ -1901,10 +2010,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
      <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}"/>
@@ -1934,19 +2045,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="${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"
@@ -1965,13 +2076,21 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
          </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="${java.client.test.dir}"
                    output="${build.dir.eclipse-test-classes}" />
            <source path="${systest.src.dir}"
                    output="${build.dir.eclipse-test-classes}" />

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/docs/zookeeperReconfig.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperReconfig.html b/docs/zookeeperReconfig.html
index e36c141..89cf285 100644
--- a/docs/zookeeperReconfig.html
+++ b/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
-          src/java/main/org/apache/zookeeper/ZooKeeper.java.</p>
+          zookeeper-common/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
-          src/java/main/org/apache/zookeeper/ZooKeeper.java.</p>
+          zookeeper-common/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

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/LICENSE.txt
----------------------------------------------------------------------
diff --git a/src/LICENSE.txt b/src/LICENSE.txt
deleted file mode 100644
index efa786f..0000000
--- a/src/LICENSE.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-This distribution bundles javacc, which is available under the
-3-clause BSD License. For details, see a copy of the license in
-lib/javacc.LICENSE.txt
-
-This distribution bundles jline 2.11, which is available under the
-2-clause BSD License. For details, see a copy of the license in
-lib/jline-2.11.LICENSE.txt
-
-This distribution bundles SLF4J 1.7.5, which is available under the MIT
-License. For details, see a copy of the license in
-lib/slf4j-1.7.5.LICENSE.txt
-
-This distribution bundles a modified version of 'JZLib' as part of
-Netty-3.7.0, which is available under the 3-clause BSD licence. For
-details, see a copy of the licence in META-INF/license/LICENSE-jzlib.txt
-as part of the Netty jar in lib/netty-3.7.0.Final.jar.

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/NOTICE.txt
----------------------------------------------------------------------
diff --git a/src/NOTICE.txt b/src/NOTICE.txt
deleted file mode 100644
index 065140a..0000000
--- a/src/NOTICE.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-Apache ZooKeeper
-Copyright 2009-2016 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed by
-The Netty Project (http://netty.io/)
-Copyright 2011 The Netty Project
-
-The Netty NOTICE file contains the following items:
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
-  * LICENSE:
-    * license/LICENSE.jsr166y.txt (Public Domain)
-  * HOMEPAGE:
-    * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
-    * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.base64.txt (Public Domain)
-  * HOMEPAGE:
-    * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified version of 'JZlib', a re-implementation of
-zlib in pure Java, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jzlib.txt (BSD Style License)
-  * HOMEPAGE:
-    * http://www.jcraft.com/jzlib/
-
-This product contains a modified version of 'Webbit', a Java event based
-WebSocket and HTTP server:
-
-  * LICENSE:
-    * license/LICENSE.webbit.txt (BSD License)
-  * HOMEPAGE:
-    * https://github.com/joewalnes/webbit
-
-This product optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.protobuf.txt (New BSD License)
-  * HOMEPAGE:
-    * http://code.google.com/p/protobuf/
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality.  It can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.bouncycastle.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.bouncycastle.org/
-
-This product optionally depends on 'SLF4J', a simple logging facade for Java,
-which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.slf4j.txt (MIT License)
-  * HOMEPAGE:
-    * http://www.slf4j.org/
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.commons-logging.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework,
-which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.log4j.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://logging.apache.org/log4j/
-
-This product optionally depends on 'JBoss Logging', a logging framework,
-which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.jboss-logging.txt (GNU LGPL 2.1)
-  * HOMEPAGE:
-    * http://anonsvn.jboss.org/repos/common/common-logging-spi/
-
-This product optionally depends on 'Apache Felix', an open source OSGi
-framework implementation, which can be obtained at:
-
-  * LICENSE:
-    * license/LICENSE.felix.txt (Apache License 2.0)
-  * HOMEPAGE:
-    * http://felix.apache.org/
-

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/OldChangeLog
----------------------------------------------------------------------
diff --git a/src/java/OldChangeLog b/src/java/OldChangeLog
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/faa7cec7/src/java/lib/cobertura/README.txt
----------------------------------------------------------------------
diff --git a/src/java/lib/cobertura/README.txt b/src/java/lib/cobertura/README.txt
deleted file mode 100644
index f5ba88f..0000000
--- a/src/java/lib/cobertura/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Download the cobertura binary from the following location and unpack it into this directory. Run "cobertura-report" target from build.xml to generate coverage report.
-
-http://cobertura.sourceforge.net/download.html


Mime
View raw message