Author: remy.maucherat(a)jboss.com
Date: 2008-04-21 09:06:14 -0400 (Mon, 21 Apr 2008)
New Revision: 588
Modified:
trunk/java/org/apache/catalina/core/StandardHost.java
trunk/res/jboss/org/apache/catalina/startup/catalina.properties
trunk/webapps/docs/changelog.xml
Log:
- Also use a system property for configClass.
Modified: trunk/java/org/apache/catalina/core/StandardHost.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardHost.java 2008-04-21 12:27:29 UTC (rev
587)
+++ trunk/java/org/apache/catalina/core/StandardHost.java 2008-04-21 13:06:14 UTC (rev
588)
@@ -94,7 +94,7 @@
* for deployed web applications.
*/
private String configClass =
- "org.apache.catalina.startup.ContextConfig";
+ System.getProperty("org.apache.catalina.core.StandardHost.configClass",
"org.apache.catalina.startup.ContextConfig");
/**
@@ -139,12 +139,6 @@
/**
- * The live deploy flag for this Host.
- */
- private boolean liveDeploy = true;
-
-
- /**
* Unpack WARs property.
*/
private boolean unpackWARs = true;
Modified: trunk/res/jboss/org/apache/catalina/startup/catalina.properties
===================================================================
--- trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2008-04-21 12:27:29
UTC (rev 587)
+++ trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2008-04-21 13:06:14
UTC (rev 588)
@@ -4,6 +4,7 @@
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.configClass=org.jboss.web.tomcat.security.config.JBossContextConfig
org.apache.catalina.core.StandardHost.deployOnStartup=false
org.apache.catalina.core.StandardHost.deployXML=false
org.apache.catalina.core.StandardHost.startChildren=false
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2008-04-21 12:27:29 UTC (rev 587)
+++ trunk/webapps/docs/changelog.xml 2008-04-21 13:06:14 UTC (rev 588)
@@ -68,7 +68,8 @@
<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)
+ Add system properties for JBoss default allowing not starting the context in
init, and set
+ the configClass field. (remm)
</fix>
</changelog>
</subsection>
Show replies by date