[jboss-cvs] jboss-aop/src/main/org/jboss/aop ...

[Kabir Khan]

  User: kkhan   
  Date: 06/07/18 12:52:16

  Modified:    src/main/org/jboss/aop   AspectManager.java
                        AspectAnnotationLoader.java
  Log:
  Move AnnotationCreator out of aop into container project
  
  Revision  Changes    Path
  1.166     +2 -8      jboss-aop/src/main/org/jboss/aop/AspectManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AspectManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/AspectManager.java,v
  retrieving revision 1.165
  retrieving revision 1.166
  diff -u -b -r1.165 -r1.166
  --- AspectManager.java	13 Jul 2006 18:31:08 -0000	1.165
  +++ AspectManager.java	18 Jul 2006 16:52:16 -0000	1.166
  @@ -89,15 +89,13 @@
    * to do that.
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.165 $
  + * @version $Revision: 1.166 $
    */
   public class AspectManager
           implements Translator
   {
   
      // Attributes ---------------------------------------------------
  -   //protected static AOPClassPoolRepository classpoolRepository = new AOPClassPoolRepository(ScopedClassPoolRepositoryImpl.getInstance());
  -   
      protected final WeakHashMap advisors = new WeakHashMap();
      /** A map of domains by classloader, maintaned by the top level AspectManager */
      protected final WeakHashMap scopedClassLoaderDomains = new WeakHashMap();
  @@ -270,6 +268,7 @@
                     AOPClassPoolRepository.getInstance().setPrune((new Boolean(pruneit)).booleanValue());
                  }
                  manager = new AspectManager();
  +               AOPClassPoolRepository.getInstance().setAspectManager(manager);
      
                  if (!verbose)
                  {
  @@ -431,11 +430,6 @@
      public static boolean suppressReferenceErrors = true;
   
      // Constructors -------------------------------------------------
  -   private AspectManager(AOPClassPoolRepository repository)
  -   {
  -      //This is the top-lvel aspect manager
  -      AOPClassPoolRepository.getInstance().setAspectManager(this);
  -   }
   
      /**
       * Called by subclasses
  
  
  
  1.27      +3 -2      jboss-aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AspectAnnotationLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/AspectAnnotationLoader.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- AspectAnnotationLoader.java	30 May 2006 13:15:39 -0000	1.26
  +++ AspectAnnotationLoader.java	18 Jul 2006 16:52:16 -0000	1.27
  @@ -30,6 +30,8 @@
   import javassist.bytecode.annotation.ClassMemberValue;
   import javassist.bytecode.annotation.MemberValue;
   import javassist.bytecode.annotation.StringMemberValue;
  +
  +import org.jboss.annotation.factory.javassist.AnnotationProxy;
   import org.jboss.aop.advice.AdviceBinding;
   import org.jboss.aop.advice.AdviceFactory;
   import org.jboss.aop.advice.AspectDefinition;
  @@ -43,7 +45,6 @@
   import org.jboss.aop.advice.PrecedenceDefEntry;
   import org.jboss.aop.advice.Scope;
   import org.jboss.aop.advice.ScopedInterceptorFactory;
  -import org.jboss.aop.annotation.AnnotationProxy;
   import org.jboss.aop.introduction.AnnotationIntroduction;
   import org.jboss.aop.introduction.InterfaceIntroduction;
   import org.jboss.aop.pointcut.CFlow;
  @@ -70,7 +71,7 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.26 $
  + * @version $Revision: 1.27 $
    */
   public class AspectAnnotationLoader
   {