This is an automated email from the ASF dual-hosted git repository. andor pushed a commit to annotated tag release-3.4.14-rc1 in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit ba56ac5689554a76555a8c4d908857bc5e9844a0 Author: Andor Molnar <[email protected]> AuthorDate: Wed Feb 13 15:48:22 2019 +0100 ZOOKEEPER-3275: Fix release targets: package, tar, mvn-deploy (3.4) Fixed recipes and contrib path names for package and tar targets. Author: Andor Molnar <andorapache.org> Reviewers: andorapache.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 Author: Andor Molnar <[email protected]> Reviewers: [email protected] Closes #818 from anmolnar/ZOOKEEPER-3275_34 and squashes the following commits: e04336f68 [Andor Molnar] ZOOKEEPER-3275. Fixed tiny copy-and-paste error 539951a37 [Andor Molnar] ZOOKEEPER-3275. Added some missing release audit excludes a5cc9e277 [Andor Molnar] ZOOKEEPER-3275: Fix release targets: package, tar, mvn-deploy --- build.xml | 103 +++++++++++---------- 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 | 22 ++--- 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, 109 insertions(+), 104 deletions(-) diff --git a/build.xml b/build.xml index e214b7e..df2014a 100644 --- a/build.xml +++ b/build.xml @@ -740,12 +740,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> 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}"> @@ -809,7 +804,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <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> @@ -825,9 +820,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <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/**"/> @@ -835,13 +831,14 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <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> @@ -857,9 +854,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <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"/> @@ -955,8 +949,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <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> @@ -973,7 +975,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <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> @@ -990,7 +992,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> 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" /> @@ -1008,7 +1010,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <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" /> @@ -1779,6 +1781,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <target name="releaseaudit" depends="package,rats-taskdef" description="Release Audit activities"> <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"> <fileset dir="${dist.dir}"> + <exclude name="**/*.cer"/> <exclude name="**/*.m4"/> <exclude name="**/*.md5"/> <exclude name="**/*.pom"/> @@ -1799,44 +1802,50 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle"> <exclude name="CHANGES.txt"/> <exclude name="**/README.md"/> <exclude name="README_packaging.txt"/> + <exclude name="**/TODO"/> <exclude name="**/VERSION"/> <exclude name="**/ChangeLog"/> <exclude name="**/Changes"/> - <exclude name="**/contrib/zkperl/MANIFEST"/> <exclude name="**/zookeeper-contrib/zookeeper-contrib-zkperl/MANIFEST"/> - <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="contrib/ZooInspector/licences/epl-v10.html"/> <exclude name="**/conf/*"/> - <exclude name="**/docs/"/> <exclude name="**/zookeeper-docs/"/> <exclude name="**/lib/jdiff/"/> - <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/src/hashtable/"/> - <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/**/*.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 7f08a8a..cd1d532 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 6895ad1..8189a74 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 029d4f2..7c291ae 100644 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml @@ -91,8 +91,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 c57dba1..faa0b34 100644 --- a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml +++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml @@ -125,31 +125,27 @@ <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}/icons" /> - <copy todir="${dist.dir}/contrib/${name}/icons"> - <fileset dir="${basedir}/src/main/resources/icons" /> - </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" /> </fileset> </copy> - <copy todir="${dist.dir}/contrib/${name}/lib"> + <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/lib"> <fileset file="${basedir}/lib/jtoaster-1.0.4.jar" /> </copy> - <copy todir="${dist.dir}/contrib/${name}/lib"> + <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/lib"> <fileset file="../../build/zookeeper-${version}.jar" /> </copy> </target> diff --git a/zookeeper-recipes/build-recipes.xml b/zookeeper-recipes/build-recipes.xml index 6804adc..6f2e296 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 e7ca583..dd4464e 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 840a5bb..f650056 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 9d83daa..163ef3b 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>
