LUCENE-907: Include LICENSE.TXT and NOTICE.TXT in the META-INF dirs of demo war, demo jar, and the contrib jars.

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@544611 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -263,6 +263,9 @@ Build
  5. LUCENE-904: The "package" targets in build.xml now also generate .md5
     checksum files. (Chris Hostetter, Michael Busch)
 
+ 6. LUCENE-907: Include LICENSE.TXT and NOTICE.TXT in the META-INF dirs of
+    demo war, demo jar, and the contrib jars. (Michael Busch)
+
 ======================= Release 2.1.0 2007-02-14 =======================
 
 Changes in runtime behavior

build.xml

@@ -92,8 +92,12 @@
     <jar
       destfile="${build.dir}/${demo.name}.jar"
       basedir="${build.dir}/classes/demo"
-      excludes="**/*.java"
-      />
+      excludes="**/*.java">
+      <metainf dir="${common.dir}">
+        <include name="LICENSE.txt"/>
+        <include name="NOTICE.txt"/>
+      </metainf>
+    </jar>
   </target>
 
   <target name="war-demo" depends="jar-core,jar-demo">
@@ -102,6 +106,10 @@
       <fileset dir="src/jsp" excludes="WEB-INF/web.xml"/>
       <lib dir="${build.dir}" includes="${demo.name}.jar"/>
       <lib dir="${build.dir}" includes="${final.name}.jar"/>
+      <metainf dir="${common.dir}">
+        <include name="LICENSE.txt"/>
+        <include name="NOTICE.txt"/>
+      </metainf>
     </war>
   </target>
 

common-build.xml

@@ -160,7 +160,7 @@
           <attribute name="Implementation-Vendor" value="Lucene"/>
         </section>
       </manifest>
-      <metainf dir=".">
+      <metainf dir="${common.dir}">
         <include name="LICENSE.txt"/>
         <include name="NOTICE.txt"/>
       </metainf>
@@ -343,3 +343,4 @@
 </project>
 
 
+

src/demo/demo-build.template

@@ -49,8 +49,12 @@
     <jar
       destfile="${demo.name}.jar"
       basedir="${build.dir}/classes/demo"
-      excludes="**/*.java"
-      />
+      excludes="**/*.java">
+      <metainf dir="${common.dir}">
+        <include name="LICENSE.txt"/>
+        <include name="NOTICE.txt"/>
+      </metainf>
+    </jar>
   </target>
 
   <target name="war-demo" depends="jar-demo"	
@@ -60,6 +64,10 @@
       <fileset dir="src/jsp" excludes="WEB-INF/web.xml"/>
       <lib dir="." includes="${demo.name}.jar"/>
       <lib dir="." includes="${core.name}.jar"/>
+      <metainf dir="${common.dir}">
+        <include name="LICENSE.txt"/>
+        <include name="NOTICE.txt"/>
+      </metainf>
     </war>
   </target>