[jbossweb-commits] JBossWeb SVN: r1152 - in trunk: res/jboss/org/apache/catalina/startup and 1 other directory.
Author: remy.maucherat(a)jboss.com
Date: 2009-08-31 11:12:09 -0400 (Mon, 31 Aug 2009)
New Revision: 1152
Modified:
trunk/java/org/apache/catalina/core/StandardContext.java
trunk/res/jboss/org/apache/catalina/startup/catalina.properties
Log:
- Add back a flag (from a system property because it's quite useless).
Modified: trunk/java/org/apache/catalina/core/StandardContext.java
===================================================================
--- trunk/java/org/apache/catalina/core/StandardContext.java 2009-08-31 15:10:49 UTC (rev
1151)
+++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-08-31 15:12:09 UTC (rev
1152)
@@ -127,7 +127,10 @@
{
protected static Logger log = Logger.getLogger(StandardContext.class);
+ public static final boolean CONFIGBASE_MKDIRS =
+
Boolean.valueOf(System.getProperty("org.apache.catalina.core.CONFIGBASE_MKDIRS",
"true")).booleanValue();
+
// ----------------------------------------------------------- Constructors
@@ -4817,7 +4820,9 @@
if (host != null) {
configBase = new File(configBase, host.getName());
}
- configBase.mkdirs();
+ if (CONFIGBASE_MKDIRS) {
+ configBase.mkdirs();
+ }
return configBase;
}
Modified: trunk/res/jboss/org/apache/catalina/startup/catalina.properties
===================================================================
--- trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2009-08-31 15:10:49
UTC (rev 1151)
+++ trunk/res/jboss/org/apache/catalina/startup/catalina.properties 2009-08-31 15:12:09
UTC (rev 1152)
@@ -3,6 +3,7 @@
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.CONFIGBASE_MKDIRS=false
org.apache.catalina.core.StandardHost.autoDeploy=false
org.apache.catalina.core.StandardHost.configClass=org.jboss.web.tomcat.service.deployers.JBossContextConfig
org.apache.catalina.core.StandardHost.deployOnStartup=false