Return-Path: 
 <scm-return-13451-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 58014 invoked from network); 13 Jul 2006 06:24:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 13 Jul 2006 06:24:02 -0000
Received: (qmail 81790 invoked by uid 500); 13 Jul 2006 06:24:00 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 81723 invoked by uid 500); 13 Jul 2006 06:24:00 -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 81711 invoked by uid 99); 13 Jul 2006 06:24:00 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2006 23:24:00 -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; Wed, 12 Jul 2006 23:23:59 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 948F91A981A; Wed, 12 Jul 2006 23:23:39 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r421514 - in
 /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server:
 pom.xml src/assemble/ src/main/ src/main/assembly/ src/main/assembly/bin.xml
Date: Thu, 13 Jul 2006 06:23:39 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060713062339.948F91A981A@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: Wed Jul 12 23:23:38 2006
New Revision: 421514

URL: http://svn.apache.org/viewvc?rev=421514&view=rev
Log:
Start to use standard m2 layout

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/
      - copied from r421412, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/bin.xml
      - copied unchanged from r421513, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml
Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml?rev=421514&r1=421513&r2=421514&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml Wed Jul 12 23:23:38 2006
@@ -613,34 +613,17 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
-                    <!--
                     <execution>
-                        <id>setup</id>
+                        <id>bin</id>
                         <phase>package</phase>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/assemble/setup.xml</descriptor>
-                            </descriptors>
-                            <intermediaryAssembly>true</intermediaryAssembly>
-                        </configuration>
                         <goals>
-                            <goal>assembly</goal>
+                            <goal>attached</goal>
                         </goals>
-                    </execution>
-                    -->
-                    
-                    <execution>
-                        <id>test</id>
-                        <phase>package</phase>
                         <configuration>
                             <descriptors>
-                                <descriptor>${pom.basedir}/src/assemble/bin.xml</descriptor>
-                                <!-- <finalName>geronimo-${version}</finalName> -->
+                                <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
                             </descriptors>
                         </configuration>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
                     </execution>
                 </executions>
             </plugin>