Author: jgenender
Date: Sun Apr 17 10:11:03 2005
New Revision: 161669
URL: http://svn.apache.org/viewcvs?view=rev&rev=161669
Log:
Added text to reflect where to uncomment/comment to run Tomcat
Modified:
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-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=161668&r2=161669
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sun Apr 17
10:11:03 2005
@@ -174,7 +174,7 @@
</gbean>
<!--
- - Uncomment it to deploy webapps to Apache Tomcat
+ - Uncomment this to deploy webapps to Apache Tomcat
-
<dependency>
<uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri>
@@ -197,6 +197,7 @@
</gbean>
-->
+ <!-- Uncomment the next StaticContent to enable Tomcat -->
<gbean name="StaticContent"
class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">default</attribute>
<attribute
name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
@@ -211,6 +212,7 @@
<attribute name="servletMappings">/</attribute>
</gbean>
+ <!-- Uncomment the next JSPServlet to enable Tomcat -->
<gbean name="JSPServlet"
class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">jsp</attribute>
<attribute
name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
Modified:
geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?view=diff&r1=161668&r2=161669
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Sun
Apr 17 10:11:03 2005
@@ -64,6 +64,24 @@
<uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
</dependency>
+ <!-- Uncomment the next 5 dependencies to enable 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>
+ -->
+
<!-- deployer gbeans -->
<gbean name="Deployer" class="org.apache.geronimo.deployment.Deployer">
<reference name="Builders"><name>*</name></reference>
@@ -99,21 +117,6 @@
- Uncomment this section 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>
@@ -133,6 +136,8 @@
<reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
</gbean>
+ <!-- Comment out the next StaticContent gbean to enable Tomcat deployer
+ -->
<gbean name="StaticContent"
class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">default</attribute>
<attribute
name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
@@ -147,6 +152,8 @@
<attribute name="servletMappings">/</attribute>
</gbean>
+ <!-- Comment out the next JSPServlet gbean to enable Tomcat deployer
+ -->
<gbean name="JSPServlet"
class="org.apache.geronimo.jetty.JettyServletHolder">
<attribute name="servletName">jsp</attribute>
<attribute
name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
@@ -158,6 +165,8 @@
<attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute>
</gbean>
+ <!-- Comment out the POJOTemplate gbean to enable Tomcat deployer
+ -->
<gbean name="POJOTemplate"
class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder">
<attribute name="servletName">dummy</attribute>
</gbean>
