Browse Source

ZOOKEEPER-1911. REST contrib module does not include all required files when packaged (Sean Mackrory via michim)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1589949 13f79535-47bb-0310-9956-ffa450edef68
Michi Mutsuzaki 11 years ago
parent
commit
9f2a90d8e0
2 changed files with 19 additions and 0 deletions
  1. 3 0
      CHANGES.txt
  2. 16 0
      src/contrib/rest/build.xml

+ 3 - 0
CHANGES.txt

@@ -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,

+ 16 - 0
src/contrib/rest/build.xml

@@ -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"/>