[jboss-cvs] JBossAS SVN: r59094 - in projects/aop/trunk/aop: . src/main/org/jboss/aop

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

Author: kabir.khan at jboss.com
Date: 2006-12-18 17:09:04 -0500 (Mon, 18 Dec 2006)
New Revision: 59094

Modified:
   projects/aop/trunk/aop/.classpath
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java
Log:
[JBAOP-331] IgnoreExpressions for a domain should be got from main AspectManager

Modified: projects/aop/trunk/aop/.classpath
===================================================================
--- projects/aop/trunk/aop/.classpath	2006-12-18 22:07:50 UTC (rev 59093)
+++ projects/aop/trunk/aop/.classpath	2006-12-18 22:09:04 UTC (rev 59094)
@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry excluding="org/jboss/aop/hook/JRockitClassPreProcessor.java|org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java" kind="src" path="src/main"/>
 	<classpathentry kind="src" path="src/test"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/javassist"/>
 	<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
@@ -13,7 +14,7 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
-	<classpathentry sourcepath="/javassist" kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/javassist"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2006-12-18 22:07:50 UTC (rev 59093)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2006-12-18 22:09:04 UTC (rev 59094)
@@ -731,9 +731,10 @@
    {
       ArrayList ignore = getIgnore();
       if (ignore == null) return false;
-      for (int i = 0; i < ignoreExpressions.length; i++)
+      ClassExpression[] ignoreExprs = getIgnoreExpressions();
+      for (int i = 0; i < ignoreExprs.length; i++)
       {
-         if(ignoreExpressions[i].matches(classname)) return true;
+         if(ignoreExprs[i].matches(classname)) return true;
       }
       return false;
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java	2006-12-18 22:07:50 UTC (rev 59093)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Domain.java	2006-12-18 22:09:04 UTC (rev 59094)
@@ -55,7 +55,6 @@
    protected boolean inheritsDeclarations = true;
    protected boolean inheritsBindings = false;
 
-
    public Domain(AspectManager manager, String name, boolean parentFirst)
    {
       this.parent = manager;
@@ -750,7 +749,7 @@
    /** Only set on a per vm basis */
    public ClassExpression[] getIgnoreExpressions()
    {
-      return super.getIgnoreExpressions();
+      return parent.getIgnoreExpressions();
    }
    
    public DynamicAOPStrategy getDynamicAOPStrategy()