[jboss-cvs] JBossAS SVN: r92665 - in projects/aop/branches/classpool_JBAOP-742/aop/src: main/java/org/jboss/aop/classpool and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 21 09:13:45 EDT 2009
Author: flavia.rainone at jboss.com
Date: 2009-08-21 09:13:44 -0400 (Fri, 21 Aug 2009)
New Revision: 92665
Modified:
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/ClassLoaderRepository.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/contrib/IDEClassPoolFactory.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/MethodExecutionTransformer.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/TransformerCommon.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPoolFactory.java
projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/stress/weavetest/GenerateClassesScenario.java
Log:
[JBREFLECT-57] Updating dependencies on packages that were rearranged
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -86,7 +86,7 @@
import org.jboss.aop.util.AOPLock;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.classpool.ClassPoolRepository;
+import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.util.collection.WeakValueHashMap;
import org.jboss.util.loading.Translator;
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -29,7 +29,7 @@
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.instrument.InstrumentorFactory;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.classpool.ClassPoolRepository;
+import org.jboss.classpool.spi.ClassPoolRepository;
/**
* Classic weaving.
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -32,8 +32,8 @@
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.instrument.InstrumentorFactory;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.classpool.AbstractClassPool;
-import org.jboss.classpool.ClassPoolRepository;
+import org.jboss.classpool.spi.AbstractClassPool;
+import org.jboss.classpool.spi.ClassPoolRepository;
/**
* Generated advisors need to load all the superclasses
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -39,8 +39,8 @@
import javassist.scopedpool.ScopedClassPool;
import javassist.scopedpool.ScopedClassPoolRepository;
-import org.jboss.classpool.AbstractClassPool;
-import org.jboss.classpool.ClassPoolRepository;
+import org.jboss.classpool.spi.AbstractClassPool;
+import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.logging.Logger;
/**
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -22,12 +22,10 @@
package org.jboss.aop.classpool;
import javassist.ClassPool;
-import javassist.scopedpool.ScopedClassPoolFactory;
import javassist.scopedpool.ScopedClassPoolRepository;
-import org.jboss.classpool.AbstractClassPool;
-import org.jboss.classpool.AbstractClassPoolFactory;
-import org.jboss.classpool.AbstractClassPoolFactoryImpl;
+import org.jboss.classpool.spi.AbstractClassPool;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
/**
* Comment
@@ -36,9 +34,9 @@
* @version $Revision: 55872 $
*
**/
-public class AOPClassPoolFactory implements ScopedClassPoolFactory
+public class AOPClassPoolFactory extends AbstractClassPoolFactory
{
- private static AbstractClassPoolFactory delegateClassPoolFactory = new AbstractClassPoolFactoryImpl();
+ private static AbstractClassPoolFactory delegateClassPoolFactory = new AbstractClassPoolFactory();
public static void setDelegateClassPoolFactory (AbstractClassPoolFactory factory)
{
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/ClassLoaderRepository.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/ClassLoaderRepository.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/ClassLoaderRepository.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -32,7 +32,7 @@
import org.jboss.aop.advice.SecurityActions;
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.classpool.ClassPoolRepositoryCallback;
+import org.jboss.classpool.spi.ClassPoolRepositoryCallback;
/**
* Singleton classpool repository used by aop
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/contrib/IDEClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/contrib/IDEClassPoolFactory.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/contrib/IDEClassPoolFactory.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -36,7 +36,7 @@
import javassist.scopedpool.ScopedClassPoolFactory;
import javassist.scopedpool.ScopedClassPoolRepository;
-import org.jboss.classpool.AbstractClassPool;
+import org.jboss.classpool.spi.AbstractClassPool;
/**
* @author Marshall
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -62,7 +62,7 @@
import org.jboss.aop.util.CtFieldComparator;
import org.jboss.aop.util.JavassistMethodHashing;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.classpool.ClassPoolRepository;
+import org.jboss.classpool.spi.ClassPoolRepository;
/**
* Transforms byte code, making a class advisable. Implements
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/MethodExecutionTransformer.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/MethodExecutionTransformer.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/MethodExecutionTransformer.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -40,7 +40,7 @@
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.util.Advisable;
import org.jboss.aop.util.JavassistMethodHashing;
-import org.jboss.classpool.AbstractClassPool;
+import org.jboss.classpool.spi.AbstractClassPool;
/**
* Comment
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/TransformerCommon.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/TransformerCommon.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/TransformerCommon.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -41,7 +41,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.standalone.Compiler;
-import org.jboss.classpool.AbstractClassPool;
+import org.jboss.classpool.spi.AbstractClassPool;
/**
* A few handy methods and common things used by the other Transformers
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -27,7 +27,7 @@
import javassist.NotFoundException;
import javassist.scopedpool.ScopedClassPoolRepository;
-import org.jboss.classpool.AbstractClassPool;
+import org.jboss.classpool.spi.AbstractClassPool;
/**
* Comment
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPoolFactory.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPoolFactory.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -24,7 +24,7 @@
import javassist.ClassPool;
import javassist.scopedpool.ScopedClassPoolRepository;
-import org.jboss.classpool.AbstractClassPoolFactory;
+import org.jboss.classpool.spi.AbstractClassPoolFactory;
/**
* Comment
@@ -32,7 +32,7 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision: 46253 $
*/
-public class StandaloneClassPoolFactory implements AbstractClassPoolFactory
+public class StandaloneClassPoolFactory extends AbstractClassPoolFactory
{
public StandaloneClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
{
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/stress/weavetest/GenerateClassesScenario.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/stress/weavetest/GenerateClassesScenario.java 2009-08-21 13:05:43 UTC (rev 92664)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/stress/weavetest/GenerateClassesScenario.java 2009-08-21 13:13:44 UTC (rev 92665)
@@ -34,7 +34,7 @@
import javassist.CtNewMethod;
import javassist.Modifier;
-import org.jboss.classpool.ClassPoolRepository;
+import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.test.aop.stress.AbstractScenario;
import org.jboss.test.aop.stress.SkipWarmup;
More information about the jboss-cvs-commits
mailing list