Return-Path: 
 <scm-return-13550-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 59843 invoked from network); 17 Jul 2006 02:04:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 17 Jul 2006 02:04:18 -0000
Received: (qmail 6557 invoked by uid 500); 17 Jul 2006 02:04:18 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 6415 invoked by uid 500); 17 Jul 2006 02:04:18 -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 6404 invoked by uid 99); 17 Jul 2006 02:04:18 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jul 2006 19:04:18 -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; Sun, 16 Jul 2006 19:04:17 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 645911A981A; Sun, 16 Jul 2006 19:03:51 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r422601 - in
 /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee:
 pom.xml src/main/assembly/bin.xml
Date: Mon, 17 Jul 2006 02:03:50 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060717020351.645911A981A@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: jdillon
Date: Sun Jul 16 19:03:50 2006
New Revision: 422601

URL: http://svn.apache.org/viewvc?rev=422601&view=rev
Log:
Clean up a bit, don't need those pesky META-INF bits in the final assembly

Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=422601&r1=422600&r2=422601&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Sun Jul 16 19:03:50 2006
@@ -641,6 +641,11 @@
                         </configuration>
                     </execution>
                     
+                    <!--
+                    
+                    TODO: Move scripts to boilerplate
+                    
+                    -->
                     <execution>
                         <id>unpack-scripts</id>
                         <phase>package</phase>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?rev=422601&r1=422600&r2=422601&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml Sun Jul 16 19:03:50 2006
@@ -154,6 +154,9 @@
         <fileSet>
             <directory>target/boilerplate-j2ee</directory>
             <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>META-INF/**</exclude>
+            </excludes>
         </fileSet>
         
         <fileSet>