[jboss-cvs] JBossAS SVN: r59022 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers

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

Author: scott.stark at jboss.org
Date: 2006-12-13 19:01:50 -0500 (Wed, 13 Dec 2006)
New Revision: 59022

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployer.java
Log:
Add a deploymentClass property to control the deployment wrapper

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployer.java	2006-12-14 00:00:24 UTC (rev 59021)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployer.java	2006-12-14 00:01:50 UTC (rev 59022)
@@ -51,7 +51,6 @@
 import org.jboss.web.deployers.AbstractWarDeployer;
 import org.jboss.web.deployers.AbstractWarDeployment;
 import org.jboss.web.tomcat.security.HttpServletRequestPolicyContextHandler;
-import org.jboss.web.tomcat.tc6.TomcatInjectionContainer;
 import org.jboss.web.tomcat.tc6.session.SessionIDGenerator;
 
 
@@ -165,8 +164,10 @@
    private boolean allowSelfPrivilegedWebApps = false;
 
    /** The service used to flush authentication cache on session invalidation. */
-   private JaasSecurityManagerServiceMBean secMgrService;  
-   
+   private JaasSecurityManagerServiceMBean secMgrService;
+   /** The AbstractWarDeployment implementation class */
+   private Class deploymentClass = TomcatDeployment.class;
+
    /** */
    private String[] filteredPackages;
 
@@ -407,6 +408,15 @@
       this.filteredPackages = pkgs;
    }
 
+   public Class getDeploymentClass()
+   {
+      return deploymentClass;
+   }
+   public void setDeploymentClass(Class deploymentClass)
+   {
+      this.deploymentClass = deploymentClass;
+   }
+
    /**
     * Start the deployer. This sets up the tomcat core.
     */
@@ -722,7 +732,8 @@
    public AbstractWarDeployment getDeployment(DeploymentUnit unit, WebMetaData metaData)
       throws Exception
    {
-      TomcatDeployment2 deployment = new TomcatDeployment2();
+      AbstractWarDeployment deployment = (AbstractWarDeployment) deploymentClass.newInstance();
+      
       DeployerConfig config = new DeployerConfig();
       config.setDefaultSecurityDomain(this.defaultSecurityDomain);
       config.setSubjectAttributeName(this.subjectAttributeName);