Return-Path: 
 <java-commits-return-1125-apmail-lucene-java-commits-archive=lucene.apache.org@lucene.apache.org>
Delivered-To: apmail-lucene-java-commits-archive@www.apache.org
Received: (qmail 90054 invoked from network); 5 Jun 2007 19:55:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Jun 2007 19:55:02 -0000
Received: (qmail 53021 invoked by uid 500); 5 Jun 2007 19:55:06 -0000
Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org
Received: (qmail 53001 invoked by uid 500); 5 Jun 2007 19:55:06 -0000
Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:java-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:java-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:java-commits@lucene.apache.org>
List-Id: <java-commits.lucene.apache.org>
Reply-To: java-dev@lucene.apache.org
Delivered-To: mailing list java-commits@lucene.apache.org
Received: (qmail 52986 invoked by uid 99); 5 Jun 2007 19:55:06 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2007 12:55:06 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2007 12:54:59 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5458D1A981A; Tue,  5 Jun 2007 12:54:39 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r544611 - in /lucene/java/trunk: CHANGES.txt build.xml
 common-build.xml src/demo/demo-build.template
Date: Tue, 05 Jun 2007 19:54:39 -0000
To: java-commits@lucene.apache.org
From: buschmi@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070605195439.5458D1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>