From commits-return-7499-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Fri Jan 11 10:17:52 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0B5CC180648 for ; Fri, 11 Jan 2019 10:17:50 +0100 (CET) Received: (qmail 2277 invoked by uid 500); 11 Jan 2019 09:17:50 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 2266 invoked by uid 99); 11 Jan 2019 09:17:50 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jan 2019 09:17:50 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3C6F887059; Fri, 11 Jan 2019 09:17:49 +0000 (UTC) Date: Fri, 11 Jan 2019 09:17:49 +0000 To: "commits@zookeeper.apache.org" Subject: [zookeeper] branch branch-3.4 updated: ZOOKEEPER-3171: MAVEN MIGRATION - 3.4 - MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154719826911.10487.13833750381575731808@gitbox.apache.org> From: andor@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: zookeeper X-Git-Refname: refs/heads/branch-3.4 X-Git-Reftype: branch X-Git-Oldrev: c3f320a2d007b9fbe99fa0b6d5d38858e50a73a1 X-Git-Newrev: b8044eae3e700650a646969352a508122a4e5a98 X-Git-Rev: b8044eae3e700650a646969352a508122a4e5a98 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. andor pushed a commit to branch branch-3.4 in repository https://gitbox.apache.org/repos/asf/zookeeper.git The following commit(s) were added to refs/heads/branch-3.4 by this push: new b8044ea ZOOKEEPER-3171: MAVEN MIGRATION - 3.4 - b8044ea is described below commit b8044eae3e700650a646969352a508122a4e5a98 Author: Norbert Kalmar AuthorDate: Fri Jan 11 10:17:30 2019 +0100 ZOOKEEPER-3171: MAVEN MIGRATION - 3.4 - Author: Norbert Kalmar Reviewers: andorapache.org Closes #745 from nkalmar/ZOOKEEPER-3171r and squashes the following commits: deb5ed337 [Norbert Kalmar] ZOOKEEPER-3171 - fix releaseaudit excludes d70503e76 [Norbert Kalmar] ZOOKEEPER-3171 - Add recipes and contrib maven build Author: Norbert Kalmar Reviewers: andor@apache.org Closes #766 from nkalmar/ZK-3171-3.4 --- build.xml | 34 ++--- pom.xml | 12 ++ zookeeper-contrib/pom.xml | 44 +++++++ .../zookeeper-contrib-loggraph/build.xml | 2 +- .../zookeeper-contrib-loggraph/pom.xml | 94 ++++++++++++++ .../org/apache/zookeeper/graph/log4j.properties | 0 .../zookeeper/graph/resources/date.format.js | 0 .../org/apache/zookeeper/graph/resources/g.bar.js | 0 .../org/apache/zookeeper/graph/resources/g.dot.js | 0 .../org/apache/zookeeper/graph/resources/g.line.js | 0 .../org/apache/zookeeper/graph/resources/g.pie.js | 0 .../apache/zookeeper/graph/resources/g.raphael.js | 0 .../apache/zookeeper/graph/resources/load-big.gif | Bin .../org/apache/zookeeper/graph/resources/load.gif | Bin .../apache/zookeeper/graph/resources/loggraph.css | 0 .../apache/zookeeper/graph/resources/loggraph.js | 0 .../zookeeper/graph/resources/loggraph.log.js | 0 .../zookeeper/graph/resources/loggraph.server.js | 0 .../zookeeper/graph/resources/loggraph.session.js | 0 .../zookeeper/graph/resources/loggraph.stats.js | 0 .../zookeeper/graph/resources/loggraph.ui.js | 0 .../org/apache/zookeeper/graph/resources/main.html | 0 .../apache/zookeeper/graph/resources/raphael.js | 0 .../apache/zookeeper/graph/resources/yui-min.js | 0 zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 138 +++++++++++++++++++++ .../zookeeper-contrib-zooinspector/pom.xml | 128 +++++++++++++++++++ zookeeper-recipes/pom.xml | 65 ++++++++++ .../zookeeper-recipes-election/pom.xml | 74 +++++++++++ .../zookeeper-recipes-lock/README.txt | 2 +- zookeeper-recipes/zookeeper-recipes-lock/pom.xml | 74 +++++++++++ zookeeper-recipes/zookeeper-recipes-queue/pom.xml | 79 ++++++++++++ zookeeper-server/pom.xml | 13 ++ 32 files changed, 741 insertions(+), 18 deletions(-) diff --git a/build.xml b/build.xml index 87df869..d4b6981 100644 --- a/build.xml +++ b/build.xml @@ -1802,22 +1802,24 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 09b80cf..4a6b52a 100755 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,8 @@ zookeeper-jute zookeeper-server zookeeper-client + zookeeper-recipes + zookeeper-contrib @@ -662,6 +664,11 @@ org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + org.apache.maven.plugins maven-surefire-plugin 2.22.1 @@ -695,6 +702,11 @@ clover-maven-plugin 4.3.1 + + org.apache.maven.plugins + maven-install-plugin + 3.0.0-M1 + diff --git a/zookeeper-contrib/pom.xml b/zookeeper-contrib/pom.xml new file mode 100755 index 0000000..b796ecf --- /dev/null +++ b/zookeeper-contrib/pom.xml @@ -0,0 +1,44 @@ + + + + 4.0.0 + + + org.apache.zookeeper + zookeeper + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-contrib + pom + Apache ZooKeeper - Contrib + + Contrib projects to Apache ZooKeeper + + + + zookeeper-contrib-loggraph + zookeeper-contrib-rest + zookeeper-contrib-zooinspector + + + \ No newline at end of file diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml index 11143e7..8ef1066 100644 --- a/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml @@ -38,7 +38,7 @@ - + diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml new file mode 100755 index 0000000..8a40b99 --- /dev/null +++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml @@ -0,0 +1,94 @@ + + + + 4.0.0 + + org.apache.zookeeper + zookeeper-contrib + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-contrib-loggraph + jar + Apache ZooKeeper - Contrib - Loggraph + + LogGraph is an application for viewing and filtering zookeeper logs. It can handle transaction logs and message logs. + + + + + org.apache.zookeeper + zookeeper-jute + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + * + * + + + + + log4j + log4j + + + * + * + + + + + org.eclipse.jetty + jetty-server + + + org.eclipse.jetty + jetty-servlet + + + com.googlecode.json-simple + json-simple + + + + + + + ${project.basedir}/src/main/resources/webapp + + + + + \ No newline at end of file diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/log4j.properties b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/log4j.properties similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/log4j.properties rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/log4j.properties diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/date.format.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/date.format.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.bar.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.bar.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.dot.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.dot.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.line.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.line.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.pie.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.pie.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.raphael.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.raphael.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/load-big.gif b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/load-big.gif similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/load-big.gif rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/load-big.gif diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/load.gif b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/load.gif similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/load.gif rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/load.gif diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.css b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.css similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.css rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.css diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.log.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.log.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.log.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.log.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.server.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.session.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.session.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.session.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.session.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.stats.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.stats.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.stats.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.stats.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.ui.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.ui.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/loggraph.ui.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/loggraph.ui.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/main.html b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/main.html similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/main.html rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/main.html diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/raphael.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/raphael.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/yui-min.js b/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js similarity index 100% rename from zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/yui-min.js rename to zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml new file mode 100755 index 0000000..530fd2a --- /dev/null +++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml @@ -0,0 +1,138 @@ + + + + 4.0.0 + + org.apache.zookeeper + zookeeper-contrib + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-contrib-rest + jar + Apache ZooKeeper - Contrib - Rest + + ZooKeeper REST implementation using Jersey JAX-RS. + -------------------------------------------------- + + This is an implementation of version 2 of the ZooKeeper REST spec. + + Note: This interface is currently experimental, may change at any time, + etc... In general you should be using the Java/C client bindings to access + the ZooKeeper server. + + This REST ZooKeeper gateway is useful because most of the languages + have built-in support for working with HTTP based protocols. + + See SPEC.txt for details on the REST binding. + + + + 3.1 + 1.9.8 + 1.1.5.1 + + + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + test-jar + test + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + * + * + + + + + log4j + log4j + + + * + * + + + + + asm + asm + ${asm.version} + + + com.sun.grizzly + grizzly-servlet-webserver + ${grizzly.version} + + + com.sun.jersey + jersey-server + ${jersey.version} + + + com.sun.jersey + jersey-json + ${jersey.version} + + + com.sun.jersey + jersey-client + ${jersey.version} + test + + + junit + junit + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + true + + + + + + \ No newline at end of file diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml new file mode 100755 index 0000000..a4bab6e --- /dev/null +++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml @@ -0,0 +1,128 @@ + + + + 4.0.0 + + org.apache.zookeeper + zookeeper-contrib + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-contrib-zooinspector + jar + Apache ZooKeeper - Contrib - ZooInspector + + ZooInspector is a Java Swing based application for browsing and editing ZooKeeper instances. + + + + 0.6 + 2.4 + 18.0 + + + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + * + * + + + + + log4j + log4j + + + * + * + + + + + junit + junit + test + + + com.google.guava + guava + ${guava.version} + + + org.apache.rat + apache-rat-tasks + ${rat.version} + + + commons-lang + commons-lang + ${commons-lang.version} + + + commons-collections + commons-collections + + + com.nitido.utils + toaster + 1.0.4 + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + initialize + + install-file + + + com.nitido.utils + toaster + 1.0.4 + jar + ${basedir}/lib/jtoaster-1.0.4.jar + + + + + + + + \ No newline at end of file diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml new file mode 100755 index 0000000..7051333 --- /dev/null +++ b/zookeeper-recipes/pom.xml @@ -0,0 +1,65 @@ + + + + 4.0.0 + + + org.apache.zookeeper + zookeeper + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-recipes + pom + Apache ZooKeeper - Recipes + + 1) This module contains various Zookeeper recipe implementations. + + 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. + 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 + some unit testing with both the c and java recipe code. + + 5) Also, please name your c client public methods as + zkr_recipe-name_methodname + (eg. zkr_lock_lock in zookeeper-recipes-lock/src/c) + + 6) To run the c tests in all the recipes, + - make sure the main zookeeper c libraries in + zookeeper-client-c are compiled. Run autoreconf -if;./configure; make. The libraries + will be installed in {top}/src/c/.libs. + - run autoreconf if;./configure;make run-check + in zookeeper-recipes/$recipename/src/c + + + + + zookeeper-recipes-election + zookeeper-recipes-lock + zookeeper-recipes-queue + + + \ No newline at end of file diff --git a/zookeeper-recipes/zookeeper-recipes-election/pom.xml b/zookeeper-recipes/zookeeper-recipes-election/pom.xml new file mode 100755 index 0000000..7cb1f9a --- /dev/null +++ b/zookeeper-recipes/zookeeper-recipes-election/pom.xml @@ -0,0 +1,74 @@ + + + + 4.0.0 + + org.apache.zookeeper + zookeeper-recipes + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-recipes-election + jar + Apache ZooKeeper - Recipes - Election + + This election interface recipe implements the leader election recipe + + + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + test-jar + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test.java + + ${surefire-forkcount} + false + -Xmx512m + ${project.basedir} + true + + ${project.build.directory}/surefire + + + + + + + \ No newline at end of file diff --git a/zookeeper-recipes/zookeeper-recipes-lock/README.txt b/zookeeper-recipes/zookeeper-recipes-lock/README.txt index 1322651..4ce629e 100644 --- a/zookeeper-recipes/zookeeper-recipes-lock/README.txt +++ b/zookeeper-recipes/zookeeper-recipes-lock/README.txt @@ -19,7 +19,7 @@ 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/main/c and read +this directory. For compiling the c libarary go to zookeeper-client/zookeeper-client-c and read the INSTALLATION instructions. Please report any bugs on the jira diff --git a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml new file mode 100755 index 0000000..6448728 --- /dev/null +++ b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml @@ -0,0 +1,74 @@ + + + + 4.0.0 + + org.apache.zookeeper + zookeeper-recipes + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-recipes-lock + jar + Apache ZooKeeper - Recipes - Lock + + This lock interface recipe implements the lock recipe + + + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + test-jar + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test.java + + ${surefire-forkcount} + false + -Xmx512m + ${project.basedir} + true + + ${project.build.directory}/surefire + + + + + + + \ No newline at end of file diff --git a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml new file mode 100755 index 0000000..d4e6652 --- /dev/null +++ b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml @@ -0,0 +1,79 @@ + + + + 4.0.0 + + org.apache.zookeeper + zookeeper-recipes + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-recipes-queue + jar + Apache ZooKeeper - Recipes - Queue + + This queue interface recipe implements the queue recipe + A more detailed explanation is at: + http://www.cloudera.com/blog/2009/05/28/building-a-distributed-concurrent-queue-with-apache-zookeeper/ + + This recipe does not handle KeeperException.ConnectionLossException or ZCONNECTIONLOSS. + It will only work correctly once ZOOKEEPER-22 https://issues.apache.org/jira/browse/ZOOKEEPER-22 is resolved. + + + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + + + org.apache.zookeeper + zookeeper-server + 3.6.0-SNAPSHOT + test-jar + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test.java + + ${surefire-forkcount} + false + -Xmx512m + ${project.basedir} + true + + ${project.build.directory}/surefire + + + + + + + \ No newline at end of file diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index dbed767..b39df73 100755 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -249,6 +249,19 @@ org.apache.maven.plugins + maven-jar-plugin + + + Jar Tests Package + package + + test-jar + + + + + + org.apache.maven.plugins maven-dependency-plugin