Author: jgenender
Date: Sun Apr 17 20:27:02 2005
New Revision: 161716
URL: http://svn.apache.org/viewcvs?view=rev&rev=161716
Log:
Changed Tomcat deployment comments
Modified:
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?view=diff&r1=161715&r2=161716
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sun Apr 17
20:27:02 2005
@@ -124,7 +124,25 @@
<dependency>
<uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
</dependency>
-
+<!--
+ - Uncomment this to deploy webapps to Apache Tomcat
+ -
+ <dependency>
+ <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
+ </dependency>
+ <dependency>
+ <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
+ </dependency>
+-->
<gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
@@ -176,21 +194,6 @@
<!--
- Uncomment this to deploy webapps to Apache Tomcat
-
- <dependency>
- <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>tomcat/jars/catalina-${tomcat_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>tomcat/jars/naming-resources-${tomcat_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>tomcat/jars/tomcat-coyote-${tomcat_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>tomcat/jars/tomcat-util-${tomcat_version}.jar</uri>
- </dependency>
<gbean name="WebBuilder"
class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Tomcat</attribute>
<attribute
name="tomcatContainerObjectName">geronimo.server:name=TomcatWebContainer,*</attribute>
