[jboss-cvs] JBossAS SVN: r66386 - in projects/aop/trunk/asintegration/src/main/org/jboss/aop: domain and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2007-10-24 10:18:29 -0400 (Wed, 24 Oct 2007)
New Revision: 66386

Modified:
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderScopingPolicy.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedClassLoaderDomain.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedRepositoryClassLoaderDomain.java
Log:
[JBAOP-409] Cleanup

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java	2007-10-24 12:53:48 UTC (rev 66385)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java	2007-10-24 14:18:29 UTC (rev 66386)
@@ -120,37 +120,6 @@
       }
    }
    
-   
-   private void clearCacheOnLoaderHack(final ClassLoader loader)
-   {
-      if (loader instanceof BaseClassLoader)
-      {
-         try
-         {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-
-               public Object run() throws Exception
-               {
-                  Class clazz = loader.getClass();
-                  while (clazz != null && clazz != BaseClassLoader.class)
-                  {
-                     clazz = clazz.getSuperclass();
-                  }
-                  Field field = clazz.getDeclaredField("blackList");
-                  field.setAccessible(true);
-                  Set<String> set = (Set<String>)field.get(loader);
-                  set.clear();
-                  return null;
-               }});
-         }
-         catch (PrivilegedActionException e)
-         {
-            // AutoGenerated
-            throw new RuntimeException(e.getCause());
-         }
-      }
-   }
-   
 //   protected boolean isLocalResource(String resourceName)
 //   {
 //      if (super.isLocalResource(resourceName))

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java	2007-10-24 12:53:48 UTC (rev 66385)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java	2007-10-24 14:18:29 UTC (rev 66386)
@@ -46,7 +46,6 @@
  **/
 public class JBoss5ClassPoolFactory extends AbstractJBossClassPoolFactory implements ScopedClassPoolFactory
 {
-   static ThreadLocal<Boolean> reentry = new ThreadLocal<Boolean>();    
    public ScopedClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
    {
       

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderScopingPolicy.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderScopingPolicy.java	2007-10-24 12:53:48 UTC (rev 66385)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderScopingPolicy.java	2007-10-24 14:18:29 UTC (rev 66386)
@@ -120,26 +120,5 @@
       Thread.currentThread().getContextClassLoader();
       return null;
    }
-
-//   public boolean isScoped(Module module)
-//   {
-//      String domainName = module.getDomainName();
-//      ClassLoaderMetaData cmd = module.getMetadata();
-////      boolean parentDelegation = cmd.isJ2seClassLoadingCompliance();
-//      
-//      System.out.println("****** DomainName: " + domainName + " parentDomain: " + module.getParentDomain());
-//      
-//      
-//      //FIXME There seems to be no way to navigate the tree of domains
-//      
-//      if (module.getParentDomain() != null && module.getParentDomain().equals(ClassLoaderSystem.DEFAULT_DOMAIN_NAME))
-//      {
-//         //Should probably check for more levels?
-//         return true;
-//      }
-//      return false;
-//   }
-
-
 }
    
\ No newline at end of file

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedClassLoaderDomain.java	2007-10-24 12:53:48 UTC (rev 66385)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedClassLoaderDomain.java	2007-10-24 14:18:29 UTC (rev 66386)
@@ -33,7 +33,6 @@
 /**
  * A domain that is used for scoped classloaders
  * 
- * @deprecated TODO JBAOP-107 Need a different version for the JBoss5 classloader 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @author adrian at jboss.org
  * @version $Revision: 1.1 $

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedRepositoryClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedRepositoryClassLoaderDomain.java	2007-10-24 12:53:48 UTC (rev 66385)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedRepositoryClassLoaderDomain.java	2007-10-24 14:18:29 UTC (rev 66386)
@@ -32,7 +32,6 @@
 /**
  * A domain that is used for scoped classloaders
  * 
- * @deprecated TODO JBAOP-107 Need a different version for the JBoss5 classloader 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @author adrian at jboss.org
  * @version $Revision: 1.1 $