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

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

Author: stalep
Date: 2008-03-06 08:34:52 -0500 (Thu, 06 Mar 2008)
New Revision: 70481

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/hook/GenerateInstrumentedClassLoader.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JDK14TransformerManager.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/SystemClassLoader.java
Log:
[JBAOP-534] Changed the package matching from org.jboss.aop to org.jboss.aop.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-03-06 13:25:58 UTC (rev 70480)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java	2008-03-06 13:34:52 UTC (rev 70481)
@@ -857,7 +857,7 @@
       if (ignoreClass(classname)) return true;
       if (includeClass(classname)) return false;
       if (excludeClass(classname)) return true;
-      return (classname.startsWith("org.jboss.aop") ||
+      return (classname.startsWith("org.jboss.aop.") ||
               classname.endsWith("$aop") ||
               classname.startsWith("javassist") ||
               classname.startsWith("org.jboss.util.") ||

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/hook/GenerateInstrumentedClassLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/hook/GenerateInstrumentedClassLoader.java	2008-03-06 13:25:58 UTC (rev 70480)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/hook/GenerateInstrumentedClassLoader.java	2008-03-06 13:34:52 UTC (rev 70481)
@@ -48,7 +48,7 @@
       CtMethod wrapper = CtNewMethod.make(Modifier.PROTECTED, method.getReturnType(), "defineClass", method.getParameterTypes(), method.getExceptionTypes(), null, clazz);
 
       String code = "{"
-              + " if (!$1.startsWith(\"org.jboss.aop\") &&"
+              + " if (!$1.startsWith(\"org.jboss.aop.\") &&"
               + " !$1.endsWith(\"$aop\") &&"
               + " !$1.startsWith(\"javassist\") &&"
               + " !$1.startsWith(\"org.jboss.util.\") &&"

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JDK14TransformerManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JDK14TransformerManager.java	2008-03-06 13:25:58 UTC (rev 70480)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JDK14TransformerManager.java	2008-03-06 13:34:52 UTC (rev 70481)
@@ -41,7 +41,7 @@
 
    public static boolean isNonAdvisableClassName(String classname)
    {
-      return (classname.startsWith("org.jboss.aop") ||
+      return (classname.startsWith("org.jboss.aop.") ||
       classname.endsWith("$aop") ||
       classname.startsWith("javassist") ||
       classname.startsWith("org.jboss.util.") ||

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java	2008-03-06 13:25:58 UTC (rev 70480)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java	2008-03-06 13:34:52 UTC (rev 70481)
@@ -37,7 +37,7 @@
 {
    public boolean isNonAdvisableClassName(String classname)
    {
-      return (classname.startsWith("org.jboss.aop") ||
+      return (classname.startsWith("org.jboss.aop.") ||
       classname.endsWith("$aop") ||
       classname.startsWith("javassist") ||
       classname.startsWith("org.jboss.util.") ||

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/SystemClassLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/SystemClassLoader.java	2008-03-06 13:25:58 UTC (rev 70480)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/SystemClassLoader.java	2008-03-06 13:34:52 UTC (rev 70481)
@@ -174,7 +174,7 @@
          if (state == INITIALIZED)
          {
             final Object[] args = {this, name, null, null, origBytes.bytes};
-            if (!name.startsWith("org.jboss.aop"))
+            if (!name.startsWith("org.jboss.aop."))
             {
                classBytes.bytes = (byte[]) transform.invoke(aspectManager, args);
                classBytes.protectionDomain = origBytes.protectionDomain;