You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2014/04/25 10:10:04 UTC

svn commit: r1589949 - in /zookeeper/trunk: CHANGES.txt src/contrib/rest/build.xml

Author: michim
Date: Fri Apr 25 08:10:04 2014
New Revision: 1589949

URL: http://svn.apache.org/r1589949
Log:
ZOOKEEPER-1911. REST contrib module does not include all required files when packaged (Sean Mackrory via michim)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/contrib/rest/build.xml

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1589949&r1=1589948&r2=1589949&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Apr 25 08:10:04 2014
@@ -617,6 +617,9 @@ BUGFIXES:
   ZOOKEEPER-1913. Invalid manifest files due to bogus revision property value
   (Raul Gutierrez Segales via michim)
 
+  ZOOKEEPER-1911. REST contrib module does not include all required files when
+  packaged (Sean Mackrory via michim)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/contrib/rest/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/build.xml?rev=1589949&r1=1589948&r2=1589949&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/build.xml (original)
+++ zookeeper/trunk/src/contrib/rest/build.xml Fri Apr 25 08:10:04 2014
@@ -48,6 +48,22 @@
       </sequential>
     </macrodef>
 
+  <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}">
+      <fileset dir="${build.dir}">
+        <include name="zookeeper-${version}-${name}.jar" />
+      </fileset>
+    </copy>
+    <copy todir="${dist.dir}${package.share}/contrib/${name}/lib">
+      <fileset dir="${build.dir}/lib" />
+    </copy>
+    <copy todir="${dist.dir}${package.share}/contrib/${name}/conf">
+      <fileset dir="conf" />
+    </copy>
+  </target>
+
   <target name="setjarname">
     <property name="jarname"
               value="${build.dir}/zookeeper-${version}-${name}.jar"/>