You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/12/14 10:49:55 UTC
svn commit: r890252 - in /geronimo/server/trunk: ./
framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/
plugingroups/clustering-tomcat/ plugingroups/web-tomcat/
plugins/activemq/activemq-console-tomcat/ plugins/acti...
Author: djencks
Date: Mon Dec 14 09:49:53 2009
New Revision: 890252
URL: http://svn.apache.org/viewvc?rev=890252&view=rev
Log:
GERONIMO-4980 Try to finish some more of the tomcat6 to tomcat7 upgrade
Modified:
geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml
geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml
geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Mon Dec 14 09:49:53 2009
@@ -20,7 +20,7 @@
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
<cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
<axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
+ <tomcatDeployer>org.apache.geronimo.configs/tomcat7-deployer/${geronimoVersion}/car</tomcatDeployer>
<jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
Modified: geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/clustering-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-clustering-builder-wadi</artifactId>
+ <artifactId>tomcat7-clustering-builder-wadi</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -101,7 +101,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
@@ -68,7 +68,7 @@
-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>tomcat7</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Mon Dec 14 09:49:53 2009
@@ -75,8 +75,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
- <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
+ <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat7')" />
+ <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat7')" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Mon Dec 14 09:49:53 2009
@@ -84,8 +84,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
- <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
+ <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat7')" />
+ <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat7')" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Mon Dec 14 09:49:53 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis2</artifactId>
@@ -7,6 +7,11 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
<type>mar</type>
@@ -57,11 +62,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>httpcore</artifactId>
<type>jar</type>
@@ -102,13 +102,13 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-axis2</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis2</artifactId>
+ <artifactId>geronimo-jaxws</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -153,11 +153,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/ca-helper/ca-helper-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>tomcat7</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml Mon Dec 14 09:49:53 2009
@@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>tomcat7</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -74,7 +74,7 @@
<!-- to force build order -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
@@ -114,7 +114,7 @@
<prerequisite>
<id>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>tomcat7</artifactId>
</id>
<resource-type>Web Container</resource-type>
<description>
Modified: geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-tomcat/pom.xml Mon Dec 14 09:49:53 2009
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>tomcat7-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>tomcat7</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=890252&r1=890251&r2=890252&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Dec 14 09:49:53 2009
@@ -96,7 +96,7 @@
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
<cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
<axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${version}/car</axis2Deployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
+ <tomcatDeployer>org.apache.geronimo.configs/tomcat7-deployer/${version}/car</tomcatDeployer>
<jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${version}/car</jettyDeployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</jpaDeployer>