[jboss-cvs] JBossAS SVN: r101116 - in projects/aop/trunk/aop/src/main/java/org/jboss/aop: advice and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 18 10:17:07 EST 2010
Author: stalep
Date: 2010-02-18 10:17:05 -0500 (Thu, 18 Feb 2010)
New Revision: 101116
Removed:
projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/logging/
Modified:
projects/aop/trunk/aop/src/main/java/org/jboss/aop/Advisor.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/AdvisorFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectAnnotationLoader.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectXmlLoader.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/ClassAdvisor.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/Deployment.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/GeneratedClassAdvisor.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/MethodMatchInfo.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AdviceBinding.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/GenericAspectFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/PrecedenceSorter.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolRepository.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/CallerTransformer.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/ConstructorExecutionTransformer.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinPointGenerator.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointFullClassifier.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointSimpleClassifier.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/introduction/AnnotationIntroduction.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MatcherStrategy.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerProxyFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/ReflectToJavassist.java
Log:
[JBAOP-770]
Remove AOPLogger and use org.jboss.logging.Logger
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/Advisor.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/Advisor.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -75,7 +75,7 @@
import org.jboss.aop.util.JoinPointComparator;
import org.jboss.aop.util.ReflectUtils;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.signature.ConstructorSignature;
import org.jboss.metadata.spi.signature.FieldSignature;
@@ -221,7 +221,7 @@
*/
protected static final Object NULL_ASPECT = new Object();
- protected final AOPLogger logger = AOPLogger.getLogger(this.getClass());
+ protected final Logger logger = Logger.getLogger(this.getClass());
//When resolving annotations from the annotation repository we don't want to hit the annotation repository with the metadata from base-aspects.xml (@security, @transaction etc.)
//EJB 3 uses a custom metadata loader that tries to load up all these classes by name, and that will cause errors when loading up the annotations
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AdvisorFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AdvisorFactory.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AdvisorFactory.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -31,7 +31,7 @@
import org.jboss.aop.instrument.GeneratedAdvisorInstrumentor;
import org.jboss.aop.instrument.InstrumentorEnum;
import org.jboss.aop.instrument.InstrumentorFactory;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
*
@@ -41,7 +41,7 @@
*/
public class AdvisorFactory
{
- private static final AOPLogger logger = AOPLogger.getLogger(AdvisorFactory.class);
+ private static final Logger logger = Logger.getLogger(AdvisorFactory.class);
protected static final int CLASS = 1;
protected static final int OTHER_ADVISOR = 1000; //The jrockit aop advisor is in another jar which we should not depend on
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectAnnotationLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectAnnotationLoader.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectAnnotationLoader.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -52,7 +52,7 @@
import org.jboss.aop.pointcut.ast.ASTCFlowExpression;
import org.jboss.aop.pointcut.ast.PointcutExpressionParser;
import org.jboss.aop.util.MethodHashing;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -63,7 +63,7 @@
public class AspectAnnotationLoader
{
- private static final AOPLogger logger = AOPLogger.getLogger(AspectAnnotationLoader.class);
+ private static final Logger logger = Logger.getLogger(AspectAnnotationLoader.class);
protected AspectManager manager;
private ClassLoader cl;
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -85,7 +85,7 @@
import org.jboss.aop.util.AOPLock;
import org.jboss.aop.util.ReflectUtils;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.jboss.util.collection.WeakValueHashMap;
import org.jboss.util.loading.Translator;
@@ -107,7 +107,7 @@
public class AspectManager
implements Translator
{
- private static final AOPLogger logger = AOPLogger.getLogger(AspectManager.class);
+ private static final Logger logger = Logger.getLogger(AspectManager.class);
/** Indicates that a call to the factory has been made, but it returned null. */
private static final Object NULL_ASPECT = new Object();
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectXmlLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectXmlLoader.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectXmlLoader.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -70,7 +70,7 @@
import org.jboss.aop.pointcut.ast.PointcutExpressionParser;
import org.jboss.aop.pointcut.ast.TypeExpressionParser;
import org.jboss.aop.util.XmlHelper;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.jboss.util.xml.XmlLoadable;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -86,7 +86,7 @@
*/
public class AspectXmlLoader implements XmlLoader
{
- private static final AOPLogger logger = AOPLogger.getLogger(AspectXmlLoader.class);
+ private static final Logger logger = Logger.getLogger(AspectXmlLoader.class);
// Attributes ---------------------------------------------------
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/ClassAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/ClassAdvisor.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/ClassAdvisor.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -72,7 +72,7 @@
import org.jboss.aop.util.MethodHashing;
import org.jboss.aop.util.ReflectUtils;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
/**
@@ -89,7 +89,7 @@
*/
public class ClassAdvisor extends Advisor
{
- private static final AOPLogger logger = AOPLogger.getLogger(ClassAdvisor.class);
+ private static final Logger logger = Logger.getLogger(ClassAdvisor.class);
/**
* Suffix added to unadvised methods.
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -24,7 +24,7 @@
import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.instrument.InstrumentorFactory;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import javassist.ByteArrayClassPath;
import javassist.CtClass;
@@ -39,7 +39,7 @@
*/
public class ClassicWeavingStrategy extends WeavingStrategySupport
{
- private static final AOPLogger logger = AOPLogger.getLogger(ClassicWeavingStrategy.class);
+ private static final Logger logger = Logger.getLogger(ClassicWeavingStrategy.class);
private boolean verbose = AspectManager.verbose;
/**
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/Deployment.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/Deployment.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/Deployment.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -21,7 +21,7 @@
*/
package org.jboss.aop;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.jboss.util.file.ArchiveBrowser;
import org.jboss.util.file.ClassFileFilter;
@@ -41,7 +41,7 @@
*/
public class Deployment
{
- private static final AOPLogger logger = AOPLogger.getLogger(Deployment.class);
+ private static final Logger logger = Logger.getLogger(Deployment.class);
public static boolean searchClasspath = true;
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/GeneratedClassAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/GeneratedClassAdvisor.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/GeneratedClassAdvisor.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -54,7 +54,7 @@
import org.jboss.aop.joinpoint.MethodJoinpoint;
import org.jboss.aop.pointcut.PointcutMethodMatch;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -71,7 +71,7 @@
public static final String ADD_FIELD_WRITE_INFO = "addFieldWriteInfo";
public static final String GET_PARENT_ADVISOR = "getParentAdvisor";
- private static final AOPLogger logger = AOPLogger.getLogger(GeneratedClassAdvisor.class);
+ private static final Logger logger = Logger.getLogger(GeneratedClassAdvisor.class);
// TODO Flavia
// ArrayList<ConstructorInfo> constructorInfos = new ArrayList();
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/MethodMatchInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/MethodMatchInfo.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/MethodMatchInfo.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -26,7 +26,7 @@
import org.jboss.aop.advice.AdviceBinding;
import org.jboss.aop.joinpoint.MethodJoinpoint;
import org.jboss.aop.pointcut.PointcutMethodMatch;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
*
@@ -35,7 +35,7 @@
*/
class MethodMatchInfo
{
- private static final AOPLogger logger = AOPLogger.getLogger(MethodMatchInfo.class);
+ private static final Logger logger = Logger.getLogger(MethodMatchInfo.class);
Advisor advisor;
MethodInfo info;
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -25,7 +25,7 @@
import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.instrument.InstrumentorFactory;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import javassist.ByteArrayClassPath;
import javassist.ClassPool;
@@ -42,7 +42,7 @@
*/
public class SuperClassesFirstWeavingStrategy extends WeavingStrategySupport {
- private static final AOPLogger logger = AOPLogger.getLogger(SuperClassesFirstWeavingStrategy.class);
+ private static final Logger logger = Logger.getLogger(SuperClassesFirstWeavingStrategy.class);
private boolean verbose = AspectManager.verbose;
public static final String AOP_PACKAGE = Advised.class.getPackage().getName();
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AdviceBinding.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AdviceBinding.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AdviceBinding.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -37,7 +37,7 @@
import org.jboss.aop.pointcut.ast.ParseException;
import org.jboss.aop.pointcut.ast.PointcutExpressionParser;
import org.jboss.aop.util.ReflectUtils;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Binds a pointcut expression to one ore more advices/interceptors.
@@ -49,7 +49,7 @@
*/
public class AdviceBinding
{
- private static final AOPLogger logger = AOPLogger.getLogger(AdviceBinding.class);
+ private static final Logger logger = Logger.getLogger(AdviceBinding.class);
private static volatile long counter = 0;
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -24,7 +24,7 @@
import java.lang.ref.WeakReference;
import org.jboss.aop.AspectManager;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Helper class to be able to set the classloader needed for loading up the aspects in the aspectfactories
@@ -33,7 +33,7 @@
*/
public abstract class AspectFactoryWithClassLoaderSupport implements AspectFactory, AspectFactoryWithClassLoader
{
- private static final AOPLogger logger = AOPLogger.getLogger(AspectFactoryWithClassLoaderSupport.class);
+ private static final Logger logger = Logger.getLogger(AspectFactoryWithClassLoaderSupport.class);
private WeakReference<ClassLoader> loader;
/** If a scoped classloader with no parent delegation redefines the class, we need to make sure that that class is pushed on the stack */
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -33,7 +33,7 @@
import org.jboss.aop.util.BindingClassifier;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
import org.jboss.aop.util.UnmodifiableLinkedHashMap;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Manages the binding, pointcut and pointcutInfo collections contained in a domain. All entries
@@ -46,7 +46,7 @@
*/
public class ClassifiedBindingAndPointcutCollection
{
- private static final AOPLogger logger = AOPLogger.getLogger(AspectManager.class);
+ private static final Logger logger = Logger.getLogger(AspectManager.class);
//private ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -49,7 +49,7 @@
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aop.joinpoint.MethodJoinpoint;
import org.jboss.aop.pointcut.ast.ASTCFlowExpression;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Special interceptor wrapping the interceptor factory, so that generated advisors have
@@ -65,7 +65,7 @@
*/
public class GeneratedAdvisorInterceptor implements Interceptor
{
- private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAdvisorInterceptor.class);
+ private static final Logger logger = Logger.getLogger(GeneratedAdvisorInterceptor.class);
// important to indicate that the factory has already been called, but a null
// interceptor was returned
private static final Interceptor EMPTY_INTERCEPTOR = new Interceptor()
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/GenericAspectFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/GenericAspectFactory.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/GenericAspectFactory.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -33,7 +33,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.InstanceAdvisor;
import org.jboss.aop.joinpoint.Joinpoint;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -46,7 +46,7 @@
*/
public class GenericAspectFactory extends AspectFactoryWithClassLoaderSupport
{
- private static final AOPLogger logger = AOPLogger.getLogger(GenericAspectFactory.class);
+ private static final Logger logger = Logger.getLogger(GenericAspectFactory.class);
final static Class<?>[] ADVISOR_INJECTOR_SIGNATURE = new Class[]{Advisor.class};
final static Class<?>[] INSTANCE_ADVISOR_INJECTOR_SIGNATURE = new Class[]{InstanceAdvisor.class};
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/PrecedenceSorter.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/PrecedenceSorter.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/PrecedenceSorter.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -30,7 +30,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.pointcut.ast.ASTCFlowExpression;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
*
@@ -39,7 +39,7 @@
*/
public class PrecedenceSorter
{
- private static final AOPLogger logger = AOPLogger.getLogger(PrecedenceSorter.class);
+ private static final Logger logger = Logger.getLogger(PrecedenceSorter.class);
static Comparator<InterceptorEntry> interceptorComparator = new Comparator<InterceptorEntry>()
{
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolRepository.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolRepository.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolRepository.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -38,7 +38,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.SecurityActions;
import org.jboss.aop.instrument.Instrumentor;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Singleton classpool repository used by aop
@@ -48,7 +48,7 @@
*/
public class AOPClassPoolRepository implements ScopedClassPoolRepository
{
- private static final AOPLogger logger = AOPLogger.getLogger(AOPClassPoolRepository.class);
+ private static final Logger logger = Logger.getLogger(AOPClassPoolRepository.class);
private final static AOPClassPoolRepository instance = new AOPClassPoolRepository();
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/CallerTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/CallerTransformer.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/CallerTransformer.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -30,7 +30,7 @@
import org.jboss.aop.pointcut.Pointcut;
import org.jboss.aop.util.Advisable;
import org.jboss.aop.util.JavassistMethodHashing;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import javassist.CannotCompileException;
import javassist.CtBehavior;
@@ -51,7 +51,7 @@
public abstract class CallerTransformer
{
- private static final AOPLogger logger = AOPLogger.getLogger(CallerTransformer.class);
+ private static final Logger logger = Logger.getLogger(CallerTransformer.class);
public static final String CON_BY_CON_INFO_CLASS_NAME = org.jboss.aop.ConByConInfo.class.getName();
public static final String CON_BY_METHOD_INFO_CLASS_NAME = org.jboss.aop.ConByMethodInfo.class.getName();
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/ConstructorExecutionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/ConstructorExecutionTransformer.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/ConstructorExecutionTransformer.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -39,7 +39,7 @@
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.pointcut.Pointcut;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -49,7 +49,7 @@
*/
public abstract class ConstructorExecutionTransformer implements CodeConversionObserver
{
- private static final AOPLogger logger = AOPLogger.getLogger(ConstructorExecutionTransformer.class);
+ private static final Logger logger = Logger.getLogger(ConstructorExecutionTransformer.class);
protected static final String CONSTRUCTOR_INFO_CLASS_NAME = "org.jboss.aop.ConstructorInfo";
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -32,7 +32,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Used with the GeneratedClassAdvisor
@@ -42,7 +42,7 @@
*/
public class GeneratedAdvisorCallerTransformer extends CallerTransformer
{
- private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAdvisorCallerTransformer.class);
+ private static final Logger logger = Logger.getLogger(GeneratedAdvisorCallerTransformer.class);
public GeneratedAdvisorCallerTransformer(Instrumentor instrumentor, AspectManager manager)
{
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -31,7 +31,7 @@
import javassist.NotFoundException;
import org.jboss.aop.util.JavassistMethodHashing;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -42,7 +42,7 @@
public class GeneratedAdvisorConstructorExecutionTransformer extends
ConstructorExecutionTransformer
{
- private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAdvisorConstructorExecutionTransformer.class);
+ private static final Logger logger = Logger.getLogger(GeneratedAdvisorConstructorExecutionTransformer.class);
public GeneratedAdvisorConstructorExecutionTransformer(Instrumentor instrumentor)
{
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -42,7 +42,7 @@
import org.jboss.aop.MethodByMethodInfo;
import org.jboss.aop.MethodInfo;
import org.jboss.aop.classpool.AOPClassPool;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -52,7 +52,7 @@
*/
public class GeneratedAdvisorInstrumentor extends Instrumentor
{
- private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAdvisorInstrumentor.class);
+ private static final Logger logger = Logger.getLogger(GeneratedAdvisorInstrumentor.class);
//field names in advised class
private static final String CURRENT_ADVISOR = "currentAdvisor$aop";
private static final String INSTANCE_ADVISOR = "instanceAdvisor$aop";
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -62,7 +62,7 @@
import org.jboss.aop.util.CtConstructorComparator;
import org.jboss.aop.util.CtFieldComparator;
import org.jboss.aop.util.JavassistMethodHashing;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Transforms byte code, making a class advisable. Implements
@@ -84,7 +84,7 @@
*/
public abstract class Instrumentor
{
- private static final AOPLogger logger = AOPLogger.getLogger(Instrumentor.class);
+ private static final Logger logger = Logger.getLogger(Instrumentor.class);
/**
* Package of AOP classes.
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -25,7 +25,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.classpool.AOPClassPool;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -35,7 +35,7 @@
*/
public class InstrumentorFactory
{
- private static final AOPLogger logger = AOPLogger.getLogger(InstrumentorFactory.class);
+ private static final Logger logger = Logger.getLogger(InstrumentorFactory.class);
static InstrumentorEnum instrumentor;
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinPointGenerator.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinPointGenerator.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -65,7 +65,7 @@
import org.jboss.aop.util.GetDeclaringClassUtil;
import org.jboss.aop.util.JavassistUtils;
import org.jboss.aop.util.ReflectToJavassist;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Creates the Joinpoint invocation replacement classes used with Generated advisors
@@ -76,7 +76,7 @@
*/
public abstract class JoinPointGenerator
{
- private static final AOPLogger logger = AOPLogger.getLogger(JoinPointGenerator.class);
+ private static final Logger logger = Logger.getLogger(JoinPointGenerator.class);
public static final String INFO_FIELD = "info";
public static final String INITIALISED_LIGHTWEIGHT_INSTANCE_ASPECTS = "initialisedLightweightInstanceAspects";
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointFullClassifier.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointFullClassifier.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointFullClassifier.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -30,7 +30,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.pointcut.Pointcut;
import org.jboss.aop.pointcut.PointcutInfo;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* This class fully classifies joinpoints as <code>JoinpointClassification.PREPARED</code>
@@ -43,7 +43,7 @@
*/
public class JoinpointFullClassifier extends JoinpointClassifier
{
- private static final AOPLogger logger = AOPLogger.getLogger(JoinpointSimpleClassifier.class);
+ private static final Logger logger = Logger.getLogger(JoinpointSimpleClassifier.class);
/**
* Classifies the execution of a joinpoint. The joinpoint being classified
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointSimpleClassifier.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointSimpleClassifier.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/JoinpointSimpleClassifier.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -29,7 +29,7 @@
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.pointcut.Pointcut;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* This joinpoint classifier is anaware of differences between <code>
@@ -46,7 +46,7 @@
*/
public class JoinpointSimpleClassifier extends JoinpointClassifier
{
- private static final AOPLogger logger = AOPLogger.getLogger(JoinpointSimpleClassifier.class);
+ private static final Logger logger = Logger.getLogger(JoinpointSimpleClassifier.class);
/**
* Classifies the execution of a joinpoint. The joinpoint being classified
* is identified by <code>matcher</code>.
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -32,7 +32,7 @@
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aop.util.JavassistToReflect;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -42,7 +42,7 @@
*/
public abstract class OptimizedBehaviourInvocations extends OptimizedInvocations
{
- private static final AOPLogger logger = AOPLogger.getLogger(OptimizedBehaviourInvocations.class);
+ private static final Logger logger = Logger.getLogger(OptimizedBehaviourInvocations.class);
/**
* Name of method that enforces consistency between the values contained in typed
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -32,7 +32,7 @@
import javassist.NotFoundException;
import org.jboss.aop.classpool.AOPClassPool;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -42,7 +42,7 @@
*/
public class OptimizedCallerInvocations extends OptimizedBehaviourInvocations
{
- private static final AOPLogger logger = AOPLogger.getLogger(OptimizedBehaviourInvocations.class);
+ private static final Logger logger = Logger.getLogger(OptimizedBehaviourInvocations.class);
protected static String createOptimizedMethodCalledByConInvocationClass(
Instrumentor instrumentor,
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/introduction/AnnotationIntroduction.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/introduction/AnnotationIntroduction.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/introduction/AnnotationIntroduction.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -33,7 +33,7 @@
import org.jboss.aop.pointcut.AnnotationMatcher;
import org.jboss.aop.pointcut.ast.ASTStart;
import org.jboss.aop.pointcut.ast.TypeExpressionParser;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.jboss.util.StringPropertyReplacer;
import java.io.StringReader;
@@ -49,7 +49,7 @@
*/
public class AnnotationIntroduction
{
- final static AOPLogger logger = AOPLogger.getLogger(AnnotationIntroduction.class);
+ final static Logger logger = Logger.getLogger(AnnotationIntroduction.class);
public static AnnotationIntroduction createMethodAnnotationIntroduction(String methodExpr, String annotationExpr, boolean invisible)
{
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MatcherStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MatcherStrategy.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/pointcut/MatcherStrategy.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -29,7 +29,7 @@
import org.jboss.aop.annotation.AnnotationElement;
import org.jboss.aop.pointcut.ast.ClassExpression;
import org.jboss.aop.proxy.container.ClassProxyContainer;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Strategy to allow for different handling for the pointcut matchers for different types of advisor
@@ -39,7 +39,7 @@
*/
public abstract class MatcherStrategy
{
- private static final AOPLogger logger = AOPLogger.getLogger(MatcherStrategy.class);
+ private static final Logger logger = Logger.getLogger(MatcherStrategy.class);
private final static MatcherStrategy ADVISOR_MATCHER_STRATEGY = new AdvisorMatcherStrategy();
private final static MatcherStrategy PROXY_MATCHER_STRATEGY = new ProxyMatcherStrategy();
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerProxyFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerProxyFactory.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/ContainerProxyFactory.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -62,7 +62,7 @@
import org.jboss.aop.introduction.InterfaceIntroduction;
import org.jboss.aop.proxy.ClassProxyFactory;
import org.jboss.aop.util.JavassistMethodHashing;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
@@ -71,7 +71,7 @@
*/
public class ContainerProxyFactory
{
- final static AOPLogger logger = AOPLogger.getLogger(ContainerProxyFactory.class);
+ final static Logger logger = Logger.getLogger(ContainerProxyFactory.class);
final static String DELEGATE = Delegate.class.getName();
final static String ASPECT_MANAGED = AspectManaged.class.getName();
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -26,7 +26,7 @@
import org.jboss.aop.Advised;
import org.jboss.aop.AspectManager;
import org.jboss.aop.instrument.Untransformable;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
*
@@ -35,7 +35,7 @@
*/
public class GeneratedAOPProxyFactory implements AOPProxyFactory
{
- private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAOPProxyFactory.class);
+ private static final Logger logger = Logger.getLogger(GeneratedAOPProxyFactory.class);
/**
* Create a proxy
*
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/ReflectToJavassist.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/ReflectToJavassist.java 2010-02-18 15:02:37 UTC (rev 101115)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/util/ReflectToJavassist.java 2010-02-18 15:17:05 UTC (rev 101116)
@@ -29,7 +29,7 @@
import javassist.NotFoundException;
import org.jboss.aop.AspectManager;
-import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -44,7 +44,7 @@
**/
public class ReflectToJavassist
{
- private static final AOPLogger logger = AOPLogger.getLogger(ReflectToJavassist.class);
+ private static final Logger logger = Logger.getLogger(ReflectToJavassist.class);
public static CtClass classToJavassist(Class<?> clazz) throws NotFoundException
{
More information about the jboss-cvs-commits
mailing list