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

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

Author: bstansberry at jboss.com
Date: 2009-11-20 19:04:53 -0500 (Fri, 20 Nov 2009)
New Revision: 96669

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
Log:
[JBAS-7473] Clean out unused properties

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DeployerConfig.java	2009-11-20 23:38:29 UTC (rev 96668)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/DeployerConfig.java	2009-11-21 00:04:53 UTC (rev 96669)
@@ -49,12 +49,6 @@
    private String catalinaDomain = "Catalina";
 
    /**
-    * The fully qualified name of the class that will be used for session management if <tt>distributable</tt> is set
-    * to true.
-    */
-   private String managerClass = "org.jboss.web.tomcat.service.session.JBossManager";
-
-   /**
     * The web context class to create
     */
    private String contextClassName;
@@ -114,8 +108,6 @@
 
    /** FQN of the SecurityContext Class */
    private String securityContextClassName;
-   
-   private boolean overrideDistributableManager = true;
 
    public ClassLoader getServiceClassLoader()
    {
@@ -127,16 +119,6 @@
       this.serviceClassLoader = serviceClassLoader;
    }
 
-   public String getManagerClass()
-   {
-      return managerClass;
-   }
-
-   public void setManagerClass(String managerClass)
-   {
-      this.managerClass = managerClass;
-   }
-
    public String getCatalinaDomain()
    {
       return catalinaDomain;
@@ -287,41 +269,6 @@
    public void setSharedTldMetaData(List<TldMetaData> sharedTldMetaData)
    {
       this.sharedTldMetaData = sharedTldMetaData;
-   }
-
-   /**
-    * Gets whether the session <code>Manager</code> implementation for 
-    * distributable webapps should be overridden with an instance of 
-    * {@link #getManagerClass()}.
-    * <p>
-    * Setting this to <code>false</code> allows custom configuration of
-    * a manager via a <code>context.xml</code>. Default is <code>true</code>.
-    * </p>
-    * 
-    * @return <code>true</code> if the manager should be overridden,
-    *         <code>false</code> if the existing manager should be retained.
-    */
-   public boolean getOverrideDistributableManager()
-   {
-      return overrideDistributableManager;
-   }
-
-   /**
-    * Sets whether the session <code>Manager</code> implementation for 
-    * distributable webapps should be overridden with an instance of 
-    * {@link #getManagerClass()}.
-    * <p>
-    * Setting this to <code>false</code> allows custom configuration of
-    * a manager via a <code>context.xml</code>.  Default is <code>true</code>.
-    * </p>
-    * 
-    * @param override <code>true</code> if the manager should be overridden,
-    *         <code>false</code> if the existing manager should be retained.
-    */
-   public void setOverrideDistributableManager(boolean override)
-   {
-      this.overrideDistributableManager = override;
-   }
+   }   
    
-   
 }

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2009-11-20 23:38:29 UTC (rev 96668)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2009-11-21 00:04:53 UTC (rev 96669)
@@ -91,15 +91,6 @@
     */
    private String catalinaDomain = "Catalina";
 
-   /**
-    * The fully qualified name of the class that will be used for session management if <tt>distributable</tt> is set
-    * to true.
-    */
-   protected String managerClass = "org.jboss.web.tomcat.service.session.JBossCacheManager";
-   
-   /** Whether to override the Manager impl for distributable webapps */
-   private boolean overrideDistributableManager = true;
-
    private boolean deleteWorkDirOnContextDestroy = true;
 
    /**
@@ -449,8 +440,6 @@
       config.setServiceClassLoader((getServiceClassLoader() == null)
             ? getClass().getClassLoader()
             : getServiceClassLoader());
-      config.setManagerClass(this.managerClass);
-      config.setOverrideDistributableManager(this.overrideDistributableManager);
       config.setJava2ClassLoadingCompliance(this.java2ClassLoadingCompliance);
       config.setUnpackWars(this.unpackWars);
       config.setLenientEjbLink(this.lenientEjbLink);