ZOOKEEPER-3032 - MAVEN MIGRATION - move java server, client

.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/

bin/zkEnv.sh

@@ -87,7 +87,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

docs/zookeeperReconfig.html

@@ -992,7 +992,7 @@ <h4>Incremental mode</h4>
 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 @@ <h4>Non-incremental mode</h4>
 <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

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

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">

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>
 

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}/src/java/lib">
+        <fileset dir="${zk.root}/zookeeper-common/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}/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>

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

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

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
-          src/java/main/org/apache/zookeeper/ZooKeeper.java.</para>
+          zookeeper-common/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
-          src/java/main/org/apache/zookeeper/ZooKeeper.java.</para>
+          zookeeper-common/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}/src/java/lib">
+    <fileset dir="${zk.root}/zookeeper-common/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}"/src/java/lib/*.jar
+for i in "${base_dir}"/zookeeper-common/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}"/src/java/lib/*.jar
+for i in "${base_dir}"/zookeeper-common/src/main/resource/lib/*.jar
 do
     CLASSPATH="$CLASSPATH:$i"
 done