Return-Path: 
 <scm-return-6549-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 94587 invoked from network); 17 Apr 2005 19:57:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 17 Apr 2005 19:57:36 -0000
Received: (qmail 48185 invoked by uid 500); 17 Apr 2005 19:57:35 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 48175 invoked by uid 500); 17 Apr 2005 19:57:35 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 48162 invoked by uid 99); 17 Apr 2005 19:57:35 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sun, 17 Apr 2005 12:57:35 -0700
Received: (qmail 94575 invoked by uid 65534); 17 Apr 2005 19:57:34 -0000
Message-ID: <20050417195734.94574.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Sun, 17 Apr 2005 19:57:34 -0000
Subject: svn commit: r161690 -
 geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
 geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
To: scm@geronimo.apache.org
From: jgenender@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jgenender
Date: Sun Apr 17 12:57:33 2005
New Revision: 161690

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D161690
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=3Ddiff&r1=3D161689&r2=3D161690
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (origin=
al)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Sun Apr=
 17 12:57:33 2005
@@ -197,7 +197,10 @@
     </gbean>
    -->
=20
-   <!-- Uncomment the next StaticContent to enable Tomcat -->
+   <!--
+   - Comment this section to deploy webapps to Apache Tomcat
+   -
+   -->
     <gbean name=3D"StaticContent" class=3D"org.apache.geronimo.jetty.Jetty=
ServletHolder">
         <attribute name=3D"servletName">default</attribute>
         <attribute name=3D"servletClass">org.mortbay.jetty.servlet.Default=
</attribute>
@@ -212,7 +215,10 @@
         <attribute name=3D"servletMappings">/</attribute>
     </gbean>
=20
-   <!-- Uncomment the next JSPServlet to enable Tomcat -->
+   <!--
+   - Comment this section to deploy webapps to Apache Tomcat
+   -
+   -->
     <gbean name=3D"JSPServlet" class=3D"org.apache.geronimo.jetty.JettySer=
vletHolder">
         <attribute name=3D"servletName">jsp</attribute>
         <attribute name=3D"servletClass">org.apache.jasper.servlet.JspServ=
let</attribute>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-pl=
an.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan=
/j2ee-runtime-deployer-plan.xml?view=3Ddiff&r1=3D161689&r2=3D161690
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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>
=20
-    <!-- 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>
     -->
=20
-    <!-- Comment out the next WebBuilder gbean to enable Tomcat deployer
+    <!--
+    - Comment this section to deploy webapps to Apache Tomcat
+    -
     -->
     <gbean name=3D"WebBuilder" class=3D"org.apache.geronimo.jetty.deployme=
nt.JettyModuleBuilder">
         <attribute name=3D"defaultParentId">org/apache/geronimo/Server</at=
tribute>
@@ -136,7 +140,9 @@
         <reference name=3D"Repository"><gbean-name>*:name=3DRepository,*</=
gbean-name></reference>
     </gbean>
    =20
-    <!-- Comment out the next StaticContent gbean to enable Tomcat deployer
+    <!--
+    - Comment this section to deploy webapps to Apache Tomcat
+    -
     -->
     <gbean name=3D"StaticContent" class=3D"org.apache.geronimo.jetty.Jetty=
ServletHolder">
         <attribute name=3D"servletName">default</attribute>
@@ -152,7 +158,9 @@
         <attribute name=3D"servletMappings">/</attribute>
     </gbean>
=20
-    <!-- Comment out the next JSPServlet gbean to enable Tomcat deployer
+    <!--
+    - Comment this section to deploy webapps to Apache Tomcat
+    -
     -->
     <gbean name=3D"JSPServlet" class=3D"org.apache.geronimo.jetty.JettySer=
vletHolder">
         <attribute name=3D"servletName">jsp</attribute>
@@ -165,7 +173,9 @@
         <attribute name=3D"servletMappings">*.jsp,*.jspf,*.jspx,*.xsp</att=
ribute>
     </gbean>
=20
-    <!-- Comment out the POJOTemplate gbean to enable Tomcat deployer
+    <!--
+    - Comment this section to deploy webapps to Apache Tomcat
+    -
     -->
     <gbean name=3D"POJOTemplate" class=3D"org.apache.geronimo.jetty.JettyP=
OJOWebServiceHolder">
         <attribute name=3D"servletName">dummy</attribute>