瀏覽代碼

ZOOKEEPER-3033: MAVEN MIGRATION - Step 1.2 - create zk-recipes maven structure

Create the zk-recipes maven structure for the maven migration.
Tested the recipes build with the new directory structure.

Author: Norbert Kalmar <nkalmar@yahoo.com>

Reviewers: andor@apache.org

Closes #564 from nkalmar/ZOOKEEPER-3033 and squashes the following commits:

c8c2e986 [Norbert Kalmar] ZOOKEEPER-3033 rename sub directories as well
d2b7f18d [Norbert Kalmar] ZOOKEEPER-3033 create zk-recipes maven structure
Norbert Kalmar 6 年之前
父節點
當前提交
28de451aa8
共有 54 個文件被更改,包括 11 次插入10 次删除
  1. 1 1
      build.xml
  2. 2 2
      zookeeper-docs/src/documentation/content/xdocs/recipes.xml
  3. 7 6
      zookeeper-recipes/README.txt
  4. 1 1
      zookeeper-recipes/build-recipes.xml
  5. 0 0
      zookeeper-recipes/build.xml
  6. 0 0
      zookeeper-recipes/zookeeper-recipes-election/README.txt
  7. 0 0
      zookeeper-recipes/zookeeper-recipes-election/build.xml
  8. 0 0
      zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionAware.java
  9. 0 0
      zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupport.java
  10. 0 0
      zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderOffer.java
  11. 0 0
      zookeeper-recipes/zookeeper-recipes-election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java
  12. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/README.txt
  13. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/build.xml
  14. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/INSTALL
  15. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/LICENSE
  16. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/Makefile.am
  17. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/README.txt
  18. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/acinclude.m4
  19. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/aminclude.am
  20. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/c-doc.Doxyfile
  21. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/configure.ac
  22. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/include/zoo_lock.h
  23. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/src/zoo_lock.c
  24. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/TestClient.cc
  25. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/TestDriver.cc
  26. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/Util.cc
  27. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/Util.h
  28. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/zkServer.sh
  29. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java
  30. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java
  31. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java
  32. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java
  33. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java
  34. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/test/org/apache/zookeeper/recipes/lock/WriteLockTest.java
  35. 0 0
      zookeeper-recipes/zookeeper-recipes-lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java
  36. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/README.txt
  37. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/build.xml
  38. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/INSTALL
  39. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/LICENSE
  40. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/Makefile.am
  41. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/README.txt
  42. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/acinclude.m4
  43. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/aminclude.am
  44. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/c-doc.Doxyfile
  45. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/configure.ac
  46. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/include/zoo_queue.h
  47. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/src/zoo_queue.c
  48. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/TestClient.cc
  49. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/TestDriver.cc
  50. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/Util.cc
  51. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/Util.h
  52. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/zkServer.sh
  53. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java
  54. 0 0
      zookeeper-recipes/zookeeper-recipes-queue/test/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java

+ 1 - 1
build.xml

@@ -149,7 +149,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="dist.maven.dir" value="${dist.dir}/dist-maven"/>
     <property name="dist.maven.dir" value="${dist.dir}/dist-maven"/>
 
 
     <property name="contrib.dir" value="${src.dir}/contrib"/>
     <property name="contrib.dir" value="${src.dir}/contrib"/>
-    <property name="recipes.dir" value="${src.dir}/recipes"/>
+    <property name="recipes.dir" value="${basedir}/zookeeper-recipes"/>
 
 
     <property name="ivy.version" value="2.4.0"/>
     <property name="ivy.version" value="2.4.0"/>
     <property name="ivy.url"
     <property name="ivy.url"

+ 2 - 2
zookeeper-docs/src/documentation/content/xdocs/recipes.xml

@@ -283,7 +283,7 @@
     <note>
     <note>
       <para>There now exists a Queue implementation in ZooKeeper
       <para>There now exists a Queue implementation in ZooKeeper
       recipes directory. This is distributed with the release --
       recipes directory. This is distributed with the release --
-      src/recipes/queue directory of the release artifact.
+      zookeeper-recipes/zookeeper-recipes-queue directory of the release artifact.
       </para>
       </para>
     </note>
     </note>
 
 
@@ -312,7 +312,7 @@
     <note>
     <note>
       <para>There now exists a Lock implementation in ZooKeeper
       <para>There now exists a Lock implementation in ZooKeeper
       recipes directory. This is distributed with the release --
       recipes directory. This is distributed with the release --
-      src/recipes/lock directory of the release artifact.
+        zookeeper-recipes/zookeeper-recipes-lock directory of the release artifact.
       </para>
       </para>
     </note>
     </note>
 
 

+ 7 - 6
src/recipes/README.txt → zookeeper-recipes/README.txt

@@ -1,18 +1,19 @@
-1) This source directory contains various Zookeeper recipe implementations. 
+1) This source directory contains various Zookeeper recipe implementations.
 
 
-2) The recipe directory name should specify the name of the recipe you are implementing - eg. lock/.
+2) The recipe directory name should specify the name of the recipe you are implementing - eg. zookeeper-recipes-lock/.
 
 
 3) It would be great if you can provide both the java and c recipes for the zookeeper recipes.
 3) It would be great if you can provide both the java and c recipes for the zookeeper recipes.
-The c recipes go in to recipe-name/src/c and the java implementation goes into recipe-name/src/java.
+    C recipes go in to zookeeper-recipes/zookeeper-recipes-[recipe-name]/src/c
+    Java implementation goes into zookeeper-recipes/zookeeper-recipes-[recipe-name]/src/java.
 
 
 4) The recipes hold high standards like our zookeeper c/java libraries, so make sure that you include
 4) The recipes hold high standards like our zookeeper c/java libraries, so make sure that you include
 some unit testing with both the c and java recipe code.
 some unit testing with both the c and java recipe code.
 
 
 5) Also, please name your c client public methods as
 5) Also, please name your c client public methods as
 zkr_recipe-name_methodname
 zkr_recipe-name_methodname
-(eg. zkr_lock_lock in lock/src/c)
+(eg. zkr_lock_lock in zookeeper-recipes-lock/src/c)
 
 
-6) The various recipes are in ../../docs/recipes.html or
+6) The various recipes are in ../docs/recipes.html or
 ../../docs/reciped.pdf. Also, this is not an exhaustive list by any chance.
 ../../docs/reciped.pdf. Also, this is not an exhaustive list by any chance.
 Zookeeper is used (and can be used) for more than what we have listed in the docs.
 Zookeeper is used (and can be used) for more than what we have listed in the docs.
 
 
@@ -21,5 +22,5 @@ Zookeeper is used (and can be used) for more than what we have listed in the doc
 {top}/src/c/ are compiled. Run autoreconf -if;./configure; make. The libaries
 {top}/src/c/ are compiled. Run autoreconf -if;./configure; make. The libaries
 will be installed in {top}/src/c/.libs. 
 will be installed in {top}/src/c/.libs. 
 - run autoreconf if;./configure;make run-check 
 - run autoreconf if;./configure;make run-check 
-  in src/recipes/$recipename/src/c
+  in zookeeper-recipes/$recipename/src/c
 
 

+ 1 - 1
src/recipes/build-recipes.xml → zookeeper-recipes/build-recipes.xml

@@ -24,7 +24,7 @@
   <property name="name" value="${ant.project.name}"/>
   <property name="name" value="${ant.project.name}"/>
   <property name="root" value="${basedir}"/>
   <property name="root" value="${basedir}"/>
 
 
-  <property name="zk.root" location="${root}/../../../"/>
+  <property name="zk.root" location="${root}/../../"/>
 
 
   <property name="src.dir"  location="${root}/src/java"/>
   <property name="src.dir"  location="${root}/src/java"/>
   <property name="src.test" location="${root}/src/test"/>
   <property name="src.test" location="${root}/src/test"/>

+ 0 - 0
src/recipes/build.xml → zookeeper-recipes/build.xml


+ 0 - 0
src/recipes/election/README.txt → zookeeper-recipes/zookeeper-recipes-election/README.txt


+ 0 - 0
src/recipes/election/build.xml → zookeeper-recipes/zookeeper-recipes-election/build.xml


+ 0 - 0
src/recipes/election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionAware.java → zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionAware.java


+ 0 - 0
src/recipes/election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupport.java → zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupport.java


+ 0 - 0
src/recipes/election/src/java/org/apache/zookeeper/recipes/leader/LeaderOffer.java → zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderOffer.java


+ 0 - 0
src/recipes/election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java → zookeeper-recipes/zookeeper-recipes-election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java


+ 0 - 0
src/recipes/lock/README.txt → zookeeper-recipes/zookeeper-recipes-lock/README.txt


+ 0 - 0
src/recipes/lock/build.xml → zookeeper-recipes/zookeeper-recipes-lock/build.xml


+ 0 - 0
src/recipes/lock/src/c/INSTALL → zookeeper-recipes/zookeeper-recipes-lock/src/c/INSTALL


+ 0 - 0
src/recipes/lock/src/c/LICENSE → zookeeper-recipes/zookeeper-recipes-lock/src/c/LICENSE


+ 0 - 0
src/recipes/lock/src/c/Makefile.am → zookeeper-recipes/zookeeper-recipes-lock/src/c/Makefile.am


+ 0 - 0
src/recipes/lock/src/c/README.txt → zookeeper-recipes/zookeeper-recipes-lock/src/c/README.txt


+ 0 - 0
src/recipes/lock/src/c/acinclude.m4 → zookeeper-recipes/zookeeper-recipes-lock/src/c/acinclude.m4


+ 0 - 0
src/recipes/lock/src/c/aminclude.am → zookeeper-recipes/zookeeper-recipes-lock/src/c/aminclude.am


+ 0 - 0
src/recipes/lock/src/c/c-doc.Doxyfile → zookeeper-recipes/zookeeper-recipes-lock/src/c/c-doc.Doxyfile


+ 0 - 0
src/recipes/lock/src/c/configure.ac → zookeeper-recipes/zookeeper-recipes-lock/src/c/configure.ac


+ 0 - 0
src/recipes/lock/src/c/include/zoo_lock.h → zookeeper-recipes/zookeeper-recipes-lock/src/c/include/zoo_lock.h


+ 0 - 0
src/recipes/lock/src/c/src/zoo_lock.c → zookeeper-recipes/zookeeper-recipes-lock/src/c/src/zoo_lock.c


+ 0 - 0
src/recipes/lock/src/c/tests/TestClient.cc → zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/TestClient.cc


+ 0 - 0
src/recipes/lock/src/c/tests/TestDriver.cc → zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/TestDriver.cc


+ 0 - 0
src/recipes/lock/src/c/tests/Util.cc → zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/Util.cc


+ 0 - 0
src/recipes/lock/src/c/tests/Util.h → zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/Util.h


+ 0 - 0
src/recipes/lock/src/c/tests/zkServer.sh → zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/zkServer.sh


+ 0 - 0
src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java → zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java


+ 0 - 0
src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java → zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java


+ 0 - 0
src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java → zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java


+ 0 - 0
src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java → zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java


+ 0 - 0
src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java → zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java


+ 0 - 0
src/recipes/lock/test/org/apache/zookeeper/recipes/lock/WriteLockTest.java → zookeeper-recipes/zookeeper-recipes-lock/test/org/apache/zookeeper/recipes/lock/WriteLockTest.java


+ 0 - 0
src/recipes/lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java → zookeeper-recipes/zookeeper-recipes-lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java


+ 0 - 0
src/recipes/queue/README.txt → zookeeper-recipes/zookeeper-recipes-queue/README.txt


+ 0 - 0
src/recipes/queue/build.xml → zookeeper-recipes/zookeeper-recipes-queue/build.xml


+ 0 - 0
src/recipes/queue/src/c/INSTALL → zookeeper-recipes/zookeeper-recipes-queue/src/c/INSTALL


+ 0 - 0
src/recipes/queue/src/c/LICENSE → zookeeper-recipes/zookeeper-recipes-queue/src/c/LICENSE


+ 0 - 0
src/recipes/queue/src/c/Makefile.am → zookeeper-recipes/zookeeper-recipes-queue/src/c/Makefile.am


+ 0 - 0
src/recipes/queue/src/c/README.txt → zookeeper-recipes/zookeeper-recipes-queue/src/c/README.txt


+ 0 - 0
src/recipes/queue/src/c/acinclude.m4 → zookeeper-recipes/zookeeper-recipes-queue/src/c/acinclude.m4


+ 0 - 0
src/recipes/queue/src/c/aminclude.am → zookeeper-recipes/zookeeper-recipes-queue/src/c/aminclude.am


+ 0 - 0
src/recipes/queue/src/c/c-doc.Doxyfile → zookeeper-recipes/zookeeper-recipes-queue/src/c/c-doc.Doxyfile


+ 0 - 0
src/recipes/queue/src/c/configure.ac → zookeeper-recipes/zookeeper-recipes-queue/src/c/configure.ac


+ 0 - 0
src/recipes/queue/src/c/include/zoo_queue.h → zookeeper-recipes/zookeeper-recipes-queue/src/c/include/zoo_queue.h


+ 0 - 0
src/recipes/queue/src/c/src/zoo_queue.c → zookeeper-recipes/zookeeper-recipes-queue/src/c/src/zoo_queue.c


+ 0 - 0
src/recipes/queue/src/c/tests/TestClient.cc → zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/TestClient.cc


+ 0 - 0
src/recipes/queue/src/c/tests/TestDriver.cc → zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/TestDriver.cc


+ 0 - 0
src/recipes/queue/src/c/tests/Util.cc → zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/Util.cc


+ 0 - 0
src/recipes/queue/src/c/tests/Util.h → zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/Util.h


+ 0 - 0
src/recipes/queue/src/c/tests/zkServer.sh → zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/zkServer.sh


+ 0 - 0
src/recipes/queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java → zookeeper-recipes/zookeeper-recipes-queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java


+ 0 - 0
src/recipes/queue/test/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java → zookeeper-recipes/zookeeper-recipes-queue/test/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java