[jboss-cvs] jboss-aop/src/main/org/jboss/aop/instrument ...
Kabir Khan
kkhan at jboss.com
Thu Jul 13 14:31:08 EDT 2006
User: kkhan
Date: 06/07/13 14:31:08
Modified: src/main/org/jboss/aop/instrument
ClassicInstrumentor.java
FieldAccessTransformer.java
MethodExecutionTransformer.java
OptimizedFieldInvocations.java
GeneratedAdvisorInstrumentor.java
OptimizedConstructorInvocations.java
Instrumentor.java TransformerCommon.java
OptimizedConstructionInvocations.java
InstrumentorFactory.java
OptimizedCallerInvocations.java
OptimizedMethodInvocations.java
OptimizedInvocations.java
Log:
Refactor to wrap arouind ScopedClassPoolRepository and ScopedClassPool which has been moved to javassist
Revision Changes Path
1.11 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/ClassicInstrumentor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClassicInstrumentor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/ClassicInstrumentor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ClassicInstrumentor.java 28 Jun 2006 12:32:25 -0000 1.10
+++ ClassicInstrumentor.java 13 Jul 2006 18:31:08 -0000 1.11
@@ -30,9 +30,9 @@
import javassist.NotFoundException;
import javassist.bytecode.AccessFlag;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
1.31 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/FieldAccessTransformer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FieldAccessTransformer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/FieldAccessTransformer.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- FieldAccessTransformer.java 28 Jun 2006 12:32:25 -0000 1.30
+++ FieldAccessTransformer.java 13 Jul 2006 18:31:08 -0000 1.31
@@ -24,9 +24,9 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.Advisable;
import javassist.CannotCompileException;
1.42 +2 -2 jboss-aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MethodExecutionTransformer.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- MethodExecutionTransformer.java 26 Apr 2006 14:04:20 -0000 1.41
+++ MethodExecutionTransformer.java 13 Jul 2006 18:31:08 -0000 1.42
@@ -25,8 +25,8 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.JavassistMethodHashing;
import javassist.CannotCompileException;
@@ -41,7 +41,7 @@
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.41 $
+ * @version $Revision: 1.42 $
*/
public abstract class MethodExecutionTransformer
{
1.5 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/OptimizedFieldInvocations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimizedFieldInvocations.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/OptimizedFieldInvocations.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- OptimizedFieldInvocations.java 5 Jul 2006 12:18:02 -0000 1.4
+++ OptimizedFieldInvocations.java 13 Jul 2006 18:31:08 -0000 1.5
@@ -21,7 +21,7 @@
*/
package org.jboss.aop.instrument;
-import org.jboss.aop.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.JavassistToReflect;
import javassist.CannotCompileException;
1.36 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: GeneratedAdvisorInstrumentor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- GeneratedAdvisorInstrumentor.java 7 Jul 2006 13:50:39 -0000 1.35
+++ GeneratedAdvisorInstrumentor.java 13 Jul 2006 18:31:08 -0000 1.36
@@ -31,7 +31,6 @@
import javassist.Modifier;
import javassist.NotFoundException;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.ConByMethodInfo;
@@ -40,6 +39,7 @@
import org.jboss.aop.JoinPointInfo;
import org.jboss.aop.MethodByMethodInfo;
import org.jboss.aop.MethodInfo;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.JavassistToReflect;
/**
1.9 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/OptimizedConstructorInvocations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimizedConstructorInvocations.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/OptimizedConstructorInvocations.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- OptimizedConstructorInvocations.java 5 Jul 2006 12:18:02 -0000 1.8
+++ OptimizedConstructorInvocations.java 13 Jul 2006 18:31:08 -0000 1.9
@@ -26,7 +26,7 @@
import java.net.URI;
import java.net.URL;
-import org.jboss.aop.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.standalone.Compiler;
import javassist.CannotCompileException;
1.55 +4 -3 jboss-aop/src/main/org/jboss/aop/instrument/Instrumentor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Instrumentor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/Instrumentor.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- Instrumentor.java 24 Jun 2006 13:51:21 -0000 1.54
+++ Instrumentor.java 13 Jul 2006 18:31:08 -0000 1.55
@@ -29,12 +29,13 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.Advised;
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.annotation.compiler.AnnotationInfoCreator;
+import org.jboss.aop.classpool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPoolRepository;
import org.jboss.aop.introduction.AnnotationIntroduction;
import org.jboss.aop.introduction.InterfaceIntroduction;
import org.jboss.aop.util.Advisable;
@@ -72,7 +73,7 @@
* @author <a href="mailto:gte863h at prism.gatech.edu">Austin Chau</a>
* @author <a href="mailto:crazybob at crazybob.org">Bob Lee</a>
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
- * @version $Revision: 1.54 $
+ * @version $Revision: 1.55 $
*/
public abstract class Instrumentor
{
@@ -528,7 +529,7 @@
String ref = null;
try
{
- AOPClassPool pool = AOPClassPool.createAOPClassPool(clazz.getClassPool(), manager);
+ AOPClassPool pool = AOPClassPool.createAOPClassPool(clazz.getClassPool(), AOPClassPoolRepository.getInstance());
Iterator it = clazz.getRefClasses().iterator();
while (it.hasNext())
1.16 +2 -2 jboss-aop/src/main/org/jboss/aop/instrument/TransformerCommon.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TransformerCommon.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/TransformerCommon.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- TransformerCommon.java 7 Jul 2006 10:17:41 -0000 1.15
+++ TransformerCommon.java 13 Jul 2006 18:31:08 -0000 1.16
@@ -31,8 +31,8 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.AspectManager;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.standalone.Compiler;
import javassist.CannotCompileException;
@@ -44,7 +44,7 @@
/**
* A few handy methods and common things used by the other Transformers
* @author <a href="mailto:kabirkhan at bigfoot.com">Kabir Khan</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*
*/
public class TransformerCommon {
1.7 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/OptimizedConstructionInvocations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimizedConstructionInvocations.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/OptimizedConstructionInvocations.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- OptimizedConstructionInvocations.java 5 Jul 2006 12:18:02 -0000 1.6
+++ OptimizedConstructionInvocations.java 13 Jul 2006 18:31:08 -0000 1.7
@@ -22,7 +22,7 @@
package org.jboss.aop.instrument;
-import org.jboss.aop.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import javassist.ClassPool;
import javassist.CtClass;
1.8 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/InstrumentorFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InstrumentorFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/InstrumentorFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- InstrumentorFactory.java 24 Jun 2006 13:51:21 -0000 1.7
+++ InstrumentorFactory.java 13 Jul 2006 18:31:08 -0000 1.8
@@ -23,8 +23,8 @@
import java.lang.reflect.Constructor;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.AspectManager;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
1.8 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/OptimizedCallerInvocations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimizedCallerInvocations.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/OptimizedCallerInvocations.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- OptimizedCallerInvocations.java 5 Jul 2006 12:18:02 -0000 1.7
+++ OptimizedCallerInvocations.java 13 Jul 2006 18:31:08 -0000 1.8
@@ -31,7 +31,7 @@
import javassist.Modifier;
import javassist.NotFoundException;
-import org.jboss.aop.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
1.10 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/OptimizedMethodInvocations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimizedMethodInvocations.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/OptimizedMethodInvocations.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- OptimizedMethodInvocations.java 5 Jul 2006 12:18:02 -0000 1.9
+++ OptimizedMethodInvocations.java 13 Jul 2006 18:31:08 -0000 1.10
@@ -32,8 +32,8 @@
import javassist.Modifier;
import javassist.NotFoundException;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.ClassAdvisor;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
1.6 +1 -1 jboss-aop/src/main/org/jboss/aop/instrument/OptimizedInvocations.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: OptimizedInvocations.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aop/src/main/org/jboss/aop/instrument/OptimizedInvocations.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- OptimizedInvocations.java 5 Jul 2006 12:18:02 -0000 1.5
+++ OptimizedInvocations.java 13 Jul 2006 18:31:08 -0000 1.6
@@ -28,7 +28,7 @@
import javassist.CtNewConstructor;
import javassist.NotFoundException;
-import org.jboss.aop.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
More information about the jboss-cvs-commits
mailing list