[jboss-cvs] JBossAS SVN: r75926 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2008-07-16 10:01:06 -0400 (Wed, 16 Jul 2008)
New Revision: 75926

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
- Add back DeleteWorkDirOnContextDestroy, which might have been removed
  by accident. Same default to false as before.
- See JBAS-3358.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2008-07-16 13:51:10 UTC (rev 75925)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2008-07-16 14:01:06 UTC (rev 75926)
@@ -72,8 +72,12 @@
 
    public static ThreadLocal<JBossWebMetaData> metaDataShared = new ThreadLocal<JBossWebMetaData>();
 
+   public static ThreadLocal<DeployerConfig> deployerConfig = new ThreadLocal<DeployerConfig>();
+
    private static Logger log = Logger.getLogger(JBossContextConfig.class);
 
+   private boolean runDestroy = false;
+   
    /**
     * <p>
     * Creates a new instance of {@code JBossContextConfig}.
@@ -92,6 +96,7 @@
       {
          log.debug("Failed to load the customized authenticators", e);
       }
+      runDestroy = deployerConfig.get().isDeleteWorkDirs();
    }
 
    @Override
@@ -456,4 +461,10 @@
       return (Properties) new InitialContext().lookup("TomcatAuthenticators");
    }
 
+   protected void destroy() {
+	   if (runDestroy) {
+		   super.destroy();
+	   }
+   }
+   
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2008-07-16 13:51:10 UTC (rev 75925)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2008-07-16 14:01:06 UTC (rev 75926)
@@ -496,6 +496,7 @@
       config.setSecurityManagerService(this.secMgrService);
       config.setFilteredPackages(filteredPackages);
       config.setSharedMetaData(sharedMetaData);
+      config.setDeleteWorkDirs(deleteWorkDirOnContextDestroy);
       
       config.setSecurityContextClassName(securityContextClassName);
       deployment.setSecurityManagementName(securityManagement);

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java	2008-07-16 13:51:10 UTC (rev 75925)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java	2008-07-16 14:01:06 UTC (rev 75926)
@@ -179,4 +179,24 @@
     */
    public void setSessionCookieForSSOAuth(String sessionCookieForSSOAuth);
 
+   /**
+    * <p>
+    * Obtain the value of the {@code deleteWorkDirOnContextDestroy} property. This property is used to indicate 
+    * if the workdirs will be deleted when undeploying contexts.
+    * </p>
+    * 
+    * @return the value of the {@code deleteWorkDirOnContextDestroy} property.
+    */
+   public boolean getDeleteWorkDirOnContextDestroy();
+
+   /**
+    * <p>
+    * Set the value of the {@code deleteWorkDirOnContextDestroy} property. This property is used to indicate 
+    * if the workdirs will be deleted when undeploying contexts.
+    * </p>
+    * 
+    * @param deleteFlag a {@code boolean} containing the value of the {@code deleteWorkDirOnContextDestroy} property.
+    */
+   public void setDeleteWorkDirOnContextDestroy(boolean deleteFlag);
+   
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-07-16 13:51:10 UTC (rev 75925)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-07-16 14:01:06 UTC (rev 75926)
@@ -347,6 +347,7 @@
       RunAsListener.metaDataLocal.set(metaData);
       JBossContextConfig.metaDataLocal.set(metaData);
       JBossContextConfig.metaDataShared.set(config.getSharedMetaData());
+      JBossContextConfig.deployerConfig.set(config);
       try
       {
          // Init the context
@@ -364,6 +365,7 @@
          RunAsListener.metaDataLocal.set(null);
          JBossContextConfig.metaDataLocal.set(null);
          JBossContextConfig.metaDataShared.set(null);
+         JBossContextConfig.deployerConfig.set(null);
       }
       if (context.getState() != 1)
       {

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2008-07-16 13:51:10 UTC (rev 75925)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2008-07-16 14:01:06 UTC (rev 75926)
@@ -229,6 +229,11 @@
       return tomcatDeployer == null ? null : tomcatDeployer.getContextMBeanCode();
    }
 
+   public boolean getUseJBossWebLoader()
+   {
+      return tomcatDeployer == null ? false : tomcatDeployer.getUseJBossWebLoader();
+   }
+
    public String getDomain()
    {
       return tomcatDeployer == null ? null : tomcatDeployer.getDomain();
@@ -254,9 +259,9 @@
       return tomcatDeployer == null ? null : tomcatDeployer.getSubjectAttributeName();
    }
 
-   public boolean getUseJBossWebLoader()
+   public boolean getDeleteWorkDirOnContextDestroy()
    {
-      return tomcatDeployer == null ? false : tomcatDeployer.getUseJBossWebLoader();
+      return tomcatDeployer == null ? false : tomcatDeployer.getDeleteWorkDirOnContextDestroy();
    }
 
    public boolean isAllowSelfPrivilegedWebApps()
@@ -282,6 +287,12 @@
          tomcatDeployer.setContextMBeanCode(className);
    }
 
+   public void setDeleteWorkDirOnContextDestroy(boolean flag)
+   {
+      if (tomcatDeployer != null)
+         tomcatDeployer.setDeleteWorkDirOnContextDestroy(flag);
+   }
+
    public void setDomain(String domainName)
    {
       if (tomcatDeployer != null)