[Jboss-cvs] JBossAS SVN: r55916 - branches/Branch_4_0/tomcat/src/resources

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2006-08-14 16:22:19 -0400 (Mon, 14 Aug 2006)
New Revision: 55916

Modified:
   branches/Branch_4_0/tomcat/src/resources/jboss-service-all.xml
   branches/Branch_4_0/tomcat/src/resources/jboss-service.xml
   branches/Branch_4_0/tomcat/src/resources/server.xml
   branches/Branch_4_0/tomcat/src/resources/webserver-xmbean.xml
Log:
JBAS-3358: Do not delete work dir on context destroy.  This is configurable at the tomcat service level

Modified: branches/Branch_4_0/tomcat/src/resources/jboss-service-all.xml
===================================================================
--- branches/Branch_4_0/tomcat/src/resources/jboss-service-all.xml	2006-08-14 20:21:50 UTC (rev 55915)
+++ branches/Branch_4_0/tomcat/src/resources/jboss-service-all.xml	2006-08-14 20:22:19 UTC (rev 55916)
@@ -11,6 +11,7 @@
       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 +38,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
@@ -66,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.tc5.session.JBossCacheManager

Modified: branches/Branch_4_0/tomcat/src/resources/jboss-service.xml
===================================================================
--- branches/Branch_4_0/tomcat/src/resources/jboss-service.xml	2006-08-14 20:21:50 UTC (rev 55915)
+++ branches/Branch_4_0/tomcat/src/resources/jboss-service.xml	2006-08-14 20:22:19 UTC (rev 55916)
@@ -11,6 +11,7 @@
       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 +38,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 +68,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.tc5.session.JBossCacheManager

Modified: branches/Branch_4_0/tomcat/src/resources/server.xml
===================================================================
--- branches/Branch_4_0/tomcat/src/resources/server.xml	2006-08-14 20:21:50 UTC (rev 55915)
+++ branches/Branch_4_0/tomcat/src/resources/server.xml	2006-08-14 20:22:19 UTC (rev 55916)
@@ -70,15 +70,10 @@
             />
          -->
 
-         <Host name="localhost"
-            autoDeploy="false" deployOnStartup="false" deployXML="false">
-		 
-		 <!-- UNCOMMENT TO ENABLE CUSTOMIZATION OF TOMCAT AUTHENTICATORS	 
-			<Host name="localhost"
-            autoDeploy="false" deployOnStartup="false" deployXML="false"
-			configClass="org.jboss.web.tomcat.security.config.JBossContextConfig">
-                -->
-		  
+        <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 

Modified: branches/Branch_4_0/tomcat/src/resources/webserver-xmbean.xml
===================================================================
--- branches/Branch_4_0/tomcat/src/resources/webserver-xmbean.xml	2006-08-14 20:21:50 UTC (rev 55915)
+++ branches/Branch_4_0/tomcat/src/resources/webserver-xmbean.xml	2006-08-14 20:22:19 UTC (rev 55916)
@@ -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>
@@ -169,4 +175,4 @@
    &defaultOperations;
    &interceptable;    
    
-</mbean>
\ No newline at end of file
+</mbean>