You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/02/19 19:39:04 UTC
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

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>