[jboss-cvs] JBossAS SVN: r72487 - in trunk/tomcat/src: resources and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2008-04-21 08:50:06 -0400 (Mon, 21 Apr 2008)
New Revision: 72487

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   trunk/tomcat/src/resources/server.xml
Log:
- Avoid starting contexts automagically during init (if something
  goes wrong there, something will go even more wrong in start as
  WebCtxLoader does not want to get restarted).
- No code change (javadoc cleanup).

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-04-21 08:35:24 UTC (rev 72486)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-04-21 12:50:06 UTC (rev 72487)
@@ -341,7 +341,7 @@
       JBossContextConfig.metaDataShared.set(config.getSharedMetaData());
       try
       {
-         // Init the container; this will also start it
+         // Init the context
          context.init();
          // Start it
          context.start();

Modified: trunk/tomcat/src/resources/server.xml
===================================================================
--- trunk/tomcat/src/resources/server.xml	2008-04-21 08:35:24 UTC (rev 72486)
+++ trunk/tomcat/src/resources/server.xml	2008-04-21 12:50:06 UTC (rev 72487)
@@ -66,7 +66,7 @@
          -->
 
        <Host name="localhost"
-          autoDeploy="false" deployOnStartup="false" deployXML="false"
+          autoDeploy="false" deployOnStartup="false" deployXML="false" startChildren="false"
           configClass="org.jboss.web.tomcat.security.config.JBossContextConfig"> 
             <!-- Uncomment to enable request dumper. This Valve "logs interesting 
                  contents from the specified Request (before processing) and the