[jboss-cvs] JBossAS SVN: r66387 - in projects/aop/trunk: asintegration/src/main/org/jboss/aop/asintegration/jboss4 and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2007-10-24 10:19:14 -0400 (Wed, 24 Oct 2007)
New Revision: 66387

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java
Log:
[JBAOP-409] Clean up how we look for scoped domains in global search

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2007-10-24 14:18:29 UTC (rev 66386)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2007-10-24 14:19:14 UTC (rev 66387)
@@ -115,7 +115,7 @@
                      }
                      
                      //Do not check classpools for scoped classloaders
-                     if (pool.getClass().getName().equals("org.jboss.aop.deployment.ScopedJBossClassPool"))
+                     if (!includeInGlobalSearch())
                      {
                         continue;
                      }
@@ -134,6 +134,11 @@
       return clazz;
    }
    
+   protected boolean includeInGlobalSearch()
+   {
+      return true;
+   }
+   
    protected String getResourceName(String classname)
    {
       final int lastIndex = classname.lastIndexOf('$');

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java	2007-10-24 14:18:29 UTC (rev 66386)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java	2007-10-24 14:19:14 UTC (rev 66387)
@@ -189,6 +189,11 @@
       return null;
    }
    
+   protected boolean includeInGlobalSearch()
+   {
+      return false;
+   }
+   
    private ClassPool getCorrectPoolForResource(String classname, URL url)
    {
       synchronized(AspectManager.getRegisteredCLs())

Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java	2007-10-24 14:18:29 UTC (rev 66386)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java	2007-10-24 14:19:14 UTC (rev 66387)
@@ -161,6 +161,11 @@
       return null;
    }
    
+   protected boolean includeInGlobalSearch()
+   {
+      return false;
+   } 
+   
    private ClassPool getCorrectPoolForResource(String classname, String resourceName, URL url)
    {
       boolean trace = log.isTraceEnabled();