You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/02/15 09:22:09 UTC
svn commit: r153914 - geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml

Author: djencks
Date: Tue Feb 15 00:22:07 2005
New Revision: 153914

URL: http://svn.apache.org/viewcvs?view=rev&rev=153914
Log:
do not pretend the servlet templates for default servlets are actually deployed servlets

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=153913&r2=153914
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Tue Feb 15 00:22:07 2005
@@ -161,7 +161,7 @@
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
-        <attribute name="defaultServlets">geronimo.deployer:j2eeType=Servlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
+        <attribute name="defaultServlets">geronimo.deployer:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/J2EEDeployer,*</attribute>
         <reference name="Repository">*:name=Repository,*</reference>
     </gbean>
 
@@ -189,7 +189,7 @@
     </gbean>
    -->
 
-    <gbean namePart="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
+    <gbean name="geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=geronimo,j2eeType=DefaultServlet,name=StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
         <attribute name="servletName">default</attribute>
         <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
         <attribute name="loadOnStartup">0</attribute>
@@ -203,7 +203,7 @@
         <attribute name="servletMappings">/</attribute>
     </gbean>
 
-    <gbean namePart="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
+    <gbean name="geronimo.deployer:J2EEApplication=null,J2EEModule=org/apache/geronimo/J2EEDeployer,J2EEServer=geronimo,j2eeType=DefaultServlet,name=JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
         <attribute name="servletName">jsp</attribute>
         <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
         <attribute name="loadOnStartup">0</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=153913&r2=153914
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Tue Feb 15 00:22:07 2005
@@ -123,11 +123,11 @@
         <attribute name="defaultSessionTimeoutSeconds">1800</attribute>
         <attribute name="defaultWelcomeFiles">index.html,index.htm,index.jsp</attribute>
         <attribute name="jettyContainerObjectName">geronimo.server:name=JettyWebContainer,*</attribute>
-        <attribute name="defaultServlets">geronimo.server:j2eeType=Servlet,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</attribute>
+        <attribute name="defaultServlets">geronimo.server:j2eeType=DefaultServlet,J2EEModule=org/apache/geronimo/RuntimeDeployer,*</attribute>
         <reference name="Repository">*:name=Repository,*</reference>
     </gbean>
     
-    <gbean namePart="StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
+    <gbean name="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Deployer,J2EEServer=geronimo,j2eeType=DefaultServlet,name=StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder">
         <attribute name="servletName">default</attribute>
         <attribute name="servletClass">org.mortbay.jetty.servlet.Default</attribute>
         <attribute name="loadOnStartup">0</attribute>
@@ -141,7 +141,7 @@
         <attribute name="servletMappings">/</attribute>
     </gbean>
 
-    <gbean namePart="JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
+    <gbean name="geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Deployer,J2EEServer=geronimo,j2eeType=DefaultServlet,name=JSPServlet" class="org.apache.geronimo.jetty.JettyServletHolder">
         <attribute name="servletName">jsp</attribute>
         <attribute name="servletClass">org.apache.jasper.servlet.JspServlet</attribute>
         <attribute name="loadOnStartup">0</attribute>