You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2006/12/10 05:58:33 UTC
svn commit: r485139 - in /geronimo/server/trunk: ./ assemblies/
assemblies/geronimo-framework/ assemblies/geronimo-tomcat-jee5/
assemblies/geronimo-tomcat-minimal/ assemblies/geronimo-tomcat6-jee5/
assemblies/geronimo-tomcat6-jee5/src/ assemblies/geron...
Author: pmcmahan
Date: Sat Dec 9 20:58:28 2006
New Revision: 485139
URL: http://svn.apache.org/viewvc?view=rev&rev=485139
Log:
change "tomcat" artifactIds to "tomcat6" for :
configs/tomcat6
configs/tomcat6-deployer
modules/geronimo-tomcat6
modules/geronimo-tomcat6-builder
assemblies/geronimo-tomcat6-jee5
assemblies/geronimo-tomcat6-minimal
updated various poms, deployment plans, and plugin-metadata.xml files to reference the new tomcat6 artifactId
Added:
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/
- copied from r484782, geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/LICENSE.txt
- copied unchanged from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/LICENSE.txt
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/NOTICE.txt
- copied unchanged from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/NOTICE.txt
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
- copied, changed from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/
- copied from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/src/
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/
- copied from r484782, geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/LICENSE.txt
- copied unchanged from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/LICENSE.txt
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/NOTICE.txt
- copied unchanged from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/NOTICE.txt
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
- copied, changed from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/
- copied from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/
geronimo/server/trunk/configs/tomcat6/
- copied from r484782, geronimo/server/trunk/configs/tomcat/
geronimo/server/trunk/configs/tomcat6-deployer/
- copied from r484782, geronimo/server/trunk/configs/tomcat-deployer/
geronimo/server/trunk/configs/tomcat6-deployer/LICENSE.txt
- copied unchanged from r485136, geronimo/server/trunk/configs/tomcat-deployer/LICENSE.txt
geronimo/server/trunk/configs/tomcat6-deployer/NOTICE.txt
- copied unchanged from r485136, geronimo/server/trunk/configs/tomcat-deployer/NOTICE.txt
geronimo/server/trunk/configs/tomcat6-deployer/pom.xml
- copied, changed from r485136, geronimo/server/trunk/configs/tomcat-deployer/pom.xml
geronimo/server/trunk/configs/tomcat6-deployer/src/
- copied from r485136, geronimo/server/trunk/configs/tomcat-deployer/src/
geronimo/server/trunk/configs/tomcat6/LICENSE.txt
- copied unchanged from r485136, geronimo/server/trunk/configs/tomcat/LICENSE.txt
geronimo/server/trunk/configs/tomcat6/NOTICE.txt
- copied unchanged from r485136, geronimo/server/trunk/configs/tomcat/NOTICE.txt
geronimo/server/trunk/configs/tomcat6/pom.xml
- copied, changed from r485136, geronimo/server/trunk/configs/tomcat/pom.xml
geronimo/server/trunk/configs/tomcat6/src/
- copied from r485136, geronimo/server/trunk/configs/tomcat/src/
geronimo/server/trunk/modules/geronimo-tomcat6/
- copied from r485077, geronimo/server/trunk/modules/geronimo-tomcat/
geronimo/server/trunk/modules/geronimo-tomcat6-builder/
- copied from r485077, geronimo/server/trunk/modules/geronimo-tomcat-builder/
geronimo/server/trunk/modules/geronimo-tomcat6-builder/LICENSE.txt
- copied unchanged from r485136, geronimo/server/trunk/modules/geronimo-tomcat-builder/LICENSE.txt
geronimo/server/trunk/modules/geronimo-tomcat6-builder/NOTICE.txt
- copied unchanged from r485136, geronimo/server/trunk/modules/geronimo-tomcat-builder/NOTICE.txt
geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
- copied, changed from r485136, geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/
- copied from r485136, geronimo/server/trunk/modules/geronimo-tomcat-builder/src/
geronimo/server/trunk/modules/geronimo-tomcat6/LICENSE.txt
- copied unchanged from r485136, geronimo/server/trunk/modules/geronimo-tomcat/LICENSE.txt
geronimo/server/trunk/modules/geronimo-tomcat6/NOTICE.txt
- copied unchanged from r485136, geronimo/server/trunk/modules/geronimo-tomcat/NOTICE.txt
geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
- copied, changed from r485136, geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
geronimo/server/trunk/modules/geronimo-tomcat6/src/
- copied from r485136, geronimo/server/trunk/modules/geronimo-tomcat/src/
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/
- copied from r485077, geronimo/server/trunk/modules/geronimo-tomcat/src/main/resources/META-INF/geronimo-tomcat/
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/
- copied from r485136, geronimo/server/trunk/modules/geronimo-tomcat/src/main/resources/META-INF/geronimo-tomcat/var/
Removed:
geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/
geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/
geronimo/server/trunk/configs/tomcat/
geronimo/server/trunk/configs/tomcat-deployer/
geronimo/server/trunk/modules/geronimo-tomcat/
geronimo/server/trunk/modules/geronimo-tomcat-builder/
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat/
Modified:
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-list
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list
geronimo/server/trunk/assemblies/pom.xml
geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/dojo-tomcat/pom.xml
geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml
geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/pom.xml
geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml
geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml
geronimo/server/trunk/configs/uddi-tomcat/pom.xml
geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/configs/welcome-tomcat/pom.xml
geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/modules/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Sat Dec 9 20:58:28 2006
@@ -156,7 +156,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat-builder</artifactId>
+ <artifactId>geronimo-tomcat6-builder</artifactId>
<version>${version}</version>
</artifactItem>
<artifactItem>
Copied: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml?view=diff&rev=485139&p1=geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/pom.xml&r1=485136&p2=geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml&r2=485139
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Sat Dec 9 20:58:28 2006
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>geronimo-tomcat-jee5</artifactId>
+ <artifactId>geronimo-tomcat6-jee5</artifactId>
<name>Geronimo Assemblies :: JEE5 + Tomcat</name>
<packaging>application-assembly</packaging>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat</artifactId>
+ <artifactId>tomcat6</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -249,7 +249,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -364,7 +364,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat-builder</artifactId>
+ <artifactId>geronimo-tomcat6-builder</artifactId>
<version>${version}</version>
</artifactItem>
</artifactItems>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml?view=diff&rev=485139&r1=485136&r2=485139
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml Sat Dec 9 20:58:28 2006
@@ -97,7 +97,7 @@
<module name="org.apache.geronimo.configs/activemq/${version}/car"/>
- <module name="org.apache.geronimo.configs/tomcat/${version}/car">
+ <module name="org.apache.geronimo.configs/tomcat6/${version}/car">
<!-- To disable accesslogging uncomment the following lines
<gbean name="TomcatEngine">
<reference name="TomcatValveChain" />
@@ -211,7 +211,7 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/tomcat-deployer/${version}/car"/>
+ <module name="org.apache.geronimo.configs/tomcat6-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/welcome-tomcat/${version}/car"/>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-list?view=diff&rev=485139&r1=485136&r2=485139
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-list (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/offline-deployer-list Sat Dec 9 20:58:28 2006
@@ -1,31 +1,31 @@
-##=====================================================================
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##=====================================================================
-##
-## List of deployers to be started for offline deployment
-##
-## $Rev$ $Date$
-##
-org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
-org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
-org.apache.geronimo.configs/connector-deployer/${pom.version}/car
-org.apache.geronimo.configs/openejb-deployer/${pom.version}/car
-org.apache.geronimo.configs/openejb-corba-deployer/${pom.version}/car
-org.apache.geronimo.configs/persistence-jpa10-deployer/${pom.version}/car
-org.apache.geronimo.configs/client-deployer/${pom.version}/car
-org.apache.geronimo.configs/axis-deployer/${pom.version}/car
-#org.apache.geronimo.configs/cxf-deployer/${pom.version}/car
-org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car
+##=====================================================================
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##=====================================================================
+##
+## List of deployers to be started for offline deployment
+##
+## $Rev$ $Date$
+##
+org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
+org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
+org.apache.geronimo.configs/connector-deployer/${pom.version}/car
+org.apache.geronimo.configs/openejb-deployer/${pom.version}/car
+org.apache.geronimo.configs/openejb-corba-deployer/${pom.version}/car
+org.apache.geronimo.configs/persistence-jpa10-deployer/${pom.version}/car
+org.apache.geronimo.configs/client-deployer/${pom.version}/car
+org.apache.geronimo.configs/axis-deployer/${pom.version}/car
+#org.apache.geronimo.configs/cxf-deployer/${pom.version}/car
+org.apache.geronimo.configs/tomcat6-deployer/${pom.version}/car
Copied: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (from r485136, geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?view=diff&rev=485139&p1=geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml&r1=485136&p2=geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml&r2=485139
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Sat Dec 9 20:58:28 2006
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>geronimo-tomcat-minimal</artifactId>
+ <artifactId>geronimo-tomcat6-minimal</artifactId>
<name>Geronimo Assemblies :: Minimal + Tomcat</name>
<packaging>application-assembly</packaging>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat</artifactId>
+ <artifactId>tomcat6</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -198,7 +198,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat-builder</artifactId>
+ <artifactId>geronimo-tomcat6-builder</artifactId>
<version>${version}</version>
</artifactItem>
</artifactItems>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml?view=diff&rev=485139&r1=485136&r2=485139
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/config.xml Sat Dec 9 20:58:28 2006
@@ -55,7 +55,7 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/tomcat/${version}/car">
+ <module name="org.apache.geronimo.configs/tomcat6/${version}/car">
<gbean name="TomcatResources"/>
<gbean name="TomcatWebConnector">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -83,7 +83,7 @@
<module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
- <module name="org.apache.geronimo.configs/tomcat-deployer/${version}/car"/>
+ <module name="org.apache.geronimo.configs/tomcat6-deployer/${version}/car"/>
<module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list?view=diff&rev=485139&r1=485136&r2=485139
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/offline-deployer-list Sat Dec 9 20:58:28 2006
@@ -1,29 +1,29 @@
-##=====================================================================
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##=====================================================================
-##
-## List of deployers to be started for offline deployment
-##
-## $Rev$ $Date$
-##
-org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
-org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
-org.apache.geronimo.configs/connector-deployer/${pom.version}/car
-org.apache.geronimo.configs/persistence-jpa10-deployer/${pom.version}/car
-org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car
-org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car
-org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car
-org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car
+##=====================================================================
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##=====================================================================
+##
+## List of deployers to be started for offline deployment
+##
+## $Rev$ $Date$
+##
+org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car
+org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car
+org.apache.geronimo.configs/connector-deployer/${pom.version}/car
+org.apache.geronimo.configs/persistence-jpa10-deployer/${pom.version}/car
+org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car
+org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car
+org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car
+org.apache.geronimo.configs/tomcat6-deployer/${pom.version}/car
Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Sat Dec 9 20:58:28 2006
@@ -75,8 +75,8 @@
<module>geronimo-jetty-j2ee</module>
<module>geronimo-jetty-minimal</module>
<module>geronimo-jetty6-jee5</module>
- <module>geronimo-tomcat-jee5</module>
- <module>geronimo-tomcat-minimal</module>
+ <module>geronimo-tomcat6-jee5</module>
+ <module>geronimo-tomcat6-minimal</module>
</modules>
</project>
Modified: geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -31,7 +31,7 @@
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
<geronimo-version>${pom.currentVersion}</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat//car</id>
+ <id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the CA Helper application works with the Geronimo/Tomcat distribution.
Modified: geronimo/server/trunk/configs/dojo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/dojo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/dojo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -32,7 +32,7 @@
<license osi-approved="true">BSD and Academic Free License v2.1</license>
<geronimo-version>${version}</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat//car</id>
+ <id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the Welcome application works with the Geronimo/Tomcat distribution.
Modified: geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -35,14 +35,6 @@
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>tomcat-deployer</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.applications.examples</groupId>
<artifactId>geronimo-jsp-examples</artifactId>
@@ -52,7 +44,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -32,7 +32,7 @@
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
<geronimo-version>${version}</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat//car</id>
+ <id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the JSP Examples works with the Geronimo/Tomcat distribution.
Modified: geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -35,14 +35,6 @@
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>tomcat-deployer</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ldap-demo</artifactId>
@@ -52,7 +44,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -34,7 +34,7 @@
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
<geronimo-version>${version}</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat//car</id>
+ <id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the LDAP Example works with the Geronimo/Tomcat distribution.
Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Sat Dec 9 20:58:28 2006
@@ -46,7 +46,7 @@
<openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer>
<axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
<cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${version}/car</tomcatDeployer>
+ <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
<jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${version}/car</jettyDeployer>
<jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
@@ -159,8 +159,8 @@
<module>sharedlib</module>
<module>shutdown</module>
<module>system-database</module>
- <module>tomcat</module>
- <module>tomcat-deployer</module>
+ <module>tomcat6</module>
+ <module>tomcat6-deployer</module>
<!--<module>transaction</module>-->
<module>uddi-jetty</module>
<module>uddi-tomcat</module>
Modified: geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -34,13 +34,6 @@
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>tomcat-deployer</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-remote-deploy</artifactId>
@@ -55,7 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -35,14 +35,6 @@
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>tomcat-deployer</artifactId>-->
- <!--<version>${version}</version>-->
- <!--<type>car</type>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.applications.examples</groupId>
<artifactId>geronimo-servlet-examples</artifactId>
@@ -52,7 +44,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -32,7 +32,7 @@
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
<geronimo-version>${version}</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat//car</id>
+ <id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the Servlet Examples works with the Geronimo/Tomcat distribution.
Copied: geronimo/server/trunk/configs/tomcat6-deployer/pom.xml (from r485136, geronimo/server/trunk/configs/tomcat-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/pom.xml?view=diff&rev=485139&p1=geronimo/server/trunk/configs/tomcat-deployer/pom.xml&r1=485136&p2=geronimo/server/trunk/configs/tomcat6-deployer/pom.xml&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/pom.xml Sat Dec 9 20:58:28 2006
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<name>Geronimo Configs :: Tomcat Deployer</name>
<packaging>car</packaging>
@@ -53,7 +53,7 @@
<!-- import classes -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat</artifactId>
+ <artifactId>tomcat6</artifactId>
<version>${version}</version>
<type>car</type>
<scope>runtime</scope>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat-builder</artifactId>
+ <artifactId>geronimo-tomcat6-builder</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485136&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -26,15 +26,15 @@
<license osi-approved="true">Apache Software License (ASL) 2.0</license>
<geronimo-version>${version}</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat//car</id>
+ <id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
<description> This version of the Tomcat Deployer requires that the Tomcat web container is present. </description>
</prerequisite>
<dependency>org.apache.geronimo.configs/j2ee-deployer//car</dependency>
<dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
- <dependency>org.apache.geronimo.configs/tomcat//car</dependency>
- <dependency>org.apache.geronimo.modules/geronimo-tomcat-builder//jar</dependency>
- <obsoletes>org.apache.geronimo.configs/tomcat-deployer//car</obsoletes>
+ <dependency>org.apache.geronimo.configs/tomcat6//car</dependency>
+ <dependency>org.apache.geronimo.modules/geronimo-tomcat6-builder//jar</dependency>
+ <obsoletes>org.apache.geronimo.configs/tomcat6-deployer//car</obsoletes>
<source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
<source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
<source-repository>http://www.ibiblio.org/maven2/</source-repository>
Modified: geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml?view=diff&rev=485139&r1=485136&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6-deployer/src/plan/plan.xml Sat Dec 9 20:58:28 2006
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tomcat</artifactId>
+ <artifactId>tomcat6</artifactId>
<type>car</type>
</dependency>
</dependencies>
Copied: geronimo/server/trunk/configs/tomcat6/pom.xml (from r485136, geronimo/server/trunk/configs/tomcat/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/pom.xml?view=diff&rev=485139&p1=geronimo/server/trunk/configs/tomcat/pom.xml&r1=485136&p2=geronimo/server/trunk/configs/tomcat6/pom.xml&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/pom.xml Sat Dec 9 20:58:28 2006
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tomcat</artifactId>
+ <artifactId>tomcat6</artifactId>
<name>Geronimo Configs :: Tomcat</name>
<packaging>car</packaging>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat</artifactId>
+ <artifactId>geronimo-tomcat6</artifactId>
<version>${version}</version>
</dependency>
Modified: geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485136&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -28,8 +28,8 @@
<dependency>org.apache.geronimo.configs/j2ee-server//car</dependency>
<dependency>org.apache.geronimo.configs/j2ee-security//car</dependency>
<dependency>org.apache.geronimo.configs/transaction//car</dependency>
- <dependency>org.apache.geronimo.modules/geronimo-tomcat//jar</dependency>
- <obsoletes>org.apache.geronimo.configs/tomcat//car</obsoletes>
+ <dependency>org.apache.geronimo.modules/geronimo-tomcat6//jar</dependency>
+ <obsoletes>org.apache.geronimo.configs/tomcat6//car</obsoletes>
<source-repository>http://geronimo.apache.org/plugins/geronimo-1.2/repository/</source-repository>
<source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1/</source-repository>
<source-repository>http://www.ibiblio.org/maven2/</source-repository>
Modified: geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml?view=diff&rev=485139&r1=485136&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/src/plan/plan.xml Sat Dec 9 20:58:28 2006
@@ -22,7 +22,7 @@
<gbean name="TomcatResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
<!-- copies tomcat initialization files into specified location -->
- <attribute name="prefix">META-INF/geronimo-tomcat</attribute>
+ <attribute name="prefix">META-INF/geronimo-tomcat6</attribute>
<attribute name="path">var/catalina</attribute>
<reference name="ServerInfo">
<name>ServerInfo</name>
Modified: geronimo/server/trunk/configs/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/uddi-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -37,7 +37,7 @@
<!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>test</scope>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -61,7 +61,7 @@
<!-- these are needed so the plans can get written out using DConfigBeans -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
@@ -198,7 +198,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -35,7 +35,7 @@
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
<geronimo-version>${version}</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat//car</id>
+ <id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the admin console works with the Geronimo/Tomcat distribution.
Modified: geronimo/server/trunk/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/pom.xml Sat Dec 9 20:58:28 2006
@@ -35,16 +35,6 @@
<dependencies>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- <scope>test</scope>
- </dependency>
--->
-
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-welcome</artifactId>
@@ -54,7 +44,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat-deployer</artifactId>
+ <artifactId>tomcat6-deployer</artifactId>
<version>${version}</version>
<type>car</type>
<scope>provided</scope>
Modified: geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Sat Dec 9 20:58:28 2006
@@ -34,7 +34,7 @@
<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
<geronimo-version>${version}</geronimo-version>
<prerequisite>
- <id>org.apache.geronimo.configs/tomcat//car</id>
+ <id>org.apache.geronimo.configs/tomcat6//car</id>
<resource-type>Web Container</resource-type>
<description>
This version of the Welcome application works with the Geronimo/Tomcat distribution.
Copied: geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml (from r485136, geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml?view=diff&rev=485139&p1=geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml&r1=485136&p2=geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml&r2=485139
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml Sat Dec 9 20:58:28 2006
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>geronimo-tomcat-builder</artifactId>
+ <artifactId>geronimo-tomcat6-builder</artifactId>
<name>Geronimo :: Tomcat :: Builder</name>
<dependencies>
@@ -42,7 +42,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>geronimo-tomcat</artifactId>
+ <artifactId>geronimo-tomcat6</artifactId>
<version>${version}</version>
</dependency>
Copied: geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml (from r485136, geronimo/server/trunk/modules/geronimo-tomcat/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml?view=diff&rev=485139&p1=geronimo/server/trunk/modules/geronimo-tomcat/pom.xml&r1=485136&p2=geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml&r2=485139
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml Sat Dec 9 20:58:28 2006
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>geronimo-tomcat</artifactId>
+ <artifactId>geronimo-tomcat6</artifactId>
<name>Geronimo :: Tomcat</name>
<dependencies>
@@ -156,7 +156,7 @@
</goals>
<configuration>
<tasks>
- <copy todir="target/var/catalina/conf" file="src/main/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml" />
+ <copy todir="target/var/catalina/conf" file="src/main/resources/META-INF/geronimo-tomcat6/var/catalina/conf/web.xml" />
<copy todir="target/var/catalina/webapps">
<fileset dir="src/test/resources/deployables">
<include name="war1/**" />
Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Sat Dec 9 20:58:28 2006
@@ -88,8 +88,8 @@
<module>geronimo-system</module>
<module>geronimo-test-ddbean</module>
<module>geronimo-timer</module>
- <module>geronimo-tomcat</module>
- <module>geronimo-tomcat-builder</module>
+ <module>geronimo-tomcat6</module>
+ <module>geronimo-tomcat6-builder</module>
<module>geronimo-transaction</module>
<module>geronimo-upgrade</module>
<module>geronimo-util</module>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=485139&r1=485138&r2=485139
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Dec 9 20:58:28 2006
@@ -1274,18 +1274,18 @@
</assembly>
<assembly>
- <id>tomcat</id>
+ <id>tomcat6</id>
<groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-tomcat-jee5</artifactId>
+ <artifactId>geronimo-tomcat6-jee5</artifactId>
<version>${version}</version>
<classifier>bin</classifier>
<type>zip</type>
</assembly>
<assembly>
- <id>tomcat-minimal</id>
+ <id>tomcat6-minimal</id>
<groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-tomcat-minimal</artifactId>
+ <artifactId>geronimo-tomcat6-minimal</artifactId>
<version>${version}</version>
<classifier>bin</classifier>
<type>zip</type>