Skip to content

Commit 28de451

Browse files
nkalmaranmolnar
authored andcommitted
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 <[email protected]> Reviewers: [email protected] Closes apache#564 from nkalmar/ZOOKEEPER-3033 and squashes the following commits: c8c2e98 [Norbert Kalmar] ZOOKEEPER-3033 rename sub directories as well d2b7f18 [Norbert Kalmar] ZOOKEEPER-3033 create zk-recipes maven structure
1 parent 536dda2 commit 28de451

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+11
-10
lines changed

build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
149149
<property name="dist.maven.dir" value="${dist.dir}/dist-maven"/>
150150

151151
<property name="contrib.dir" value="${src.dir}/contrib"/>
152-
<property name="recipes.dir" value="${src.dir}/recipes"/>
152+
<property name="recipes.dir" value="${basedir}/zookeeper-recipes"/>
153153

154154
<property name="ivy.version" value="2.4.0"/>
155155
<property name="ivy.url"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
<note>
284284
<para>There now exists a Queue implementation in ZooKeeper
285285
recipes directory. This is distributed with the release --
286-
src/recipes/queue directory of the release artifact.
286+
zookeeper-recipes/zookeeper-recipes-queue directory of the release artifact.
287287
</para>
288288
</note>
289289

@@ -312,7 +312,7 @@
312312
<note>
313313
<para>There now exists a Lock implementation in ZooKeeper
314314
recipes directory. This is distributed with the release --
315-
src/recipes/lock directory of the release artifact.
315+
zookeeper-recipes/zookeeper-recipes-lock directory of the release artifact.
316316
</para>
317317
</note>
318318

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
1) This source directory contains various Zookeeper recipe implementations.
1+
1) This source directory contains various Zookeeper recipe implementations.
22

3-
2) The recipe directory name should specify the name of the recipe you are implementing - eg. lock/.
3+
2) The recipe directory name should specify the name of the recipe you are implementing - eg. zookeeper-recipes-lock/.
44

55
3) It would be great if you can provide both the java and c recipes for the zookeeper recipes.
6-
The c recipes go in to recipe-name/src/c and the java implementation goes into recipe-name/src/java.
6+
C recipes go in to zookeeper-recipes/zookeeper-recipes-[recipe-name]/src/c
7+
Java implementation goes into zookeeper-recipes/zookeeper-recipes-[recipe-name]/src/java.
78

89
4) The recipes hold high standards like our zookeeper c/java libraries, so make sure that you include
910
some unit testing with both the c and java recipe code.
1011

1112
5) Also, please name your c client public methods as
1213
zkr_recipe-name_methodname
13-
(eg. zkr_lock_lock in lock/src/c)
14+
(eg. zkr_lock_lock in zookeeper-recipes-lock/src/c)
1415

15-
6) The various recipes are in ../../docs/recipes.html or
16+
6) The various recipes are in ../docs/recipes.html or
1617
../../docs/reciped.pdf. Also, this is not an exhaustive list by any chance.
1718
Zookeeper is used (and can be used) for more than what we have listed in the docs.
1819

@@ -21,5 +22,5 @@ Zookeeper is used (and can be used) for more than what we have listed in the doc
2122
{top}/src/c/ are compiled. Run autoreconf -if;./configure; make. The libaries
2223
will be installed in {top}/src/c/.libs.
2324
- run autoreconf if;./configure;make run-check
24-
in src/recipes/$recipename/src/c
25+
in zookeeper-recipes/$recipename/src/c
2526

src/recipes/build-recipes.xml zookeeper-recipes/build-recipes.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<property name="name" value="${ant.project.name}"/>
2525
<property name="root" value="${basedir}"/>
2626

27-
<property name="zk.root" location="${root}/../../../"/>
27+
<property name="zk.root" location="${root}/../../"/>
2828

2929
<property name="src.dir" location="${root}/src/java"/>
3030
<property name="src.test" location="${root}/src/test"/>
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)