[jboss-cvs] JBossAS SVN: r70215 - in trunk: tomcat/src/main/org/jboss/web/tomcat/service/deployers and 1 other directory.

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

Author: emuckenhuber
Date: 2008-02-28 11:07:03 -0500 (Thu, 28 Feb 2008)
New Revision: 70215

Modified:
   trunk/server/src/main/org/jboss/deployment/security/AbstractSecurityDeployer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
Log:
[JBAS-5252]

Modified: trunk/server/src/main/org/jboss/deployment/security/AbstractSecurityDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/AbstractSecurityDeployer.java	2008-02-28 16:04:27 UTC (rev 70214)
+++ trunk/server/src/main/org/jboss/deployment/security/AbstractSecurityDeployer.java	2008-02-28 16:07:03 UTC (rev 70215)
@@ -50,8 +50,6 @@
    static final String JACC_ATTACHMENT_NAME = "jboss.jacc";
    static final String BASE_OBJECT_NAME = "jboss.jacc:service=jacc,id=";
    
-   protected T metaData = null;
-   
    public AbstractSecurityDeployer()
    {
       setStage(DeploymentStages.POST_CLASSLOADER); 
@@ -62,7 +60,7 @@
    
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
-      metaData = unit.getAttachment(getMetaDataClassType());
+      T metaData = unit.getAttachment(getMetaDataClassType());
       
       if(metaData == null)
          return;
@@ -122,7 +120,7 @@
    @Override
    public void undeploy(DeploymentUnit unit)
    {
-      unit.removeAttachment(JACC_ATTACHMENT_NAME);  
+      unit.removeAttachment(JACC_ATTACHMENT_NAME);
    }  
 
    private void createTopLevelServiceBeanWithMetaData(String contextId, 

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2008-02-28 16:04:27 UTC (rev 70214)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2008-02-28 16:07:03 UTC (rev 70215)
@@ -153,10 +153,6 @@
       return policy;
    }
 
-   public void removeClassLoader(DeploymentContext context) throws Exception
-   {
-   }
-
    public static void addManifestLocations(VirtualFile file, List<VirtualFile> paths, Logger log)
       throws Exception
    {