ZOOKEEPER-3033: MAVEN MIGRATION - fix directory structure

I reopened step 1.2 to fix the directory structure of the recipes, as it is better to do every directory change at once. (As it has been done in step 1.3 already - first step, docs is irrelevant in this manner).

Author: Norbert Kalmar <nkalmar@yahoo.com>

Reviewers: andor@apache.org

Closes #599 from nkalmar/ZOOKEEPER-3033_fix

zookeeper-recipes/build-recipes.xml

@@ -26,7 +26,7 @@
 
   <property name="zk.root" location="${root}/../../"/>
 
-  <property name="src.dir"  location="${root}/src/java"/>
+  <property name="src.dir"  location="${root}/src/main/java"/>
   <property name="src.test" location="${root}/src/test"/>
 
   <property name="build.dir" location="${zk.root}/build/recipes/${name}"/>

zookeeper-recipes/zookeeper-recipes-election/README.txt

@@ -16,7 +16,7 @@
 -->
 
 1) This election interface recipe implements the leader election recipe
-mentioned in ../../../docs/recipes.[html,pdf].
+mentioned in ../../docs/recipes.[html,pdf].
 
 2) To compile the leader election java recipe you can just run ant jar from
 this directory.

zookeeper-recipes/zookeeper-recipes-election/build.xml

@@ -19,7 +19,7 @@
   <import file="../build-recipes.xml"/>
     <property name="test.main.classes" value="${zk.root}/build/test/classes"/>
     <property name="test.build.dir" value="${build.test}" />
-    <property name="test.src.dir" value="test"/>
+    <property name="test.src.dir" value="src/test/java"/>
     <property name="test.log.dir" value="${test.build.dir}/logs" />
     <property name="test.data.dir" value="${test.build.dir}/data" />
     <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
@@ -52,7 +52,7 @@
 
 	<target name="compile-test" depends="compile">
   		<property name="target.jdk" value="${ant.java.version}" />	
-		<property name="src.test.local" location="${basedir}/test" />
+		<property name="src.test.local" location="${basedir}/src/test/java" />
 		<mkdir dir="${build.test}"/>
 		<javac srcdir="${src.test.local}" 
 			destdir="${build.test}" 
@@ -114,13 +114,13 @@
 
     <copy file="${basedir}/build.xml" todir="${dist.dir}/recipes/${name}"/>
 
-    <mkdir dir="${dist.dir}/recipes/${name}/test"/>
-    <copy todir="${dist.dir}/recipes/${name}/test">
-      <fileset dir="${basedir}/test"/>
+    <mkdir dir="${dist.dir}/recipes/${name}/src/test/java"/>
+    <copy todir="${dist.dir}/recipes/${name}/src/test/java">
+      <fileset dir="${basedir}/src/test/java"/>
     </copy>
-    <mkdir dir="${dist.dir}/recipes/${name}/src"/>
-    <copy todir="${dist.dir}/recipes/${name}/src">
-      <fileset dir="${basedir}/src"/>
+    <mkdir dir="${dist.dir}/recipes/${name}/src/main/java"/>
+    <copy todir="${dist.dir}/recipes/${name}/src/main/java">
+      <fileset dir="${basedir}/src/main/java"/>
     </copy>
   </target>
 

zookeeper-recipes/zookeeper-recipes-lock/README.txt

@@ -16,10 +16,10 @@
 -->
 
 1) This lock interface recipe implements the lock recipe
-mentioned in ../../../docs/recipes.[html,pdf].
+mentioned in ../../docs/recipes.[html,pdf].
 
 2) To compile the lock java recipe you can just run ant jar from 
-this directory. For compiling the c libarary go to src/c and read
+this directory. For compiling the c libarary go to src/main/c and read
 the INSTALLATION instructions. 
 Please report any bugs on the jira 
 

zookeeper-recipes/zookeeper-recipes-lock/build.xml

@@ -19,7 +19,7 @@
   <import file="../build-recipes.xml"/>
     <property name="test.main.classes" value="${zk.root}/build/test/classes"/>
     <property name="test.build.dir" value="${build.test}" />
-    <property name="test.src.dir" value="test"/>
+    <property name="test.src.dir" value="src/test/java"/>
     <property name="test.log.dir" value="${test.build.dir}/logs" />
     <property name="test.data.dir" value="${test.build.dir}/data" />
     <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
@@ -114,13 +114,17 @@
 
     <copy file="${basedir}/build.xml" todir="${dist.dir}${package.share}/recipes/${name}"/>
 
-    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/test"/>
-    <copy todir="${dist.dir}${package.share}/recipes/${name}/test">
-      <fileset dir="${basedir}/test"/>
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/test/java"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/src/test/java">
+      <fileset dir="${basedir}/src/test/java"/>
     </copy>
-    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src"/>
-    <copy todir="${dist.dir}${package.share}/recipes/${name}/src">
-      <fileset dir="${basedir}/src"/>
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/main/java"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/src/main/java">
+      <fileset dir="${basedir}/src/main/java"/>
+    </copy>
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/main/c"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/src/main/c">
+      <fileset dir="${basedir}/src/main/c"/>
     </copy>
   </target>
 

zookeeper-recipes/zookeeper-recipes-lock/src/c/README.txt → zookeeper-recipes/zookeeper-recipes-lock/src/main/c/README.txt

@@ -9,7 +9,7 @@ tar downloaded from Apache please skip to step 2.
 
 1) make sure that you compile the main zookeeper c client library.
  
-2) change directory to src/recipes/lock/src/c 
+2) change directory to zookeeper-recipes/zookeeper-recipes-lock/src/main/c
     and do a "autoreconf -if" to bootstrap
    autoconf, automake and libtool. Please make sure you have autoconf
    version 2.59 or greater installed.

zookeeper-recipes/zookeeper-recipes-queue/build.xml

@@ -19,7 +19,7 @@
   <import file="../build-recipes.xml"/>
     <property name="test.main.classes" value="${zk.root}/build/test/classes"/>
     <property name="test.build.dir" value="${build.test}" />
-    <property name="test.src.dir" value="test"/>
+    <property name="test.src.dir" value="src/test/java"/>
     <property name="test.log.dir" value="${test.build.dir}/logs" />
     <property name="test.data.dir" value="${test.build.dir}/data" />
     <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
@@ -114,13 +114,17 @@
 
     <copy file="${basedir}/build.xml" todir="${dist.dir}${package.share}/recipes/${name}"/>
 
-    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/test"/>
-    <copy todir="${dist.dir}${package.share}/recipes/${name}/test">
-      <fileset dir="${basedir}/test"/>
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/test/java"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/src/test/java">
+      <fileset dir="${basedir}/src/test/java"/>
     </copy>
-    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src"/>
-    <copy todir="${dist.dir}${package.share}/recipes/${name}/src">
-      <fileset dir="${basedir}/src"/>
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/main/java"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/src/main/java">
+      <fileset dir="${basedir}/src/main/java"/>
+    </copy>
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/main/c"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/src/main/c">
+      <fileset dir="${basedir}/src/main/c"/>
     </copy>
   </target>
 

zookeeper-recipes/zookeeper-recipes-queue/src/c/README.txt → zookeeper-recipes/zookeeper-recipes-queue/src/main/c/README.txt

@@ -11,7 +11,7 @@ This recipe does not handle ZCONNECTIONLOSS. It will only work correctly once ZO
 
 1) make sure that you compile the main zookeeper c client library.
  
-2) change directory to src/recipes/queue/src/c 
+2) change directory to zookeeper-recipes/zookeeper-recipes-queue/src/main/c
     and do a "autoreconf -if" to bootstrap
    autoconf, automake and libtool. Please make sure you have autoconf
    version 2.59 or greater installed.