This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new f3f7c79 ZOOKEEPER-3275: Fix release targets: package, tar, mvn-deploy
f3f7c79 is described below
commit f3f7c79bb1fd4c03d557948199cd1ce363668bfa
Author: Andor Molnar <andor@apache.org>
AuthorDate: Tue Feb 12 21:01:41 2019 +0100
ZOOKEEPER-3275: Fix release targets: package, tar, mvn-deploy
Fixed recipes and contrib path names for package and tar targets.
Author: Andor Molnar <andor@apache.org>
Reviewers: andor@apache.org
Closes #817 from anmolnar/ZOOKEEPER-3275 and squashes the following commits:
64db892af [Andor Molnar] ZOOKEEPER-3275. Fixed bin-package target
e8ad3d483 [Andor Molnar] ZOOKEEPER-3275. Added pom.xml to tar file, fixed mvn-deploy task
6667c2ff0 [Andor Molnar] ZOOKEEPER-3275. Updated release audit warnings exlcudes
5abf3b444 [Andor Molnar] ZOOKEEPER-3275. Fixed path of contrib and docs project
4e97ae8a7 [Andor Molnar] ZOOKEEPER-3275. Fixed recipes folders in ant package target
---
build.xml | 110 ++++++++++-----------
zookeeper-contrib/build-contrib.xml | 6 +-
.../zookeeper-contrib-fatjar/build.xml | 10 +-
.../zookeeper-contrib-loggraph/build.xml | 6 +-
zookeeper-contrib/zookeeper-contrib-rest/build.xml | 8 +-
.../zookeeper-contrib-zkfuse/build.xml | 4 +-
.../zookeeper-contrib-zkperl/build.xml | 4 +-
.../zookeeper-contrib-zkpython/build.xml | 4 +-
.../zookeeper-contrib-zktreeutil/build.xml | 4 +-
.../zookeeper-contrib-zooinspector/build.xml | 14 +--
zookeeper-recipes/build-recipes.xml | 4 +-
.../zookeeper-recipes-election/build.xml | 10 +-
zookeeper-recipes/zookeeper-recipes-lock/build.xml | 14 +--
.../zookeeper-recipes-queue/build.xml | 14 +--
14 files changed, 106 insertions(+), 106 deletions(-)
diff --git a/build.xml b/build.xml
index e28839b..fec8a77 100644
--- a/build.xml
+++ b/build.xml
@@ -793,12 +793,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
description="Build distribution">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
- <mkdir dir="${dist.dir}/contrib"/>
- <mkdir dir="${dist.dir}/recipes"/>
<mkdir dir="${dist.dir}/bin"/>
- <mkdir dir="${dist.dir}/docs"/>
- <mkdir dir="${dist.dir}/docs/jdiff"/>
- <mkdir dir="${dist.dir}/docs/api"/>
<copy todir="${dist.dir}/lib" includeEmptyDirs="false">
<fileset dir="${lib.dir}">
@@ -862,7 +857,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<fileset dir="${conf.dir}" excludes="**/*.template"/>
</copy>
- <copy todir="${dist.dir}/docs">
+ <copy todir="${dist.dir}/zookeeper-docs">
<fileset dir="zookeeper-docs/src/main/resources/markdown/" includes="**">
<exclude name="html/**" />
</fileset>
@@ -878,9 +873,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<fileset file="ivysettings.xml"/>
<fileset file="${java.server.resources.dir}/NOTICE.txt"/>
<fileset file="${java.server.resources.dir}/LICENSE.txt"/>
+ <fileset file="pom.xml"/>
</copy>
- <copy todir="${dist.dir}/src" includeEmptyDirs="true">
+ <copy todir="${dist.dir}" includeEmptyDirs="true">
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
<include name="zookeeper-recipes/**"/>
<include name="zookeeper-docs/**"/>
@@ -888,13 +884,14 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<include name="zookeeper-client/**"/>
<include name="zookeeper-jute/**"/>
<include name="zookeeper-server/**"/>
+ <include name="zookeeper-it/**"/>
</fileset>
<fileset file="${java.server.resources.dir}/pom.template"/>
</copy>
<chmod perm="ugo+x" type="file" parallel="false">
<fileset dir="${dist.dir}/bin"/>
- <fileset dir="${dist.dir}/src/zookeeper-contrib/">
+ <fileset dir="${dist.dir}/zookeeper-contrib/">
<include name="*/bin/*" />
</fileset>
</chmod>
@@ -910,9 +907,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<mkdir dir="${dist.dir}/share/zookeeper/contrib"/>
<mkdir dir="${dist.dir}/share/zookeeper/recipes"/>
<mkdir dir="${dist.dir}/bin"/>
- <mkdir dir="${dist.dir}/docs"/>
- <mkdir dir="${dist.dir}/docs/jdiff"/>
- <mkdir dir="${dist.dir}/docs/api"/>
<mkdir dir="${dist.dir}/share/zookeeper/templates/conf"/>
<mkdir dir="${dist.dir}/sbin"/>
@@ -1006,15 +1000,23 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<fileset file="${java.server.resources.dir}/LICENSE.txt"/>
</copy>
- <copy todir="${dist.dir}/src" includeEmptyDirs="true">
- <fileset dir="src" excludes="**/*.template **/docs/build/**/* **/ivy*.jar"/>
+ <copy todir="${dist.dir}" includeEmptyDirs="true">
+ <fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
+ <include name="zookeeper-recipes/**"/>
+ <include name="zookeeper-docs/**"/>
+ <include name="zookeeper-contrib/**"/>
+ <include name="zookeeper-client/**"/>
+ <include name="zookeeper-jute/**"/>
+ <include name="zookeeper-server/**"/>
+ <include name="zookeeper-it/**"/>
+ </fileset>
<fileset file="${java.server.resources.dir}/pom.template"/>
</copy>
-
+
<chmod perm="ugo+x" type="file" parallel="false">
<fileset dir="${dist.dir}/bin"/>
<fileset dir="${dist.dir}/sbin"/>
- <fileset dir="${dist.dir}/contrib/">
+ <fileset dir="${dist.dir}/zookeeper-contrib/">
<include name="**/*.sh" />
<include name="**/*.py" />
</fileset>
@@ -1031,7 +1033,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
however that's the only way ant currently supports afaik -->
<tarfileset dir="${build.dir}" mode="664">
<exclude name="${final.name}/bin/*" />
- <exclude name="${final.name}/contrib/*/bin/*" />
+ <exclude name="${final.name}/zookeeper-contrib/*/bin/*" />
<exclude name="${final.name}/**/compile" />
<exclude name="${final.name}/**/config.guess" />
@@ -1049,7 +1051,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<tarfileset dir="${build.dir}" mode="755">
<!-- be sure to add to exclude list above if you add here -->
<include name="${final.name}/bin/*" />
- <include name="${final.name}/contrib/*/bin/*" />
+ <include name="${final.name}/zookeeper-contrib/*/bin/*" />
<!-- autotools related commands -->
<include name="${final.name}/**/compile" />
@@ -1747,48 +1749,46 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
<exclude name="**/VERSION"/>
<exclude name="**/ChangeLog"/>
<exclude name="**/Changes"/>
- <exclude name="**/contrib/zkperl/MANIFEST"/>
<exclude name="**/zookeeper-contrib/zookeeper-contrib-zkperl/MANIFEST"/>
<exclude name="**/conf/*"/>
- <exclude name="**/docs/"/>
<exclude name="**/zookeeper-docs/"/>
<exclude name="**/lib/jdiff/"/>
- <exclude name="contrib/ZooInspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/*.la"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/*.lo"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/.libs/"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/config**"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/include/winstdint.h"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/src/hashtable/"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/test-driver"/>
- <exclude name="src/zookeeper-client/zookeeper-client-c/tests/quorum.cfg"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
- <exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
- <exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
- <exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
- <exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
- <exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
- <exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
- <exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
- <exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
- <exclude name="src/zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses"/>
- <exclude name="src/zookeeper-jute/target/main/java/.generated/"/>
- <exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xml"/>
- <exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xsl"/>
- <exclude name="src/zookeeper-server/src/test/resources/findbugs*.xml"/>
- <exclude name="src/**/*.vcproj"/>
- <exclude name="src/**/*.vcxproj*"/>
- <exclude name="src/**/*.sln"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-ZooInspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/*.la"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/*.lo"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/.libs/"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/config**"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/include/winstdint.h"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/src/hashtable/"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/test-driver"/>
+ <exclude name="zookeeper-client/zookeeper-client-c/tests/quorum.cfg"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
+ <exclude name="zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses"/>
+ <exclude name="zookeeper-jute/target/main/java/.generated/"/>
+ <exclude name="zookeeper-server/src/test/resources/checkstyle*.xml"/>
+ <exclude name="zookeeper-server/src/test/resources/checkstyle*.xsl"/>
+ <exclude name="zookeeper-server/src/test/resources/findbugs*.xml"/>
+ <exclude name="**/*.vcproj"/>
+ <exclude name="**/*.vcxproj*"/>
+ <exclude name="**/*.sln"/>
</fileset>
</rat:report>
</target>
diff --git a/zookeeper-contrib/build-contrib.xml b/zookeeper-contrib/build-contrib.xml
index d30a773..70bb864 100644
--- a/zookeeper-contrib/build-contrib.xml
+++ b/zookeeper-contrib/build-contrib.xml
@@ -32,7 +32,7 @@
<property name="lib.dir" location="${zk.root}/zookeeper-server/src/main/resources/lib"/>
- <property name="build.dir" location="${zk.root}/build/contrib/${name}"/>
+ <property name="build.dir" location="${zk.root}/build/zookeeper-contrib/zookeeper-contrib-${name}"/>
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.test" location="${build.dir}/test"/>
@@ -144,8 +144,8 @@
<target name="package" depends="jar" unless="skip.contrib">
<echo message="contrib: ${name}"/>
- <mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
- <copy todir="${dist.dir}${package.share}/contrib/${name}" includeEmptyDirs="false"
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"
includeEmptyDirs="false"
flatten="true">
<fileset dir="${build.dir}">
<include name="zookeeper-${version}-${name}.jar" />
diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml
index 279cb22..3a1dd95 100644
--- a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml
@@ -54,15 +54,15 @@
<target name="package" depends="jar, zookeeperbuildcontrib.package"
unless="skip.contrib">
- <copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
+ <copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
- <mkdir dir="${dist.dir}/contrib/${name}/conf"/>
- <copy todir="${dist.dir}/contrib/${name}/conf">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/conf"/>
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/conf">
<fileset dir="${basedir}/src/main/resources"/>
</copy>
- <mkdir dir="${dist.dir}/contrib/${name}/src"/>
- <copy todir="${dist.dir}/contrib/${name}/src">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src"/>
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
<fileset dir="${basedir}/src"/>
</copy>
</target>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml
index 8ef1066..07809ff 100644
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml
@@ -58,10 +58,10 @@
<target name="package" depends="compile, zookeeperbuildcontrib.package" unless="skip.contrib">
<echo message="contrib: ${name}"/>
- <copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
+ <copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
- <mkdir dir="${dist.dir}/contrib/${name}/src"/>
- <copy todir="${dist.dir}/contrib/${name}/src">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src"/>
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
<fileset dir="${basedir}/src/main"/>
</copy>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/build.xml b/zookeeper-contrib/zookeeper-contrib-rest/build.xml
index 3a347de..f9cade6 100644
--- a/zookeeper-contrib/zookeeper-contrib-rest/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/build.xml
@@ -50,16 +50,16 @@
<target name="package" depends="jar" unless="skip.contrib">
<echo message="contrib: ${name}"/>
- <mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
- <copy todir="${dist.dir}${package.share}/contrib/${name}">
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}">
<include name="zookeeper-${version}-${name}.jar" />
</fileset>
</copy>
- <copy todir="${dist.dir}${package.share}/contrib/${name}/lib">
+ <copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}/lib">
<fileset dir="${build.dir}/lib" />
</copy>
- <copy todir="${dist.dir}${package.share}/contrib/${name}/conf">
+ <copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}/conf">
<fileset dir="conf" />
</copy>
</target>
diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml b/zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml
index f589453..7104004 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml
@@ -52,8 +52,8 @@
<target name="package" depends="compile" unless="skip.contrib">
<echo message="contrib: ${name}"/>
- <mkdir dir="${dist.dir}/contrib/${name}"/>
- <copy todir="${dist.dir}/contrib/${name}">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}"/>
</copy>
</target>
diff --git a/zookeeper-contrib/zookeeper-contrib-zkperl/build.xml b/zookeeper-contrib/zookeeper-contrib-zkperl/build.xml
index 0c7207d..84fa4c2 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkperl/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zkperl/build.xml
@@ -52,8 +52,8 @@
<target name="package" depends="compile" unless="skip.contrib">
<echo message="contrib: ${name}"/>
- <mkdir dir="${dist.dir}/contrib/${name}"/>
- <copy todir="${dist.dir}/contrib/${name}">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}"/>
</copy>
</target>
diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml b/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml
index 82ff902..c229dee 100644
--- a/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml
@@ -87,8 +87,8 @@
<arg line="${version}" />
</exec>
- <mkdir dir="${dist.dir}/contrib/${name}"/>
- <copy todir="${dist.dir}/contrib/${name}">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}">
<exclude name="**/temp*"/>
</fileset>
diff --git a/zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml b/zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml
index 809d134..7ff6749 100644
--- a/zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml
@@ -52,8 +52,8 @@
<target name="package" depends="compile" unless="skip.contrib">
<echo message="contrib: ${name}"/>
- <mkdir dir="${dist.dir}/contrib/${name}"/>
- <copy todir="${dist.dir}/contrib/${name}">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
<fileset dir="${build.dir}"/>
</copy>
</target>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
index 68ea9f7..7290b18 100644
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
@@ -127,18 +127,18 @@
<target name="package" depends="jar, zookeeperbuildcontrib.package" unless="skip.contrib">
- <copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}" />
+ <copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"
/>
- <mkdir dir="${dist.dir}/contrib/${name}/src" />
- <copy todir="${dist.dir}/contrib/${name}/src">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src" />
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
<fileset dir="${basedir}/src" />
</copy>
- <mkdir dir="${dist.dir}/contrib/${name}/licences" />
- <copy todir="${dist.dir}/contrib/${name}/licences">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/licences" />
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/licences">
<fileset dir="${basedir}/licences" />
</copy>
- <mkdir dir="${dist.dir}/contrib/${name}/config" />
- <copy todir="${dist.dir}/contrib/${name}/config">
+ <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/config" />
+ <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/config">
<fileset dir="${basedir}/src/main/resources">
<include name="defaultConnectionSettings.cfg" />
<include name="defaultNodeViewers.cfg" />
diff --git a/zookeeper-recipes/build-recipes.xml b/zookeeper-recipes/build-recipes.xml
index 45054b1..d5bf87e 100644
--- a/zookeeper-recipes/build-recipes.xml
+++ b/zookeeper-recipes/build-recipes.xml
@@ -122,8 +122,8 @@
<target name="package" depends="jar" unless="skip.recipes">
<echo message="recipes: ${name}"/>
- <mkdir dir="${dist.dir}${package.share}/recipes/${name}"/>
- <copy todir="${dist.dir}${package.share}/recipes/${name}" includeEmptyDirs="false"
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}"
includeEmptyDirs="false"
flatten="true">
<fileset dir="${build.dir}">
<include name="zookeeper-${version}-recipes-${name}.jar" />
diff --git a/zookeeper-recipes/zookeeper-recipes-election/build.xml b/zookeeper-recipes/zookeeper-recipes-election/build.xml
index 6f091a5..05c467a 100644
--- a/zookeeper-recipes/zookeeper-recipes-election/build.xml
+++ b/zookeeper-recipes/zookeeper-recipes-election/build.xml
@@ -112,14 +112,14 @@
<target name="package" depends="jar, zookeeperbuildrecipes.package"
unless="skip.recipes">
- <copy file="${basedir}/build.xml" todir="${dist.dir}/recipes/${name}"/>
+ <copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-recipes/zookeeper-recipes-${name}"/>
- <mkdir dir="${dist.dir}/recipes/${name}/src/test/java"/>
- <copy todir="${dist.dir}/recipes/${name}/src/test/java">
+ <mkdir dir="${dist.dir}/zookeeper-recipes/zookeeper-recipes-${name}/src/test/java"/>
+ <copy todir="${dist.dir}/zookeeper-recipes/zookeeper-recipes-${name}/src/test/java">
<fileset dir="${basedir}/src/test/java"/>
</copy>
- <mkdir dir="${dist.dir}/recipes/${name}/src/main/java"/>
- <copy todir="${dist.dir}/recipes/${name}/src/main/java">
+ <mkdir dir="${dist.dir}/zookeeper-recipes/zookeeper-recipes-${name}/src/main/java"/>
+ <copy todir="${dist.dir}/zookeeper-recipes/zookeeper-recipes-${name}/src/main/java">
<fileset dir="${basedir}/src/main/java"/>
</copy>
</target>
diff --git a/zookeeper-recipes/zookeeper-recipes-lock/build.xml b/zookeeper-recipes/zookeeper-recipes-lock/build.xml
index ea7b37f..896ebbd 100644
--- a/zookeeper-recipes/zookeeper-recipes-lock/build.xml
+++ b/zookeeper-recipes/zookeeper-recipes-lock/build.xml
@@ -112,18 +112,18 @@
<target name="package" depends="jar, zookeeperbuildrecipes.package"
unless="skip.recipes">
- <copy file="${basedir}/build.xml" todir="${dist.dir}${package.share}/recipes/${name}"/>
+ <copy file="${basedir}/build.xml" todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}"/>
- <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/test/java"/>
- <copy todir="${dist.dir}${package.share}/recipes/${name}/src/test/java">
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/test/java"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/test/java">
<fileset dir="${basedir}/src/test/java"/>
</copy>
- <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/main/java"/>
- <copy todir="${dist.dir}${package.share}/recipes/${name}/src/main/java">
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/main/java"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-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">
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/main/c"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/main/c">
<fileset dir="${basedir}/src/main/c"/>
</copy>
</target>
diff --git a/zookeeper-recipes/zookeeper-recipes-queue/build.xml b/zookeeper-recipes/zookeeper-recipes-queue/build.xml
index 289c0f9..4346d96 100644
--- a/zookeeper-recipes/zookeeper-recipes-queue/build.xml
+++ b/zookeeper-recipes/zookeeper-recipes-queue/build.xml
@@ -112,18 +112,18 @@
<target name="package" depends="jar, zookeeperbuildrecipes.package"
unless="skip.recipes">
- <copy file="${basedir}/build.xml" todir="${dist.dir}${package.share}/recipes/${name}"/>
+ <copy file="${basedir}/build.xml" todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}"/>
- <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/test/java"/>
- <copy todir="${dist.dir}${package.share}/recipes/${name}/src/test/java">
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/test/java"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/test/java">
<fileset dir="${basedir}/src/test/java"/>
</copy>
- <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src/main/java"/>
- <copy todir="${dist.dir}${package.share}/recipes/${name}/src/main/java">
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/main/java"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-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">
+ <mkdir dir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/main/c"/>
+ <copy todir="${dist.dir}${package.share}/zookeeper-recipes/zookeeper-recipes-${name}/src/main/c">
<fileset dir="${basedir}/src/main/c"/>
</copy>
</target>
|