Author: jgenender Date: Sun Apr 17 12:57:33 2005 New Revision: 161690 URL: http://svn.apache.org/viewcvs?view=rev&rev=161690 Log: Changed Tomcat comments for consistency
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=161689&r2=161690 ============================================================================== --- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original) +++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sun Apr 17 12:57:33 2005 @@ -197,7 +197,10 @@ </gbean> --> - <!-- Uncomment the next StaticContent to enable Tomcat --> + <!-- + - Comment this section to deploy webapps to Apache Tomcat + - + --> <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder"> <attribute name="servletName">default</attribute> <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute> @@ -212,7 +215,10 @@ <attribute name="servletMappings">/</attribute> </gbean> - <!-- Uncomment the next JSPServlet to enable Tomcat --> + <!-- + - Comment this section to deploy webapps to Apache 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=161689&r2=161690 ============================================================================== --- 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 12:57:33 2005 @@ -64,7 +64,9 @@ <uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri> </dependency> - <!-- Uncomment the next 5 dependencies to enable Tomcat + <!-- + - Uncomment this section to deploy webapps to Apache Tomcat + - <dependency> <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri> </dependency> @@ -123,7 +125,9 @@ </gbean> --> - <!-- Comment out the next WebBuilder gbean to enable Tomcat deployer + <!-- + - Comment this section to deploy webapps to Apache Tomcat + - --> <gbean name="WebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder"> <attribute name="defaultParentId">org/apache/geronimo/Server</attribute> @@ -136,7 +140,9 @@ <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference> </gbean> - <!-- Comment out the next StaticContent gbean to enable Tomcat deployer + <!-- + - Comment this section to deploy webapps to Apache Tomcat + - --> <gbean name="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder"> <attribute name="servletName">default</attribute> @@ -152,7 +158,9 @@ <attribute name="servletMappings">/</attribute> </gbean> - <!-- Comment out the next JSPServlet gbean to enable Tomcat deployer + <!-- + - Comment this section to deploy webapps to Apache Tomcat + - --> <gbean name="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder"> <attribute name="servletName">jsp</attribute> @@ -165,7 +173,9 @@ <attribute name="servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</attribute> </gbean> - <!-- Comment out the POJOTemplate gbean to enable Tomcat deployer + <!-- + - Comment this section to deploy webapps to Apache Tomcat + - --> <gbean name="POJOTemplate" class="org.apache.geronimo.jetty.JettyPOJOWebServiceHolder"> <attribute name="servletName">dummy</attribute>