From 04926ee4baf69ab866ca318c42b8a0f0711c8b74 Mon Sep 17 00:00:00 2001 From: Norbert Kalmar Date: Tue, 14 Aug 2018 17:16:26 +0200 Subject: [PATCH] ZOOKEEPER-3033 create maven structure for recipes --- zookeeper-recipes/build-recipes.xml | 2 +- .../zookeeper-recipes-election/README.txt | 2 +- .../zookeeper-recipes-election/build.xml | 16 ++++++++-------- .../recipes/leader/LeaderElectionAware.java | 0 .../recipes/leader/LeaderElectionSupport.java | 0 .../zookeeper/recipes/leader/LeaderOffer.java | 0 .../leader/LeaderElectionSupportTest.java | 0 .../zookeeper-recipes-lock/README.txt | 4 ++-- .../zookeeper-recipes-lock/build.xml | 18 +++++++++++------- .../src/{ => main}/c/INSTALL | 0 .../src/{ => main}/c/LICENSE | 0 .../src/{ => main}/c/Makefile.am | 0 .../src/{ => main}/c/README.txt | 2 +- .../src/{ => main}/c/acinclude.m4 | 0 .../src/{ => main}/c/aminclude.am | 0 .../src/{ => main}/c/c-doc.Doxyfile | 0 .../src/{ => main}/c/configure.ac | 0 .../src/{ => main}/c/include/zoo_lock.h | 0 .../src/{ => main}/c/src/zoo_lock.c | 0 .../src/{ => main}/c/tests/TestClient.cc | 0 .../src/{ => main}/c/tests/TestDriver.cc | 0 .../src/{ => main}/c/tests/Util.cc | 0 .../src/{ => main}/c/tests/Util.h | 0 .../src/{ => main}/c/tests/zkServer.sh | 0 .../zookeeper/recipes/lock/LockListener.java | 0 .../recipes/lock/ProtocolSupport.java | 0 .../zookeeper/recipes/lock/WriteLock.java | 0 .../zookeeper/recipes/lock/ZNodeName.java | 0 .../recipes/lock/ZooKeeperOperation.java | 0 .../zookeeper/recipes/lock/WriteLockTest.java | 0 .../zookeeper/recipes/lock/ZNodeNameTest.java | 0 .../zookeeper-recipes-queue/build.xml | 18 +++++++++++------- .../src/{ => main}/c/INSTALL | 0 .../src/{ => main}/c/LICENSE | 0 .../src/{ => main}/c/Makefile.am | 0 .../src/{ => main}/c/README.txt | 2 +- .../src/{ => main}/c/acinclude.m4 | 0 .../src/{ => main}/c/aminclude.am | 0 .../src/{ => main}/c/c-doc.Doxyfile | 0 .../src/{ => main}/c/configure.ac | 0 .../src/{ => main}/c/include/zoo_queue.h | 0 .../src/{ => main}/c/src/zoo_queue.c | 0 .../src/{ => main}/c/tests/TestClient.cc | 0 .../src/{ => main}/c/tests/TestDriver.cc | 0 .../src/{ => main}/c/tests/Util.cc | 0 .../src/{ => main}/c/tests/Util.h | 0 .../src/{ => main}/c/tests/zkServer.sh | 0 .../recipes/queue/DistributedQueue.java | 0 .../recipes/queue/DistributedQueueTest.java | 0 49 files changed, 36 insertions(+), 28 deletions(-) rename zookeeper-recipes/zookeeper-recipes-election/src/{ => main}/java/org/apache/zookeeper/recipes/leader/LeaderElectionAware.java (100%) rename zookeeper-recipes/zookeeper-recipes-election/src/{ => main}/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupport.java (100%) rename zookeeper-recipes/zookeeper-recipes-election/src/{ => main}/java/org/apache/zookeeper/recipes/leader/LeaderOffer.java (100%) rename zookeeper-recipes/zookeeper-recipes-election/{test => src/test/java}/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/INSTALL (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/LICENSE (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/Makefile.am (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/README.txt (94%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/acinclude.m4 (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/aminclude.am (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/c-doc.Doxyfile (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/configure.ac (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/include/zoo_lock.h (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/src/zoo_lock.c (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/tests/TestClient.cc (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/tests/TestDriver.cc (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/tests/Util.cc (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/tests/Util.h (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/c/tests/zkServer.sh (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/java/org/apache/zookeeper/recipes/lock/LockListener.java (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/java/org/apache/zookeeper/recipes/lock/WriteLock.java (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/java/org/apache/zookeeper/recipes/lock/ZNodeName.java (100%) rename zookeeper-recipes/zookeeper-recipes-lock/src/{ => main}/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java (100%) rename zookeeper-recipes/zookeeper-recipes-lock/{test => src/test/java}/org/apache/zookeeper/recipes/lock/WriteLockTest.java (100%) rename zookeeper-recipes/zookeeper-recipes-lock/{test => src/test/java}/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/INSTALL (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/LICENSE (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/Makefile.am (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/README.txt (94%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/acinclude.m4 (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/aminclude.am (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/c-doc.Doxyfile (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/configure.ac (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/include/zoo_queue.h (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/src/zoo_queue.c (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/tests/TestClient.cc (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/tests/TestDriver.cc (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/tests/Util.cc (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/tests/Util.h (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/c/tests/zkServer.sh (100%) rename zookeeper-recipes/zookeeper-recipes-queue/src/{ => main}/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java (100%) rename zookeeper-recipes/zookeeper-recipes-queue/{test => src/test/java}/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java (100%) diff --git a/zookeeper-recipes/build-recipes.xml b/zookeeper-recipes/build-recipes.xml index b8457ebd407..29bc8adb223 100644 --- a/zookeeper-recipes/build-recipes.xml +++ b/zookeeper-recipes/build-recipes.xml @@ -26,7 +26,7 @@ - + diff --git a/zookeeper-recipes/zookeeper-recipes-election/README.txt b/zookeeper-recipes/zookeeper-recipes-election/README.txt index 10447ed4dac..f854b275eb8 100644 --- a/zookeeper-recipes/zookeeper-recipes-election/README.txt +++ b/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. diff --git a/zookeeper-recipes/zookeeper-recipes-election/build.xml b/zookeeper-recipes/zookeeper-recipes-election/build.xml index 8e1d00a11c3..6f091a56a15 100644 --- a/zookeeper-recipes/zookeeper-recipes-election/build.xml +++ b/zookeeper-recipes/zookeeper-recipes-election/build.xml @@ -19,7 +19,7 @@ - + @@ -52,7 +52,7 @@ - + - - - + + + - - - + + + diff --git a/zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionAware.java b/zookeeper-recipes/zookeeper-recipes-election/src/main/java/org/apache/zookeeper/recipes/leader/LeaderElectionAware.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionAware.java rename to zookeeper-recipes/zookeeper-recipes-election/src/main/java/org/apache/zookeeper/recipes/leader/LeaderElectionAware.java diff --git a/zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupport.java b/zookeeper-recipes/zookeeper-recipes-election/src/main/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupport.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupport.java rename to zookeeper-recipes/zookeeper-recipes-election/src/main/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupport.java diff --git a/zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderOffer.java b/zookeeper-recipes/zookeeper-recipes-election/src/main/java/org/apache/zookeeper/recipes/leader/LeaderOffer.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-election/src/java/org/apache/zookeeper/recipes/leader/LeaderOffer.java rename to zookeeper-recipes/zookeeper-recipes-election/src/main/java/org/apache/zookeeper/recipes/leader/LeaderOffer.java diff --git a/zookeeper-recipes/zookeeper-recipes-election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java b/zookeeper-recipes/zookeeper-recipes-election/src/test/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java rename to zookeeper-recipes/zookeeper-recipes-election/src/test/java/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java diff --git a/zookeeper-recipes/zookeeper-recipes-lock/README.txt b/zookeeper-recipes/zookeeper-recipes-lock/README.txt index 1fc4fbfc5c8..1322651b0cf 100644 --- a/zookeeper-recipes/zookeeper-recipes-lock/README.txt +++ b/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 diff --git a/zookeeper-recipes/zookeeper-recipes-lock/build.xml b/zookeeper-recipes/zookeeper-recipes-lock/build.xml index 1fa7b22d3b8..6d7d7360b20 100644 --- a/zookeeper-recipes/zookeeper-recipes-lock/build.xml +++ b/zookeeper-recipes/zookeeper-recipes-lock/build.xml @@ -19,7 +19,7 @@ - + @@ -114,13 +114,17 @@ - - - + + + - - - + + + + + + + diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/INSTALL b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/INSTALL similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/INSTALL rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/INSTALL diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/LICENSE b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/LICENSE similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/LICENSE rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/LICENSE diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/Makefile.am b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/Makefile.am similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/Makefile.am rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/Makefile.am diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/README.txt b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/README.txt similarity index 94% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/README.txt rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/README.txt index 326bba85d4d..9fd20da61e5 100644 --- a/zookeeper-recipes/zookeeper-recipes-lock/src/c/README.txt +++ b/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. diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/acinclude.m4 b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/acinclude.m4 similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/acinclude.m4 rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/acinclude.m4 diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/aminclude.am b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/aminclude.am similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/aminclude.am rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/aminclude.am diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/c-doc.Doxyfile b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/c-doc.Doxyfile similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/c-doc.Doxyfile rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/c-doc.Doxyfile diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/configure.ac b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/configure.ac similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/configure.ac rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/configure.ac diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/include/zoo_lock.h b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/include/zoo_lock.h similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/include/zoo_lock.h rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/include/zoo_lock.h diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/src/zoo_lock.c b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/src/zoo_lock.c similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/src/zoo_lock.c rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/src/zoo_lock.c diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/TestClient.cc b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/TestClient.cc similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/TestClient.cc rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/TestClient.cc diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/TestDriver.cc b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/TestDriver.cc similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/TestDriver.cc rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/TestDriver.cc diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/Util.cc b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/Util.cc similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/Util.cc rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/Util.cc diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/Util.h b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/Util.h similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/Util.h rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/Util.h diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/zkServer.sh b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/zkServer.sh similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/c/tests/zkServer.sh rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/c/tests/zkServer.sh diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java b/zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/LockListener.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/LockListener.java diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java b/zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java b/zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/WriteLock.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/WriteLock.java diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java b/zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/ZNodeName.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/ZNodeName.java diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java b/zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/src/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java rename to zookeeper-recipes/zookeeper-recipes-lock/src/main/java/org/apache/zookeeper/recipes/lock/ZooKeeperOperation.java diff --git a/zookeeper-recipes/zookeeper-recipes-lock/test/org/apache/zookeeper/recipes/lock/WriteLockTest.java b/zookeeper-recipes/zookeeper-recipes-lock/src/test/java/org/apache/zookeeper/recipes/lock/WriteLockTest.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/test/org/apache/zookeeper/recipes/lock/WriteLockTest.java rename to zookeeper-recipes/zookeeper-recipes-lock/src/test/java/org/apache/zookeeper/recipes/lock/WriteLockTest.java diff --git a/zookeeper-recipes/zookeeper-recipes-lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java b/zookeeper-recipes/zookeeper-recipes-lock/src/test/java/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java rename to zookeeper-recipes/zookeeper-recipes-lock/src/test/java/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java diff --git a/zookeeper-recipes/zookeeper-recipes-queue/build.xml b/zookeeper-recipes/zookeeper-recipes-queue/build.xml index 12ec0e186c4..c7984eca377 100644 --- a/zookeeper-recipes/zookeeper-recipes-queue/build.xml +++ b/zookeeper-recipes/zookeeper-recipes-queue/build.xml @@ -19,7 +19,7 @@ - + @@ -114,13 +114,17 @@ - - - + + + - - - + + + + + + + diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/INSTALL b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/INSTALL similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/INSTALL rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/INSTALL diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/LICENSE b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/LICENSE similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/LICENSE rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/LICENSE diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/Makefile.am b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/Makefile.am similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/Makefile.am rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/Makefile.am diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/README.txt b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/README.txt similarity index 94% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/README.txt rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/README.txt index 7ef253fc981..10a215ca233 100644 --- a/zookeeper-recipes/zookeeper-recipes-queue/src/c/README.txt +++ b/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. diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/acinclude.m4 b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/acinclude.m4 similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/acinclude.m4 rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/acinclude.m4 diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/aminclude.am b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/aminclude.am similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/aminclude.am rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/aminclude.am diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/c-doc.Doxyfile b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/c-doc.Doxyfile similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/c-doc.Doxyfile rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/c-doc.Doxyfile diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/configure.ac b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/configure.ac similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/configure.ac rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/configure.ac diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/include/zoo_queue.h b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/include/zoo_queue.h similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/include/zoo_queue.h rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/include/zoo_queue.h diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/src/zoo_queue.c b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/src/zoo_queue.c similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/src/zoo_queue.c rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/src/zoo_queue.c diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/TestClient.cc b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/TestClient.cc similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/TestClient.cc rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/TestClient.cc diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/TestDriver.cc b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/TestDriver.cc similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/TestDriver.cc rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/TestDriver.cc diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/Util.cc b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/Util.cc similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/Util.cc rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/Util.cc diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/Util.h b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/Util.h similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/Util.h rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/Util.h diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/zkServer.sh b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/zkServer.sh similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/c/tests/zkServer.sh rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/c/tests/zkServer.sh diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java b/zookeeper-recipes/zookeeper-recipes-queue/src/main/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java rename to zookeeper-recipes/zookeeper-recipes-queue/src/main/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java diff --git a/zookeeper-recipes/zookeeper-recipes-queue/test/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java b/zookeeper-recipes/zookeeper-recipes-queue/src/test/java/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java similarity index 100% rename from zookeeper-recipes/zookeeper-recipes-queue/test/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java rename to zookeeper-recipes/zookeeper-recipes-queue/src/test/java/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java