You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by bu...@apache.org on 2007/06/05 21:54:39 UTC
svn commit: r544611 - in /lucene/java/trunk: CHANGES.txt build.xml
common-build.xml src/demo/demo-build.template
Author: buschmi
Date: Tue Jun 5 12:54:38 2007
New Revision: 544611
URL: http://svn.apache.org/viewvc?view=rev&rev=544611
Log:
LUCENE-907: Include LICENSE.TXT and NOTICE.TXT in the META-INF dirs of demo war, demo jar, and the contrib jars.
Modified:
lucene/java/trunk/CHANGES.txt
lucene/java/trunk/build.xml
lucene/java/trunk/common-build.xml
lucene/java/trunk/src/demo/demo-build.template
Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?view=diff&rev=544611&r1=544610&r2=544611
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Tue Jun 5 12:54:38 2007
@@ -263,6 +263,9 @@
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
Modified: lucene/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/build.xml?view=diff&rev=544611&r1=544610&r2=544611
==============================================================================
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Tue Jun 5 12:54:38 2007
@@ -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>
Modified: lucene/java/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/common-build.xml?view=diff&rev=544611&r1=544610&r2=544611
==============================================================================
--- lucene/java/trunk/common-build.xml (original)
+++ lucene/java/trunk/common-build.xml Tue Jun 5 12:54:38 2007
@@ -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>
@@ -341,5 +341,6 @@
</macrodef>
</project>
+
Modified: lucene/java/trunk/src/demo/demo-build.template
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/demo/demo-build.template?view=diff&rev=544611&r1=544610&r2=544611
==============================================================================
--- lucene/java/trunk/src/demo/demo-build.template (original)
+++ lucene/java/trunk/src/demo/demo-build.template Tue Jun 5 12:54:38 2007
@@ -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>