[jbossweb-commits] JBossWeb SVN: r529 - in trunk: res/jboss/org/apache/catalina/startup and 1 other directories.
Author: remy.maucherat(a)jboss.com
Date: 2008-03-18 12:30:31 -0400 (Tue, 18 Mar 2008)
New Revision: 529
Modified:
trunk/java/org/apache/catalina/core/StandardHost.java
trunk/res/jboss/org/apache/catalina/startup/catalina.properties
trunk/webapps/docs/changelog.xml
Log:
- Add hardcoding options for the deployer properties.
Modified: trunk/java/org/apache/catalina/core/StandardHost.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardHost.java 2008-03-18 13:56:10 UTC (rev
528)
+++ trunk/java/org/apache/catalina/core/StandardHost.java 2008-03-18 16:30:31 UTC (rev
529)
@@ -83,7 +83,8 @@
/**
* The auto deploy flag for this Host.
*/
- private boolean autoDeploy = true;
+ private boolean autoDeploy =
+
Boolean.valueOf(System.getProperty("org.apache.catalina.core.StandardHost.autoDeploy",
"true")).booleanValue();
/**
@@ -105,13 +106,15 @@
/**
* The deploy on startup flag for this Host.
*/
- private boolean deployOnStartup = true;
+ private boolean deployOnStartup =
+
Boolean.valueOf(System.getProperty("org.apache.catalina.core.StandardHost.deployOnStartup",
"true")).booleanValue();
/**
* deploy Context XML config files property.
*/
- private boolean deployXML = true;
+ private boolean deployXML =
+
Boolean.valueOf(System.getProperty("org.apache.catalina.core.StandardHost.deployXML",
"true")).booleanValue();
/**
Modified: trunk/res/jboss/org/apache/catalina/startup/catalina.properties
===================================================================
--- trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2008-03-18 13:56:10
UTC (rev 528)
+++ trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2008-03-18 16:30:31
UTC (rev 529)
@@ -3,6 +3,9 @@
org.apache.catalina.core.StandardService.DELAY_CONNECTOR_STARTUP=true
org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
org.apache.catalina.connector.Request.SESSION_ID_CHECK=true
+org.apache.catalina.core.StandardHost.autoDeploy=false
+org.apache.catalina.core.StandardHost.deployOnStartup=false
+org.apache.catalina.core.StandardHost.deployXML=false
# String cache configuration.
tomcat.util.buf.StringCache.byte.enabled=true
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-03-18 13:56:10 UTC (rev 528)
+++ trunk/webapps/docs/changelog.xml 2008-03-18 16:30:31 UTC (rev 529)
@@ -23,6 +23,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Add 3 system properties to StandardHost to allow hardcoding safe default values
for the
+ auto deployer when JBoss Web is embedded inside AS. (remm)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<fix>