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

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

Author: kabir.khan at jboss.com
Date: 2007-02-09 13:01:51 -0500 (Fri, 09 Feb 2007)
New Revision: 60463

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java
   projects/aop/trunk/build/build-thirdparty.xml
Log:
Differentiate between null bootstrap classloader and gc'ed classloaders in class pool (handled in javassist ScopedClassPool)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java	2007-02-09 17:09:08 UTC (rev 60462)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java	2007-02-09 18:01:51 UTC (rev 60463)
@@ -69,7 +69,6 @@
 import org.jboss.aop.pointcut.PointcutMethodMatch;
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.metadata.spi.signature.MethodSignature;
-import org.jboss.repository.spi.MetaDataContext;
 import org.jboss.util.NestedRuntimeException;
 import org.jboss.util.NotImplementedException;
 
@@ -583,18 +582,6 @@
       return AnnotationElement.isAnyAnnotationPresent(member, annotation);
    }
 
-   @Deprecated // use getMetaData
-   public MetaDataContext getMetadataContext()
-   {
-      throw new NotImplementedException("getMetaDataContext");
-   }
-
-   @Deprecated // use setMetaData
-   public void setMetadataContext(/*MetaDataContext*/ Object metadataContext)
-   {
-      throw new NotImplementedException("setMetaDataContext");
-   }
-
    /**
     * Get the metadata
     * 

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-02-09 17:09:08 UTC (rev 60462)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPool.java	2007-02-09 18:01:51 UTC (rev 60463)
@@ -53,14 +53,19 @@
    
    public AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
    {
-      super(cl, src, repository);
+      this(cl, src, repository, false);
    }
 
    protected AOPClassPool(ClassPool src, ScopedClassPoolRepository repository)
    {
-      this(null, src, repository);
+      this(null, src, repository, true);
    }
 
+   private AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository, boolean isTemp)
+   {
+      super(cl, src, repository, isTemp);
+   }
+
    public void setClassLoader(ClassLoader cl)
    {
       classLoader = new WeakReference(cl);

Modified: projects/aop/trunk/build/build-thirdparty.xml
===================================================================
--- projects/aop/trunk/build/build-thirdparty.xml	2007-02-09 17:09:08 UTC (rev 60462)
+++ projects/aop/trunk/build/build-thirdparty.xml	2007-02-09 18:01:51 UTC (rev 60463)
@@ -45,7 +45,7 @@
       -->
       <componentref name="apache-log4j" version="1.2.8"/>
       <componentref name="dom4j" version="1.6.1jboss"/>
-      <componentref name="javassist" version="3.4.GA"/>
+      <componentref name="javassist" version="snapshot"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/common-core" version="2.0.1.GA"/>
       <componentref name="jboss/common-logging-jdk" version="2.0.1.GA"/>