Author: remy.maucherat(a)jboss.com Date: 2008-04-21 08:27:29 -0400 (Mon, 21 Apr 2008) New Revision: 587 Modified: trunk/java/org/apache/catalina/core/StandardHost.java trunk/res/jboss/org/apache/catalina/startup/catalina.properties trunk/webapps/docs/changelog.xml trunk/webapps/docs/rewrite.xml Log: - Add JBoss default for not starting contexts in init (which would cause two errors instead of just one). Modified: trunk/java/org/apache/catalina/core/StandardHost.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardHost.java 2008-04-17 19:23:46 UTC (rev 586) +++ trunk/java/org/apache/catalina/core/StandardHost.java 2008-04-21 12:27:29 UTC (rev 587) @@ -61,6 +61,8 @@ super(); pipeline.setBasic(new StandardHostValve()); + startChildren = + Boolean.valueOf(System.getProperty("org.apache.catalina.core.StandardHost.startChildren", "true")).booleanValue(); } Modified: trunk/res/jboss/org/apache/catalina/startup/catalina.properties =================================================================== --- trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2008-04-17 19:23:46 UTC (rev 586) +++ trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2008-04-21 12:27:29 UTC (rev 587) @@ -6,6 +6,7 @@ org.apache.catalina.core.StandardHost.autoDeploy=false org.apache.catalina.core.StandardHost.deployOnStartup=false org.apache.catalina.core.StandardHost.deployXML=false +org.apache.catalina.core.StandardHost.startChildren=false # String cache configuration. tomcat.util.buf.StringCache.byte.enabled=true Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-04-17 19:23:46 UTC (rev 586) +++ trunk/webapps/docs/changelog.xml 2008-04-21 12:27:29 UTC (rev 587) @@ -67,6 +67,9 @@ <fix> <bug>44392</bug>: HTML entities now handled correctly in SSI processing. (markt) </fix> + <fix> + Add system property for JBoss default allowing not starting the context in init. (remm) + </fix> </changelog> </subsection> <subsection name="Coyote"> Modified: trunk/webapps/docs/rewrite.xml =================================================================== --- trunk/webapps/docs/rewrite.xml 2008-04-17 19:23:46 UTC (rev 586) +++ trunk/webapps/docs/rewrite.xml 2008-04-21 12:27:29 UTC (rev 587) @@ -97,12 +97,11 @@ where <em>NAME_OF_VARIABLE</em> can be a string taken from the following list: - <table> - <columnspec><column width=".3"/><column width=".3"/> - <column width=".3"/></columnspec> + <table border="1"> + <tr> <th>HTTP headers:</th> <th>connection &amp; request:</th> <th></th> - </tr> + </tr> <tr> <td>