[jboss-cvs] JBossAS SVN: r77480 - in projects/aop/trunk/aop/src/main/org/jboss/aop: advice and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 26 07:13:45 EDT 2008
Author: stalep
Date: 2008-08-26 07:13:44 -0400 (Tue, 26 Aug 2008)
New Revision: 77480
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/AdvisorFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java
projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java
projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java
projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceBinding.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/ClassifiedBindingCollection.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/CallerTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorExecutionTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/InstrumentorFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointSimpleClassifier.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedCallerInvocations.java
projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java
projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/AOPLogger.java
Log:
[JBAOP-623] changed AOPLogger to be a standalone logger.
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AdvisorFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AdvisorFactory.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AdvisorFactory.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -32,7 +32,6 @@
import org.jboss.aop.instrument.InstrumentorEnum;
import org.jboss.aop.instrument.InstrumentorFactory;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
*
@@ -42,7 +41,7 @@
*/
public class AdvisorFactory
{
- private static final Logger logger = AOPLogger.getLogger(AdvisorFactory.class);
+ private static final AOPLogger logger = AOPLogger.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/org/jboss/aop/AspectAnnotationLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -53,7 +53,6 @@
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
@@ -64,7 +63,7 @@
public class AspectAnnotationLoader
{
- private static final Logger logger = AOPLogger.getLogger(AspectAnnotationLoader.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(AspectAnnotationLoader.class);
protected AspectManager manager;
private ClassLoader cl;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -82,7 +82,6 @@
import org.jboss.aop.pointcut.ast.ClassExpression;
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;
@@ -104,7 +103,7 @@
public class AspectManager
implements Translator
{
- private static final Logger logger = AOPLogger.getLogger(AspectManager.class);
+ private static final AOPLogger logger = AOPLogger.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/org/jboss/aop/AspectXmlLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -70,7 +70,6 @@
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 +85,7 @@
*/
public class AspectXmlLoader implements XmlLoader
{
- private static final Logger logger = AOPLogger.getLogger(AspectXmlLoader.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(AspectXmlLoader.class);
// Attributes ---------------------------------------------------
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -71,7 +71,6 @@
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;
/**
@@ -88,7 +87,7 @@
*/
public class ClassAdvisor extends Advisor
{
- private static final Logger logger = AOPLogger.getLogger(ClassAdvisor.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(ClassAdvisor.class);
/**
* Suffix added to unadvised methods.
@@ -2893,4 +2892,4 @@
conCalledByMethodInterceptors.clear();
}
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -40,7 +40,6 @@
import org.jboss.aop.util.FieldComparator;
import org.jboss.aop.util.MethodHashing;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
* Comment
@@ -50,7 +49,7 @@
*/
public class ClassContainer extends Advisor
{
- private static final Logger logger = AOPLogger.getLogger(ClassContainer.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(ClassContainer.class);
private boolean chainOverridingForInheritedMethods;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -25,7 +25,6 @@
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;
@@ -40,7 +39,7 @@
*/
public class ClassicWeavingStrategy extends WeavingStrategySupport
{
- private static final Logger logger = AOPLogger.getLogger(ClassicWeavingStrategy.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(ClassicWeavingStrategy.class);
private boolean verbose = AspectManager.verbose;
/**
@@ -144,4 +143,4 @@
clearReEntry();
}
}
- }
\ No newline at end of file
+ }
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -22,7 +22,6 @@
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;
@@ -42,7 +41,7 @@
*/
public class Deployment
{
- private static final Logger logger = AOPLogger.getLogger(Deployment.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(Deployment.class);
public static boolean searchClasspath = true;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -27,7 +27,6 @@
import org.jboss.aop.joinpoint.MethodJoinpoint;
import org.jboss.aop.pointcut.PointcutMethodMatch;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
*
@@ -36,7 +35,7 @@
*/
class MethodMatchInfo
{
- private static final Logger logger = AOPLogger.getLogger(MethodMatchInfo.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(MethodMatchInfo.class);
Advisor advisor;
MethodInfo info;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -26,7 +26,6 @@
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;
@@ -43,7 +42,7 @@
*/
public class SuperClassesFirstWeavingStrategy extends WeavingStrategySupport {
- private static final Logger logger = AOPLogger.getLogger(SuperClassesFirstWeavingStrategy.class);
+ private static final AOPLogger logger = AOPLogger.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/org/jboss/aop/advice/AdviceBinding.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceBinding.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceBinding.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -37,7 +37,6 @@
import org.jboss.aop.pointcut.ast.ParseException;
import org.jboss.aop.pointcut.ast.PointcutExpressionParser;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
* Binds a pointcut expression to one ore more advices/interceptors.
@@ -49,7 +48,7 @@
*/
public class AdviceBinding
{
- private static final Logger logger = AOPLogger.getLogger(AdviceBinding.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(AdviceBinding.class);
private static volatile long counter = 0;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -25,7 +25,6 @@
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
@@ -34,7 +33,7 @@
*/
public abstract class AspectFactoryWithClassLoaderSupport implements AspectFactory, AspectFactoryWithClassLoader
{
- private static final Logger logger = AOPLogger.getLogger(AspectFactoryWithClassLoaderSupport.class);
+ private static final AOPLogger logger = AOPLogger.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/org/jboss/aop/advice/ClassifiedBindingCollection.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/ClassifiedBindingCollection.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/ClassifiedBindingCollection.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -30,7 +30,6 @@
import org.jboss.aop.util.BindingClassifier;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
* Manages the binding collection contained in a domain. All bindings
@@ -42,7 +41,7 @@
*/
public class ClassifiedBindingCollection
{
- private static final Logger logger = AOPLogger.getLogger(AspectManager.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(AspectManager.class);
private volatile LinkedHashMap<String, AdviceBinding> bindings;
private volatile Collection<AdviceBinding> fieldReadBindings;
@@ -286,4 +285,4 @@
this.constructorCallBindings = new LinkedHashSet<AdviceBinding>(0);
this.methodCallBindings = new LinkedHashSet<AdviceBinding>(0);
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -50,7 +50,6 @@
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
@@ -66,7 +65,7 @@
*/
public class GeneratedAdvisorInterceptor implements Interceptor
{
- private static final Logger logger = AOPLogger.getLogger(GeneratedAdvisorInterceptor.class);
+ private static final AOPLogger logger = AOPLogger.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()
@@ -566,4 +565,4 @@
return invocation.invokeNext();
}
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -33,7 +33,6 @@
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 +45,7 @@
*/
public class GenericAspectFactory extends AspectFactoryWithClassLoaderSupport
{
- private static final Logger logger = AOPLogger.getLogger(GenericAspectFactory.class);
+ private static final AOPLogger logger = AOPLogger.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/org/jboss/aop/classpool/AOPClassPoolRepository.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -34,7 +34,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
import javassist.ClassPool;
import javassist.scopedpool.ScopedClassPool;
@@ -50,7 +49,7 @@
*/
public class AOPClassPoolRepository implements ScopedClassPoolRepository
{
- private static final Logger logger = AOPLogger.getLogger(AOPClassPoolRepository.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(AOPClassPoolRepository.class);
private final static AOPClassPoolRepository instance = new AOPClassPoolRepository();
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/CallerTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/CallerTransformer.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/CallerTransformer.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -31,7 +31,6 @@
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;
@@ -52,7 +51,7 @@
public abstract class CallerTransformer
{
- private static final Logger logger = AOPLogger.getLogger(CallerTransformer.class);
+ private static final AOPLogger logger = AOPLogger.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/org/jboss/aop/instrument/ConstructorExecutionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorExecutionTransformer.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorExecutionTransformer.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -41,7 +41,6 @@
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.pointcut.Pointcut;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
* Comment
@@ -51,7 +50,7 @@
*/
public abstract class ConstructorExecutionTransformer implements CodeConversionObserver
{
- private static final Logger logger = AOPLogger.getLogger(ConstructorExecutionTransformer.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(ConstructorExecutionTransformer.class);
protected static final String CONSTRUCTOR_INFO_CLASS_NAME = "org.jboss.aop.ConstructorInfo";
@@ -567,4 +566,4 @@
return clazz.getSimpleName();
}
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -33,7 +33,6 @@
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
@@ -43,7 +42,7 @@
*/
public class GeneratedAdvisorCallerTransformer extends CallerTransformer
{
- private static final Logger logger = AOPLogger.getLogger(GeneratedAdvisorCallerTransformer.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAdvisorCallerTransformer.class);
public GeneratedAdvisorCallerTransformer(Instrumentor instrumentor, AspectManager manager)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -32,7 +32,6 @@
import org.jboss.aop.util.JavassistMethodHashing;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
* Comment
@@ -43,7 +42,7 @@
public class GeneratedAdvisorConstructorExecutionTransformer extends
ConstructorExecutionTransformer
{
- private static final Logger logger = AOPLogger.getLogger(GeneratedAdvisorConstructorExecutionTransformer.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAdvisorConstructorExecutionTransformer.class);
public GeneratedAdvisorConstructorExecutionTransformer(Instrumentor instrumentor)
{
@@ -245,4 +244,4 @@
codifier.addPendingCode(innerWrapper, code);
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -61,7 +61,6 @@
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
@@ -83,7 +82,7 @@
*/
public abstract class Instrumentor
{
- private static final Logger logger = AOPLogger.getLogger(Instrumentor.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(Instrumentor.class);
/**
* Package of AOP classes.
@@ -1204,4 +1203,4 @@
{
return manager;
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/InstrumentorFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/InstrumentorFactory.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/InstrumentorFactory.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -26,7 +26,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
* Comment
@@ -36,7 +35,7 @@
*/
public class InstrumentorFactory
{
- private static final Logger logger = AOPLogger.getLogger(InstrumentorFactory.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(InstrumentorFactory.class);
protected static InstrumentorEnum instrumentor;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -65,7 +65,6 @@
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 +75,7 @@
*/
public abstract class JoinPointGenerator
{
- private static final Logger logger = AOPLogger.getLogger(JoinPointGenerator.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(JoinPointGenerator.class);
public static final String INFO_FIELD = "info";
public static final String INITIALISED_LIGHTWEIGHT_INSTANCE_ASPECTS = "initialisedLightweightInstanceAspects";
@@ -2270,4 +2269,4 @@
{
return joinpointField;
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointSimpleClassifier.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointSimpleClassifier.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointSimpleClassifier.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -30,7 +30,6 @@
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>
@@ -47,7 +46,7 @@
*/
public class JoinpointSimpleClassifier extends JoinpointClassifier
{
- private static final Logger logger = AOPLogger.getLogger(JoinpointSimpleClassifier.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(JoinpointSimpleClassifier.class);
/**
* Classifies the execution of a joinpoint. The joinpoint being classified
* is identified by <code>matcher</code>.
@@ -79,4 +78,4 @@
}
return JoinpointClassification.NOT_INSTRUMENTED;
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -33,7 +33,6 @@
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
@@ -43,7 +42,7 @@
*/
public abstract class OptimizedBehaviourInvocations extends OptimizedInvocations
{
- private static final Logger logger = AOPLogger.getLogger(OptimizedBehaviourInvocations.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(OptimizedBehaviourInvocations.class);
/**
* Name of method that enforces consistency between the values contained in typed
@@ -327,4 +326,4 @@
invocation.addField(field);
}
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedCallerInvocations.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -33,7 +33,6 @@
import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
* Comment
@@ -43,7 +42,7 @@
*/
public class OptimizedCallerInvocations extends OptimizedBehaviourInvocations
{
- private static final Logger logger = AOPLogger.getLogger(OptimizedBehaviourInvocations.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(OptimizedBehaviourInvocations.class);
protected static String createOptimizedMethodCalledByConInvocationClass(
Instrumentor instrumentor,
@@ -234,4 +233,4 @@
copy.setModifiers(copyTemplate.getModifiers());
invocation.addMethod(copy);
}
-}
\ No newline at end of file
+}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -30,7 +30,6 @@
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
@@ -40,7 +39,7 @@
*/
public abstract class MatcherStrategy
{
- private static final Logger logger = AOPLogger.getLogger(MatcherStrategy.class);
+ private static final AOPLogger logger = AOPLogger.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/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -27,7 +27,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.instrument.Untransformable;
import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.logging.Logger;
/**
*
@@ -36,7 +35,7 @@
*/
public class GeneratedAOPProxyFactory implements AOPProxyFactory
{
- private static final Logger logger = AOPLogger.getLogger(GeneratedAOPProxyFactory.class);
+ private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAOPProxyFactory.class);
/**
* Create a proxy
*
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/AOPLogger.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/AOPLogger.java 2008-08-26 10:33:09 UTC (rev 77479)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/AOPLogger.java 2008-08-26 11:13:44 UTC (rev 77480)
@@ -21,7 +21,8 @@
*/
package org.jboss.aop.util.logging;
-import org.jboss.logging.Logger;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
/**
* A thin wrapper around the jboss logging framework, so that if a proper logger is not installed
@@ -30,45 +31,116 @@
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
-public class AOPLogger extends Logger
+public class AOPLogger
{
- private static final long serialVersionUID = 1L;
-
- protected AOPLogger(String arg0)
+ private static final ConcurrentMap<Class<?>, AOPLogger> loggers = new ConcurrentHashMap<Class<?>, AOPLogger>();
+
+ public static AOPLogger getLogger(final Class<?> clazz)
{
- super(arg0);
+ AOPLogger logger = loggers.get(clazz);
+
+ if (logger == null)
+ {
+ logger = new AOPLogger(clazz);
+
+ AOPLogger oldLogger = loggers.putIfAbsent(clazz, logger);
+
+ if (oldLogger != null)
+ {
+ logger = oldLogger;
+ }
+ }
+
+ return logger;
}
-
- public static Logger getLogger(String name)
+
+ private final org.jboss.logging.Logger logger;
+
+ private AOPLogger(final Class<?> clazz)
{
- initLogger();
- return Logger.getLogger(name);
+ if(!"org.jboss.logging.Log4jLoggerPlugin.class".equals(org.jboss.logging.Logger.getPluginClassName()))
+ {
+ if(org.jboss.logging.Logger.getPluginClassName() == org.jboss.logging.NullLoggerPlugin.class.getName()
+ || org.jboss.logging.Logger.getPluginClassName() == null)
+ org.jboss.logging.Logger.setPluginClassName(SystemOutLoggerPlugin.class.getName());
+ }
+ logger = org.jboss.logging.Logger.getLogger(clazz);
}
- public static Logger getLogger(String name, String suffix)
+ public boolean isInfoEnabled()
{
- return Logger.getLogger(name + "." + suffix);
+ return logger.isInfoEnabled();
}
- public static Logger getLogger(Class<?> clazz)
+ public boolean isDebugEnabled()
{
- initLogger();
- return Logger.getLogger(clazz);
+ return logger.isDebugEnabled();
}
- public static Logger getLogger(Class<?> clazz, String suffix)
+ public boolean isTraceEnabled()
{
- return Logger.getLogger(clazz.getName() + "." + suffix);
+ return logger.isTraceEnabled();
}
+ public void fatal(final Object message)
+ {
+ logger.fatal(message);
+ }
- protected static void initLogger()
+ public void fatal(final Object message, final Throwable t)
{
- if (pluginClass == org.jboss.logging.NullLoggerPlugin.class &&
- !System.getProperty("jboss.aop.logger.ignore", "false").equals("true"))
- {
- pluginClass = SystemOutLoggerPlugin.class;
- pluginClassName = SystemOutLoggerPlugin.class.getName();
- }
+ logger.fatal(message, t);
}
+
+ public void error(final Object message)
+ {
+ logger.error(message);
+ }
+
+ public void error(final Object message, final Throwable t)
+ {
+ logger.error(message, t);
+ }
+
+ public void warn(final Object message)
+ {
+ logger.warn(message);
+ }
+
+ public void warn(final Object message, final Throwable t)
+ {
+ logger.warn(message, t);
+ }
+
+ public void info(final Object message)
+ {
+ logger.info(message);
+ }
+
+ public void info(final Object message, final Throwable t)
+ {
+ logger.info(message, t);
+ }
+
+ public void debug(final Object message)
+ {
+ logger.debug(message);
+ }
+
+ public void debug(final Object message, final Throwable t)
+ {
+ logger.debug(message, t);
+ }
+
+ public void trace(final Object message)
+ {
+ logger.trace(message);
+ }
+
+ public void trace(final Object message, final Throwable t)
+ {
+ logger.trace(message, t);
+ }
+
+
}
More information about the jboss-cvs-commits
mailing list