[Jboss-cvs] JBossAS SVN: r56130 - in trunk/tomcat/src: main/org/jboss/web/tomcat/tc6 resources
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 21 15:04:32 EDT 2006
Author: anil.saldhana at jboss.com
Date: 2006-08-21 15:04:31 -0400 (Mon, 21 Aug 2006)
New Revision: 56130
Modified:
trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/Tomcat6.java
trunk/tomcat/src/resources/jboss-service-all.xml
trunk/tomcat/src/resources/jboss-service.xml
trunk/tomcat/src/resources/server.xml
trunk/tomcat/src/resources/webserver-xmbean.xml
Log:
JBAS-3358:do not remove work directory for the web app when the context is destroyed
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/Tomcat6.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/Tomcat6.java 2006-08-21 19:02:05 UTC (rev 56129)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/Tomcat6.java 2006-08-21 19:04:31 UTC (rev 56130)
@@ -36,14 +36,12 @@
import javax.management.ObjectName;
import javax.security.jacc.PolicyContext;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.Loader;
+import org.apache.catalina.Lifecycle;
import org.apache.catalina.connector.Connector;
import org.apache.commons.modeler.Registry;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.SubDeployerExt;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.security.plugins.AuthorizationManagerServiceMBean;
+import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.security.plugins.JaasSecurityManagerServiceMBean;
import org.jboss.system.ServiceControllerMBean;
import org.jboss.system.server.Server;
@@ -51,9 +49,7 @@
import org.jboss.web.AbstractWebContainer;
import org.jboss.web.AbstractWebDeployer;
import org.jboss.web.tomcat.security.HttpServletRequestPolicyContextHandler;
-import org.jboss.web.tomcat.tc6.session.SessionIDGenerator;
-import org.jboss.metadata.WebMetaData;
-import org.jboss.ejb3.JmxDependencyPolicy;
+import org.jboss.web.tomcat.tc6.session.SessionIDGenerator;
/**
@@ -138,6 +134,11 @@
* A flag indicating if the JBoss Loader should be used
*/
private boolean useJBossWebLoader = true;
+
+ /**
+ * JBAS-3358: Work directory shouldn't be deleted on Context Destroy
+ */
+ private boolean deleteWorkDirOnContextDestroy = false;
/**
* The server xml configuration file name
@@ -298,8 +299,18 @@
public void setUseJK(boolean useJK)
{
this.useJK = useJK;
+ }
+
+ public boolean getDeleteWorkDirOnContextDestroy()
+ {
+ return deleteWorkDirOnContextDestroy;
}
+ public void setDeleteWorkDirOnContextDestroy(boolean deleteFlag)
+ {
+ this.deleteWorkDirOnContextDestroy = deleteFlag;
+ }
+
/**
* The SessionIdAlphabet is the set of characters used to create a session Id
*/
Modified: trunk/tomcat/src/resources/jboss-service-all.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-service-all.xml 2006-08-21 19:02:05 UTC (rev 56129)
+++ trunk/tomcat/src/resources/jboss-service-all.xml 2006-08-21 19:04:31 UTC (rev 56130)
@@ -8,7 +8,6 @@
will apply the same set of authenticators across all web applications. You can
override the set of authenticators at the web application level by adding
<authenticators> element to the respective jboss-web.xml -->
- <!--
<attribute name="Authenticators" serialDataType="jbxb">
<java:properties xmlns:java="urn:jboss:java-properties"
xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
@@ -35,7 +34,6 @@
</java:property>
</java:properties>
</attribute>
- -->
<!-- The JAAS security domain to use in the absense of an explicit
security-domain specification in the war WEB-INF/jboss-web.xml
@@ -63,6 +61,9 @@
<attribute name="FilteredPackages">org.apache.commons.logging</attribute>
<attribute name="LenientEjbLink">true</attribute>
+
+ <!--Flag to delete the Work Dir on Context Destroy -->
+ <attribute name="DeleteWorkDirOnContextDestroy">false</attribute>
<!--
Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
Modified: trunk/tomcat/src/resources/jboss-service.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-service.xml 2006-08-21 19:02:05 UTC (rev 56129)
+++ trunk/tomcat/src/resources/jboss-service.xml 2006-08-21 19:04:31 UTC (rev 56130)
@@ -10,7 +10,6 @@
will apply the same set of authenticators across all web applications. You can
override the set of authenticators at the web application level by adding
<authenticators> element to the respective jboss-web.xml -->
- <!--
<attribute name="Authenticators" serialDataType="jbxb">
<java:properties xmlns:java="urn:jboss:java-properties"
xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
@@ -37,7 +36,6 @@
</java:property>
</java:properties>
</attribute>
- -->
<!-- The JAAS security domain to use in the absense of an explicit
security-domain specification in the war WEB-INF/jboss-web.xml
@@ -68,6 +66,9 @@
<attribute name="LenientEjbLink">true</attribute>
+ <!--Flag to delete the Work Dir on Context Destroy -->
+ <attribute name="DeleteWorkDirOnContextDestroy">false</attribute>
+
<!--
Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
- org.jboss.web.tomcat.tc6.session.JBossCacheManager
Modified: trunk/tomcat/src/resources/server.xml
===================================================================
--- trunk/tomcat/src/resources/server.xml 2006-08-21 19:02:05 UTC (rev 56129)
+++ trunk/tomcat/src/resources/server.xml 2006-08-21 19:04:31 UTC (rev 56130)
@@ -74,15 +74,9 @@
/>
-->
- <!-- Uncomment if you want to customize the authenticators
- <Host name="localhost"
- autoDeploy="false" deployOnStartup="false" deployXML="false"
- configClass="org.jboss.web.tomcat.security.config.JBossContextConfig">
- -->
- <!--Comment this host element if you want to customize the authenticators -->
- <Host name="localhost"
- autoDeploy="false" deployOnStartup="false" deployXML="false" >
-
+ <Host name="localhost"
+ autoDeploy="false" deployOnStartup="false" deployXML="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
corresponding Response (after processing). It is especially useful
Modified: trunk/tomcat/src/resources/webserver-xmbean.xml
===================================================================
--- trunk/tomcat/src/resources/webserver-xmbean.xml 2006-08-21 19:02:05 UTC (rev 56129)
+++ trunk/tomcat/src/resources/webserver-xmbean.xml 2006-08-21 19:04:31 UTC (rev 56130)
@@ -34,6 +34,12 @@
<type>boolean</type>
</attribute>
+ <attribute access="read-write" getMethod="getDeleteWorkDirOnContextDestroy"
+ setMethod="setDeleteWorkDirOnContextDestroy">
+ <name>DeleteWorkDirOnContextDestroy</name>
+ <type>boolean</type>
+ </attribute>
+
<attribute access="read-write" getMethod="getSubjectAttributeName" setMethod="setSubjectAttributeName">
<name>SubjectAttributeName</name>
<type>java.lang.String</type>
More information about the jboss-cvs-commits
mailing list