[jboss-cvs] jboss-aop/src/jdk15/org/jboss/aop/standalone ...

[Kabir Khan]

  User: kkhan   
  Date: 06/07/13 14:31:09

  Modified:    src/jdk15/org/jboss/aop/standalone   
                        StandaloneClassPool.java Agent.java
                        StandaloneClassPoolFactory.java
  Log:
  Refactor to wrap arouind ScopedClassPoolRepository and ScopedClassPool which has been moved to javassist
  
  Revision  Changes    Path
  1.8       +7 -7      jboss-aop/src/jdk15/org/jboss/aop/standalone/StandaloneClassPool.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StandaloneClassPool.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aop/src/jdk15/org/jboss/aop/standalone/StandaloneClassPool.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- StandaloneClassPool.java	3 Apr 2006 20:18:20 -0000	1.7
  +++ StandaloneClassPool.java	13 Jul 2006 18:31:09 -0000	1.8
  @@ -25,27 +25,27 @@
   import javassist.ClassPool;
   import javassist.CtClass;
   import javassist.NotFoundException;
  +import javassist.scopedpool.ScopedClassPoolRepository;
   
  -import org.jboss.aop.AOPClassPool;
  -import org.jboss.aop.AspectManager;
  +import org.jboss.aop.classpool.AOPClassPool;
   
   /**
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    * @deprecated Will be removed when Javassist is upgraded past 3.0 beta2
    */
   public class StandaloneClassPool extends AOPClassPool
   {
  -   public StandaloneClassPool(ClassLoader cl, ClassPool src, AspectManager manager)
  +   public StandaloneClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
      {
  -      super(cl, src, manager);
  +      super(cl, src, repository);
      }
   
  -   public StandaloneClassPool(ClassPool src, AspectManager manager)
  +   public StandaloneClassPool(ClassPool src, ScopedClassPoolRepository repository)
      {
  -      super(src, manager);
  +      super(src, repository);
      }
   
      //KAB: removed NotFoundException, IOException from throws clause, as 
  
  
  
  1.5       +4 -3      jboss-aop/src/jdk15/org/jboss/aop/standalone/Agent.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Agent.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aop/src/jdk15/org/jboss/aop/standalone/Agent.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Agent.java	29 Oct 2005 23:33:42 -0000	1.4
  +++ Agent.java	13 Jul 2006 18:31:09 -0000	1.5
  @@ -31,14 +31,15 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class Agent
   {
   
      public static void premain(String agentArgs, Instrumentation inst)
      {
  -      AspectManager.classPoolFactory = new StandaloneClassPoolFactory();
  +      StandaloneClassPoolFactory factory = new StandaloneClassPoolFactory(); 
  +      AspectManager.setClassPoolFactory(factory);
         // necessary for configuration
         AspectManager.instance();
         if (agentArgs != null && agentArgs.indexOf("-hotSwap") != -1)
  @@ -46,7 +47,7 @@
            // setting dynamic aop strategy: hot swap classes through InstrumentationAdapter
            DynamicAOPStrategy strategy = new HotSwapStrategy(new InstrumentationAdapter(inst));
            AspectManager.instance().setDynamicAOPStrategy(strategy);
  -         AspectManager.prune = false; // no prune 
  +         AspectManager.setPrune(false); // no prune 
         }
         inst.addTransformer(new AOPTransformer());
      }
  
  
  
  1.3       +10 -8     jboss-aop/src/jdk15/org/jboss/aop/standalone/StandaloneClassPoolFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StandaloneClassPoolFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-aop/src/jdk15/org/jboss/aop/standalone/StandaloneClassPoolFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- StandaloneClassPoolFactory.java	29 Oct 2005 23:33:42 -0000	1.2
  +++ StandaloneClassPoolFactory.java	13 Jul 2006 18:31:09 -0000	1.3
  @@ -21,25 +21,27 @@
     */
   package org.jboss.aop.standalone;
   
  -import org.jboss.aop.AOPClassPool;
  -import org.jboss.aop.AspectManager;
  +import org.jboss.aop.classpool.AOPClassPoolFactory;
  +
   import javassist.ClassPool;
  +import javassist.scopedpool.ScopedClassPool;
  +import javassist.scopedpool.ScopedClassPoolRepository;
   
   /**
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
  -public class StandaloneClassPoolFactory extends org.jboss.aop.AOPClassPoolFactory
  +public class StandaloneClassPoolFactory extends AOPClassPoolFactory
   {
  -   public AOPClassPool create(ClassLoader cl, ClassPool src, AspectManager manager)
  +   public ScopedClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
      {
  -      return new StandaloneClassPool(cl, src, manager);
  +      return new StandaloneClassPool(cl, src, repository);
      }
   
  -   public AOPClassPool create(ClassPool src, AspectManager manager)
  +   public ScopedClassPool create(ClassPool src, ScopedClassPoolRepository repository)
      {
  -      return new StandaloneClassPool(src, manager);
  +      return new StandaloneClassPool(src, repository);
      }
   }