Return-Path: 
 <scm-return-14051-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 6323 invoked from network); 10 Aug 2006 14:43:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 10 Aug 2006 14:43:55 -0000
Received: (qmail 30575 invoked by uid 500); 10 Aug 2006 14:43:54 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 30544 invoked by uid 500); 10 Aug 2006 14:43:54 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 30533 invoked by uid 99); 10 Aug 2006 14:43:54 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 07:43:54 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Aug 2006 07:43:52 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 626A71A981A; Thu, 10 Aug 2006 07:43:26 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r430399 - in
 /geronimo/branches/1.1/applications/console-ear:
 LICENSE.txt NOTICE.txt project.xml
Date: Thu, 10 Aug 2006 14:43:25 -0000
To: scm@geronimo.apache.org
From: jsisson@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060810144326.626A71A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jsisson
Date: Thu Aug 10 07:43:24 2006
New Revision: 430399

URL: http://svn.apache.org/viewvc?rev=430399&view=rev
Log:
GERONIMO-2308 ensure NOTICE.txt file is included in jar (merged from 1.1.1 branch)

Added:
    geronimo/branches/1.1/applications/console-ear/LICENSE.txt
      - copied unchanged from r430395, geronimo/branches/1.1.1/applications/console-ear/LICENSE.txt
    geronimo/branches/1.1/applications/console-ear/NOTICE.txt
      - copied unchanged from r430395, geronimo/branches/1.1.1/applications/console-ear/NOTICE.txt
Modified:
    geronimo/branches/1.1/applications/console-ear/project.xml

Modified: geronimo/branches/1.1/applications/console-ear/project.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-ear/project.xml?rev=430399&r1=430398&r2=430399&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-ear/project.xml (original)
+++ geronimo/branches/1.1/applications/console-ear/project.xml Thu Aug 10 07:43:24 2006
@@ -97,5 +97,18 @@
         </dependency>
 -->
     </dependencies>
+    
+    <build>
+        <resources>
+          <resource>
+            <directory>${basedir}</directory>
+              <includes>
+                <include>NOTICE.txt</include>
+              </includes>
+              <targetPath>META-INF</targetPath>
+          </resource>
+        </resources>
+    </build>
+    
 </project>