[jboss-cvs] JBossAS SVN: r102614 - in projects/aop/trunk: asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5 and 1 other directory.

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

Author: flavia.rainone at jboss.com
Date: 2010-03-19 02:52:20 -0400 (Fri, 19 Mar 2010)
New Revision: 102614

Removed:
   projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ExtraClassPoolFactoryParameters.java
Modified:
   projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/VFSClassLoaderScopingPolicy.java
Log:
[JBAOP-772] Removed ExtraClassPoolFactoryParameters.

Deleted: projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ExtraClassPoolFactoryParameters.java
===================================================================
--- projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ExtraClassPoolFactoryParameters.java	2010-03-19 06:34:49 UTC (rev 102613)
+++ projects/aop/trunk/asintegration-core/src/main/java/org/jboss/aop/classpool/ExtraClassPoolFactoryParameters.java	2010-03-19 06:52:20 UTC (rev 102614)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.aop.classpool;
-
-import java.util.Map;
-
-/**
- * This class is used by the AS5 integration. Do not delete!!!! 
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ExtraClassPoolFactoryParameters
-{
-   /** A map of properties that can be used to configure the classpool factories further */
-   private static ThreadLocal<Map<Object, Object>> properties = new ThreadLocal<Map<Object, Object>>();
-   
-   public static void pushThreadProperties(Map<Object, Object> props)
-   {
-      properties.set(props);
-   }
-   
-   public static Map<Object, Object> peekThreadProperties()
-   {
-      return properties.get();
-   }
-   
-   public static Map<Object, Object> popThreadProperties()
-   {
-      Map<Object, Object> props = properties.get();
-      properties.remove();
-      return props;
-   }
-
-}

Modified: projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/VFSClassLoaderScopingPolicy.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/VFSClassLoaderScopingPolicy.java	2010-03-19 06:34:49 UTC (rev 102613)
+++ projects/aop/trunk/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/VFSClassLoaderScopingPolicy.java	2010-03-19 06:52:20 UTC (rev 102614)
@@ -21,12 +21,8 @@
  */ 
 package org.jboss.aop.asintegration.jboss5;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.Domain;
-import org.jboss.aop.classpool.ExtraClassPoolFactoryParameters;
 import org.jboss.classloading.spi.dependency.Module;
 import org.jboss.logging.Logger;
 
@@ -47,19 +43,7 @@
 
    public void registerClassLoader(Module module, ClassLoader loader)
    {
-      //Need to pass some data through to the classpoolfactory here
-      Map<Object, Object> properties = new HashMap<Object, Object>();
-      //The module is needed by the JBoss5ClassPoolFactory, the legacy JBossClassPoolFactory will ignore this
-      properties.put(Module.class, module);
-      ExtraClassPoolFactoryParameters.pushThreadProperties(properties);
-      try
-      {
-         AspectManager.instance().registerClassLoader(loader); //Ends up in classpool factory create method
-      }
-      finally
-      {
-         ExtraClassPoolFactoryParameters.popThreadProperties();
-      }
+      AspectManager.instance().registerClassLoader(loader); //Ends up in classpool factory create method
    }
    
    public Domain getDomain(ClassLoader classLoader, AspectManager parent)