Return-Path: 
 <scm-return-40515-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 39880 invoked from network); 19 Feb 2010 18:39:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 Feb 2010 18:39:29 -0000
Received: (qmail 71686 invoked by uid 500); 19 Feb 2010 18:39:29 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 71625 invoked by uid 500); 19 Feb 2010 18:39:29 -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 71610 invoked by uid 99); 19 Feb 2010 18:39:28 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Feb 2010 18:39:28 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Feb 2010 18:39:26 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CFD0123888D1; Fri, 19 Feb 2010 18:39:04 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r911902 - in /geronimo/server/trunk/assemblies:
 geronimo-tomcat6-javaee5/ geronimo-tomcat6-minimal/
 geronimo-tomcat7-javaee6/ geronimo-tomcat7-javaee6/pom.xml
 geronimo-tomcat7-minimal/ geronimo-tomcat7-minimal/pom.xml pom.xml
Date: Fri, 19 Feb 2010 18:39:04 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100219183904.CFD0123888D1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Fri Feb 19 18:39:04 2010
New Revision: 911902

URL: http://svn.apache.org/viewvc?rev=911902&view=rev
Log:
Handle rename of tomcat plugin from javaee5 to javaee6 and rename assembly.  Pull in wab instead of web plugingroups.

Added:
    geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/
      - copied from r910357, geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/
    geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml
      - copied, changed from r911893, geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/
      - copied from r910357, geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/
    geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml
      - copied, changed from r911893, geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
Removed:
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/
Modified:
    geronimo/server/trunk/assemblies/pom.xml

Copied: geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml (from r911893, geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml?p2=geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml&p1=geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml&r1=911893&r2=911902&rev=911902&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6/pom.xml Fri Feb 19 18:39:04 2010
@@ -28,18 +28,18 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-tomcat6-javaee5</artifactId>
-    <name>Geronimo Assemblies :: JavaEE 5 + Tomcat</name>
+    <artifactId>geronimo-tomcat7-javaee6</artifactId>
+    <name>Geronimo Assemblies :: Java EE 6 + Tomcat7</name>
     <packaging>server-assembly</packaging>
 
     <description>
-        An assembly of Geronimo into a JavaEE 5 Server using Tomcat as the web container.
+        An assembly of Geronimo into a Java EE 6 Server using Tomcat as the web container.
     </description>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>javaee5-tomcat</artifactId>
+            <artifactId>javaee6-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Copied: geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml (from r911893, geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml?p2=geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml&p1=geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml&r1=911893&r2=911902&rev=911902&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-minimal/pom.xml Fri Feb 19 18:39:04 2010
@@ -28,8 +28,8 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-tomcat6-minimal</artifactId>
-    <name>Geronimo Assemblies :: Minimal + Tomcat</name>
+    <artifactId>geronimo-tomcat7-minimal</artifactId>
+    <name>Geronimo Assemblies :: Minimal + Tomcat7</name>
     <packaging>server-assembly</packaging>
 
     <description>

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=911902&r1=911901&r2=911902&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Fri Feb 19 18:39:04 2010
@@ -41,8 +41,8 @@
     <modules>
         <module>geronimo-jetty8-minimal</module>
         <module>geronimo-jetty8-javaee6</module>
-        <module>geronimo-tomcat6-minimal</module>
-        <module>geronimo-tomcat6-javaee5</module>
+        <module>geronimo-tomcat7-minimal</module>
+        <module>geronimo-tomcat7-javaee6</module>
     </modules>
 
     <build>