[jboss-cvs] JBossAS SVN: r63047 - in projects/aop/trunk/aop: src/main/org/jboss/aop and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 15 07:57:47 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-05-15 07:57:47 -0400 (Tue, 15 May 2007)
New Revision: 63047
Added:
projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/
projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/AOPLogger.java
projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java
Modified:
projects/aop/trunk/aop/.classpath
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/ReflectiveAspectBinder.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/GeneratedAdvisorInterceptor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PerVmAdvice.java
projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java
projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.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/DeclareChecker.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/ClassProxyContainer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Compiler.java
Log:
[JBAOP-396] Integrate with JBoss Logging
Modified: projects/aop/trunk/aop/.classpath
===================================================================
--- projects/aop/trunk/aop/.classpath 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/.classpath 2007-05-15 11:57:47 UTC (rev 63047)
@@ -10,8 +10,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="docs"/>
<classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar" sourcepath="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/javassist"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AdvisorFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AdvisorFactory.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AdvisorFactory.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -29,6 +29,8 @@
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;
/**
*
@@ -38,7 +40,8 @@
*/
public class AdvisorFactory
{
-
+ private static final Logger 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
protected static int advisor = 0;
@@ -51,9 +54,9 @@
public static void initialise(String property)
{
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[debug] Passed in advisor: " + property);
+ logger.debug("Passed in advisor: " + property);
}
if(property != null)
@@ -81,9 +84,9 @@
}
else
{
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[debug] Defaulting advisor to: " + ClassAdvisor.class.getName());
+ logger.debug("[debug] Defaulting advisor to: " + ClassAdvisor.class.getName());
}
advisor = CLASS;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -71,6 +71,8 @@
import org.jboss.aop.pointcut.ast.PointcutExpressionParser;
import org.jboss.aop.pointcut.ast.TypeExpressionParser;
import org.jboss.aop.util.MethodHashing;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -80,6 +82,8 @@
*/
public class AspectAnnotationLoader
{
+
+ private static final Logger logger = AOPLogger.getLogger(AspectAnnotationLoader.class);
//TODO: We need something to undeploy everything...
protected AspectManager manager;
@@ -126,7 +130,7 @@
public void deployClassFile(ClassFile cf) throws Exception
{
- if (AspectManager.verbose) System.out.println("[debug] Looking for aspects in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Looking for aspects in: " + cf.getName());
AnnotationsAttribute visible = (AnnotationsAttribute) cf.getAttribute(AnnotationsAttribute.visibleTag);
if (visible != null)
{
@@ -185,7 +189,7 @@
public void undeployClassFile(ClassFile cf) throws Exception
{
- if (AspectManager.verbose) System.out.println("[debug] Looking for aspects in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Looking for aspects in: " + cf.getName());
AnnotationsAttribute visible = (AnnotationsAttribute) cf.getAttribute(AnnotationsAttribute.visibleTag);
if (visible != null)
{
@@ -210,7 +214,7 @@
javassist.bytecode.annotation.Annotation info = visible.getAnnotation(Aspect.class.getName());
if (info != null)
{
- if (AspectManager.verbose) System.out.println("[debug] Found @Aspect in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("[debug] Found @Aspect in: " + cf.getName());
Aspect aspect = (Aspect) AnnotationProxy.createProxy(info, Aspect.class);
Scope scope = aspect.scope();
@@ -253,7 +257,7 @@
javassist.bytecode.annotation.Annotation info = visible.getAnnotation(Aspect.class.getName());
if (info != null)
{
- if (AspectManager.verbose) System.out.println("[debug] Undeploying @Aspect in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Undeploying @Aspect in: " + cf.getName());
manager.removeAspectDefinition(cf.getName());
undeployAspectMethodBindings(cf);
@@ -266,7 +270,7 @@
javassist.bytecode.annotation.Annotation info = visible.getAnnotation(InterceptorDef.class.getName());
if (info != null)
{
- if (AspectManager.verbose) System.out.println("[debug] Found @InterceptorDef in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Found @InterceptorDef in: " + cf.getName());
Aspect aspect = (Aspect) AnnotationProxy.createProxy(info, Aspect.class);
Scope scope = aspect.scope();
@@ -316,7 +320,7 @@
javassist.bytecode.annotation.Annotation info = visible.getAnnotation(InterceptorDef.class.getName());
if (info != null)
{
- if (AspectManager.verbose) System.out.println("[debug] Undeploying @InterceptorDef in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Undeploying @InterceptorDef in: " + cf.getName());
AnnotationProxy.createProxy(info, Aspect.class);
manager.removeAspectDefinition(cf.getName());
@@ -331,7 +335,7 @@
javassist.bytecode.annotation.Annotation info = visible.getAnnotation(DynamicCFlowDef.class.getName());
if (info != null)
{
- if (AspectManager.verbose) System.out.println("[debug] Found @DynamicCFlowDef in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Found @DynamicCFlowDef in: " + cf.getName());
AnnotationProxy.createProxy(info, DynamicCFlowDef.class);
String name = cf.getName();
@@ -358,7 +362,7 @@
javassist.bytecode.annotation.Annotation info = visible.getAnnotation(DynamicCFlowDef.class.getName());
if (info != null)
{
- if (AspectManager.verbose) System.out.println("[debug] Undeploying @DynamicCFlowDef in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Undeploying @DynamicCFlowDef in: " + cf.getName());
String name = cf.getName();
manager.removeDynamicCFlow(name);
}
@@ -370,7 +374,7 @@
javassist.bytecode.annotation.Annotation info = visible.getAnnotation(Prepare.class.getName());
if (info != null)
{
- if (AspectManager.verbose) System.out.println("[debug] Found top-level @Prepare in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Found top-level @Prepare in: " + cf.getName());
Prepare prepare = (Prepare) AnnotationProxy.createProxy(info, Prepare.class);
String name = cf.getName() + "." + visible.getName();
@@ -399,7 +403,7 @@
javassist.bytecode.annotation.Annotation info = visible.getAnnotation(Precedence.class.getName());
if (info != null)
{
- if (AspectManager.verbose) System.out.println("[debug] Found top-level @Precedence in: " + cf.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Found top-level @Precedence in: " + cf.getName());
ArrayList entries = new ArrayList();
Iterator fields = cf.getFields().iterator();
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectManager.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -73,6 +73,8 @@
import org.jboss.aop.pointcut.Typedef;
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.Translatable;
import org.jboss.util.loading.Translator;
@@ -98,6 +100,8 @@
public class AspectManager
implements Translator
{
+ private static final Logger logger = AOPLogger.getLogger(AspectManager.class);
+
/** Read/Write lock to be used when lazy creating the collections */
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
@@ -312,9 +316,9 @@
if (scopedManager == null)
{
scopedManager = scopedCLHelper.getScopedClassLoaderDomain(scopedClassLoader, manager);
- if (verbose)
+ if (verbose && logger.isDebugEnabled())
{
- System.out.println("Created domain " + scopedManager + " for scoped deployment on: " +
+ logger.debug("Created domain " + scopedManager + " for scoped deployment on: " +
loadingClassLoader + "; identifying scoped ucl: " + scopedClassLoader);
}
scopedManager.setInheritsBindings(true);
@@ -1236,7 +1240,7 @@
}
else
{
- if (verbose) System.out.println("[debug] Setting all pointcut stats to true");
+ if (verbose && logger.isDebugEnabled()) logger.debug("Setting all pointcut stats to true");
// can't be sure so set all
execution = true;
construction = true;
@@ -1312,7 +1316,7 @@
AdviceBinding binding = (AdviceBinding) bindings.get(binds.get(i));
if (binding == null)
{
- System.out.println("[warn] AspectManager.removeBindings() no binding found with name " + binds.get(i));
+ logger.debug("AspectManager.removeBindings() no binding found with name " + binds.get(i));
continue;
}
ArrayList ads = binding.getAdvisors();
@@ -1389,7 +1393,6 @@
{
synchronized (advisors)
{
- //System.out.println("******* addBinding to possibly this many advisors: " + advisors.size());
Collection keys = advisors.keySet();
if (keys.size() > 0)
{
@@ -1401,15 +1404,15 @@
if (binding.getPointcut().softMatch(advisor))
{
- if (AspectManager.verbose)
- System.out.println("[debug] softmatch succeeded for : " + advisor.getName() + " " + binding + " " + binding.getPointcut().getExpr());
+ if (AspectManager.verbose && logger.isDebugEnabled())
+ logger.debug("softmatch succeeded for : " + advisor.getName() + " " + binding + " " + binding.getPointcut().getExpr());
advisor.newBindingAdded();
//affectedAdvisors.remove(advisor);
}
else
{
- if (AspectManager.verbose)
- System.out.println("[debug] softmatch failed for : " + advisor.getName() + " " + binding + " " + binding.getPointcut().getExpr());
+ if (AspectManager.verbose && logger.isDebugEnabled())
+ logger.debug("softmatch failed for : " + advisor.getName() + " " + binding + " " + binding.getPointcut().getExpr());
}
}
}
@@ -1673,7 +1676,6 @@
{
synchronized (advisors)
{
- //System.out.println("******* addBinding to possibly this many advisors: " + advisors.size());
Iterator it = advisors.keySet().iterator();
while (it.hasNext())
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -66,6 +66,8 @@
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;
@@ -81,6 +83,8 @@
*/
public class AspectXmlLoader implements XmlLoader
{
+ private static final Logger logger = AOPLogger.getLogger(AspectXmlLoader.class);
+
// Attributes ---------------------------------------------------
protected int counter;
@@ -99,7 +103,7 @@
public void setManager(AspectManager manager)
{
- if (AspectManager.verbose) System.out.println("AspectXMLLoader using manager" + manager);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("AspectXMLLoader using manager" + manager);
this.manager = manager;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -67,6 +67,8 @@
import org.jboss.aop.util.FieldComparator;
import org.jboss.aop.util.MethodHashing;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
/**
@@ -83,6 +85,8 @@
*/
public class ClassAdvisor extends Advisor
{
+ private static final Logger logger = AOPLogger.getLogger(ClassAdvisor.class);
+
/**
* Suffix added to unadvised methods.
*/
@@ -590,7 +594,7 @@
protected void createInterceptorChains() throws Exception
{
- if (AspectManager.verbose) System.out.println("[debug] Creating chains for " + clazz + " " + ((clazz != null) ? clazz.getClassLoader() : null ));
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Creating chains for " + clazz + " " + ((clazz != null) ? clazz.getClassLoader() : null ));
MethodInterceptors newMethodInfos = initializeMethodChain();
ArrayList newFieldReadInfos = initializeFieldReadChain();
ArrayList newFieldWriteInfos = initializeFieldWriteChain();
@@ -603,7 +607,7 @@
while (it.hasNext())
{
AdviceBinding binding = (AdviceBinding) it.next();
- if (AspectManager.verbose) System.out.println("[debug] iterate binding " + binding.getName() + " " + binding.getPointcut().getExpr());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("iterate binding " + binding.getName() + " " + binding.getPointcut().getExpr());
resolveMethodPointcut(newMethodInfos, binding);
resolveFieldPointcut(newFieldReadInfos, binding, false);
resolveFieldPointcut(newFieldWriteInfos, binding, true);
@@ -1405,9 +1409,9 @@
throws Throwable
{
MethodInfo info = (MethodInfo) methodInterceptors.get(methodHash);
- if (info == null)
+ if (info == null && logger.isDebugEnabled())
{
- System.out.println("info is null for hash: " + methodHash + " of " + clazz.getName());
+ logger.debug("info is null for hash: " + methodHash + " of " + clazz.getName());
}
return invokeMethod(instanceAdvisor, target, methodHash, arguments, info);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassContainer.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -38,6 +38,8 @@
import org.jboss.aop.util.ConstructorComparator;
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
@@ -47,6 +49,8 @@
*/
public class ClassContainer extends Advisor
{
+ private static final Logger logger = AOPLogger.getLogger(ClassContainer.class);
+
private boolean chainOverridingForInheritedMethods;
public ClassContainer(String name, AspectManager manager)
@@ -249,7 +253,7 @@
while (it.hasNext())
{
AdviceBinding binding = (AdviceBinding) it.next();
- if (AspectManager.verbose) System.out.println("iterate binding " + binding.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("iterate binding " + binding.getName());
resolveMethodPointcut(newMethodInfos, binding);
resolveConstructorPointcut(newConstructorInfos, binding);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -24,6 +24,8 @@
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;
@@ -38,6 +40,8 @@
*/
public class ClassicWeavingStrategy extends WeavingStrategySupport
{
+ private static final Logger logger = AOPLogger.getLogger(ClassicWeavingStrategy.class);
+
private boolean verbose = AspectManager.verbose;
/**
* This is the translate version that was always there
@@ -72,19 +76,19 @@
}
if (clazz.isArray())
{
- if (verbose) System.out.println("[cannot compile] isArray: " + className);
+ if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, isArray: " + className);
pool.flushClass(className);
return null;
}
if (clazz.isInterface())
{
- if (verbose) System.out.println("[cannot compile] isInterface: " + className);
+ if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, isInterface: " + className);
pool.flushClass(className);
return null;
}
if (clazz.isFrozen())
{
- if (verbose) System.out.println("[warning] isFrozen: " + className);
+ if (verbose && logger.isDebugEnabled()) logger.debug("warning, isFrozen: " + className);
clazz.defrost();
}
@@ -97,7 +101,7 @@
if (!Instrumentor.isTransformable(clazz))
{
- if (verbose) System.out.println("[cannot compile] implements Untransformable: " + className);
+ if (verbose && logger.isDebugEnabled()) logger.debug("[cannot compile] implements Untransformable: " + className);
pool.flushClass(className);
return null;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -21,6 +21,8 @@
*/
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;
@@ -39,6 +41,8 @@
*/
public class Deployment
{
+ private static final Logger logger = AOPLogger.getLogger(Deployment.class);
+
public static boolean searchClasspath = true;
public static void deploy()
@@ -65,7 +69,7 @@
{
String search = System.getProperty("jboss.aop.search.classpath", null);
if (search != null) searchClasspath = (new Boolean(search)).booleanValue();
- if (AspectManager.verbose) System.out.println("[debug] jboss.aop.search.classpath: '" + search + "' " + searchClasspath);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("jboss.aop.search.classpath: '" + search + "' " + searchClasspath);
if (searchClasspath)
{
try
@@ -74,7 +78,7 @@
while (en.hasMoreElements())
{
URL url = (URL) en.nextElement();
- if (AspectManager.verbose) System.out.println("[deploying] " + url);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("deploying " + url);
AspectXmlLoader.deployXML(url);
}
}
@@ -93,10 +97,10 @@
String path = System.getProperty("jboss.aop.class.path", null);
if (path == null)
{
- if (AspectManager.verbose) System.out.println("[debug] jboss.aop.class.path is NULL");
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("jboss.aop.class.path is NULL");
return;
}
- if (AspectManager.verbose) System.out.println("[debug] jboss.aop.class.path: " + path);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("jboss.aop.class.path: " + path);
StringTokenizer t = new StringTokenizer(path, File.pathSeparator);
while (t.hasMoreTokens())
{
@@ -130,14 +134,14 @@
public static void preconfigThroughSystemProperty()
{
String path = System.getProperty("jboss.aop.path", null);
- if (AspectManager.verbose) System.out.println("[debug] jboss.aop.path: " + path);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("jboss.aop.path: " + path);
if (path == null) return;
StringTokenizer t = new StringTokenizer(path, File.pathSeparator);
int j = 0;
while (t.hasMoreTokens())
{
String token = t.nextToken();
- if (AspectManager.verbose) System.out.println("jboss.aop.path[" + j + "]: " + token);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("jboss.aop.path[" + j + "]: " + token);
File f = new File(token);
try
{
@@ -175,7 +179,7 @@
private static void deployXmlFile(File f) throws Exception
{
URL url = f.toURL();
- if (AspectManager.verbose) System.out.println("[deploying] " + url);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("deploying " + url);
AspectXmlLoader.deployXML(url);
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -26,6 +26,8 @@
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;
/**
*
@@ -34,6 +36,8 @@
*/
class MethodMatchInfo
{
+ private static final Logger logger = AOPLogger.getLogger(MethodMatchInfo.class);
+
Advisor advisor;
MethodInfo info;
ArrayList bindings;
@@ -103,14 +107,14 @@
private void overridePopulateBindings(ArrayList applicableBindings)
{
- if (AspectManager.verbose) System.out.println("[debug] populate bindings for " + info.getAdvisedMethod() + " all bindings");
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("populate bindings for " + info.getAdvisedMethod() + " all bindings");
int size = bindings.size();
int minMatchLevel = 1000000;
for (int i = 0 ; i < size ; i++)
{
AdviceBinding binding = (AdviceBinding)bindings.get(i);
PointcutMethodMatch match = (PointcutMethodMatch)pointcutMethodMatches.get(i);
- if (AspectManager.verbose) System.out.println("[debug] " + match.getMatchLevel() + " " + match.getMatchedClass().getName() + " " + binding.getPointcut().getExpr() + " : " + binding.getInterceptorFactories().length);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug(match.getMatchLevel() + " " + match.getMatchedClass().getName() + " " + binding.getPointcut().getExpr() + " : " + binding.getInterceptorFactories().length);
if (minMatchLevel > match.getMatchLevel() && !match.isInstanceOf())
{
@@ -118,7 +122,7 @@
}
}
- if (AspectManager.verbose) System.out.println("[debug] populate bindings for " + info.getAdvisedMethod() + " actual bindings");
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("populate bindings for " + info.getAdvisedMethod() + " actual bindings");
for (int i = 0 ; i < size ; i++)
{
AdviceBinding binding = (AdviceBinding)bindings.get(i);
@@ -126,7 +130,7 @@
if (match.isInstanceOf() || match.getMatchLevel() == minMatchLevel)
{
- if (AspectManager.verbose) System.out.println("[debug] " + match.getMatchLevel() + " " + match.getMatchedClass().getName() + " " + binding.getPointcut().getExpr() + " : " + binding.getInterceptorFactories().length);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug(match.getMatchLevel() + " " + match.getMatchedClass().getName() + " " + binding.getPointcut().getExpr() + " : " + binding.getInterceptorFactories().length);
applyBinding(applicableBindings, binding);
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ReflectiveAspectBinder.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ReflectiveAspectBinder.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ReflectiveAspectBinder.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -47,6 +47,8 @@
import org.jboss.aop.pointcut.PointcutMethodMatch;
import org.jboss.aop.proxy.container.InstanceProxyContainer;
import org.jboss.aop.util.Advisable;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
import org.jboss.util.MethodHashing;
/**
@@ -329,7 +331,6 @@
List<LifecycleCallbackDefinition> boundCallbacks = binding.getLifecycleCallbacks();
for (LifecycleCallbackDefinition callback : boundCallbacks)
{
- System.out.println("=====> Adding lifecycle " + callback + ":" + state);
callbacks.add(callback);
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -25,6 +25,8 @@
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;
@@ -41,7 +43,9 @@
*/
public class SuperClassesFirstWeavingStrategy extends WeavingStrategySupport {
- private boolean verbose = AspectManager.verbose;
+ private static final Logger logger = AOPLogger.getLogger(SuperClassesFirstWeavingStrategy.class);
+
+ private boolean verbose = AspectManager.verbose;
public static final String AOP_PACKAGE = Advised.class.getPackage().getName();
public byte[] translate(AspectManager manager, String className, ClassLoader loader, byte[] classfileBuffer) throws Exception
@@ -147,13 +151,13 @@
if (info.getClass().isArray())
{
- if (verbose) System.out.println("[cannot compile] isArray: " + info.getClassName());
+ if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, isArray: " + info.getClassName());
pool.flushClass(info.getClassName());
return null;
}
if (info.getClazz().isInterface())
{
- if (verbose) System.out.println("[cannot compile] isInterface: " + info.getClassName());
+ if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, isInterface: " + info.getClassName());
//pool.flushClass(info.getClassName());
info.getClazz().prune();
return null;
@@ -162,7 +166,7 @@
{
if(isAdvised(pool, info.getClazz()))
return null;
- if (verbose) System.out.println("[warning] isFrozen: " + info.getClassName() + " " + info.getClazz().getClassPool());
+ if (verbose && logger.isDebugEnabled()) logger.debug("warning, isFrozen: " + info.getClassName() + " " + info.getClazz().getClassPool());
if (!isLoadedClass)
{
info = obtainCtClassInfo(pool, info.getClassName(), null);
@@ -185,7 +189,7 @@
if (!Instrumentor.isTransformable(info.getClazz()))
{
- if (verbose) System.out.println("[cannot compile] implements Untransformable: " + info.getClassName());
+ if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, implements Untransformable: " + info.getClassName());
//Flushing the generated invocation classes breaks things further down the line
//pool.flushClass(info.getClassName());
return null;
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AdviceBinding.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -36,6 +36,8 @@
import org.jboss.aop.pointcut.ast.ASTCFlowExpression;
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;
/**
* Comment
@@ -45,6 +47,8 @@
*/
public class AdviceBinding
{
+ private static final Logger logger = AOPLogger.getLogger(AdviceBinding.class);
+
private static volatile long counter = 0;
protected String name;
@@ -149,7 +153,7 @@
public void addAdvisor(Advisor advisor)
{
- if (AspectManager.verbose) System.out.println("[debug] added advisor: " + advisor.getName() + " from binding: " + name);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("added advisor: " + advisor.getName() + " from binding: " + name);
// Don't hold a direct reference to an advisor because of undeploy and redeploy. Use WeakRefrences because
// we may be having in the future an Advisor per instance.
synchronized (advisors)
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AspectFactoryWithClassLoaderSupport.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -24,6 +24,8 @@
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
@@ -32,6 +34,7 @@
*/
public abstract class AspectFactoryWithClassLoaderSupport implements AspectFactory, AspectFactoryWithClassLoader
{
+ private static final Logger logger = AOPLogger.getLogger(AspectFactoryWithClassLoaderSupport.class);
private WeakReference 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 */
@@ -81,12 +84,12 @@
if (cl == null)
{
ClassLoader tcl = Thread.currentThread().getContextClassLoader();
- if (AspectManager.verbose) System.out.println("Using context classloader " + tcl + " to load aspect " + name);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Using context classloader " + tcl + " to load aspect " + name);
return tcl.loadClass(name);
}
else
{
- if (AspectManager.verbose) System.out.println("Using scoped classloader " + cl + " to load aspect " + name);
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Using scoped classloader " + cl + " to load aspect " + name);
return cl.loadClass(name);
}
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GeneratedAdvisorInterceptor.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -49,6 +49,8 @@
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
@@ -64,6 +66,7 @@
*/
public class GeneratedAdvisorInterceptor implements Interceptor
{
+ private static final Logger logger = AOPLogger.getLogger(GeneratedAdvisorInterceptor.class);
private InterceptorFactory factory;
private volatile Object instance;
private String cflowString;
@@ -240,9 +243,9 @@
if (instance == null)
{
//Used by JoinPointGenerator at code generation time
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[info] Calling create on PER_JOINPOINT scoped AspectFactory with no InstanceAdvisor as part of setup");
+ logger.debug("Calling create on PER_JOINPOINT scoped AspectFactory with no InstanceAdvisor as part of setup");
}
if (joinpoint instanceof FieldJoinpoint)
@@ -273,9 +276,9 @@
if (ia == null)
{
//Used by JoinPointGenerator at code generation time
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[info] Calling create on PER_INSTANCE scoped AspectFactory with no InstanceAdvisor as part of setup");
+ logger.debug("Calling create on PER_INSTANCE scoped AspectFactory with no InstanceAdvisor as part of setup");
}
return def.getFactory().createPerInstance(advisor, ia);
}
@@ -506,7 +509,7 @@
GeneratedOnlyInterceptor(String name, InterceptorFactory factory)
{
this.name = name;
- System.out.println("[warn] " + factory.getType().getDescription() +
+ logger.warn(factory.getType().getDescription() +
" interceptor:s'" + name +
"' is ignored for dynamic invocation. Adding null GeneratedOnlyInterceptor in its place");
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/GenericAspectFactory.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -32,6 +32,8 @@
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;
@@ -44,6 +46,8 @@
*/
public class GenericAspectFactory extends AspectFactoryWithClassLoaderSupport
{
+ private static final Logger 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};
final static Class[] JOINPOINT_INJECTOR_SIGNATURE = new Class[]{Joinpoint.class};
@@ -275,9 +279,9 @@
{
if (advisor == null)
{
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[warn] Ignoring attempt to set advisor attribute on PER_VM scoped aspect/interceptor: " + classname);
+ logger.debug("Ignoring attempt to set advisor attribute on PER_VM scoped aspect/interceptor: " + classname);
}
return;
}
@@ -298,9 +302,9 @@
{
if (jp == null)
{
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[warn] Ignoring attempt to set joinpoint attribute on aspect/interceptor: " + classname + " which is not scoped PER_JOINPOINT");
+ logger.debug("Ignoring attempt to set joinpoint attribute on aspect/interceptor: " + classname + " which is not scoped PER_JOINPOINT");
}
return;
}
@@ -321,9 +325,9 @@
{
if (instanceAdvisor == null)
{
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[warn] Ignoring attempt to set instance advisor attribute on aspect/interceptor: " + classname + " which is not scoped PER_INSTANCE or PER_JOINPOINT");
+ logger.debug("Ignoring attempt to set instance advisor attribute on aspect/interceptor: " + classname + " which is not scoped PER_INSTANCE or PER_JOINPOINT");
}
return;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PerVmAdvice.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PerVmAdvice.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PerVmAdvice.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -41,6 +41,8 @@
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aop.joinpoint.MethodJoinpoint;
import org.jboss.aop.util.ReflectToJavassist;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -50,6 +52,8 @@
*/
public class PerVmAdvice
{
+ private static final Logger logger = AOPLogger.getLogger(PerVmAdvice.class);
+
private static long counter = 0;
public static synchronized Interceptor generateOptimized(Joinpoint joinpoint, AspectManager manager, String adviceName, AspectDefinition a) throws Exception
@@ -258,7 +262,7 @@
}
catch(CannotCompileException e)
{
- System.out.println(invokeBody);
+ logger.error("Could not compile " + invokeBody);
throw e;
}
invoke.setModifiers(javassist.Modifier.PUBLIC);
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -34,6 +34,8 @@
import org.jboss.aop.Advisor;
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;
@@ -49,6 +51,8 @@
*/
public class AOPClassPoolRepository implements ScopedClassPoolRepository
{
+ private static final Logger logger = AOPLogger.getLogger(AOPClassPoolRepository.class);
+
private final static AOPClassPoolRepository instance = new AOPClassPoolRepository();
/** The classes per classppol */
@@ -215,11 +219,11 @@
}
catch(NoSuchFieldException e)
{
- System.out.println("[warn] Error unsetting advisor for " + advisedClass.getName() + " " + e);
+ logger.warn("Error unsetting advisor for " + advisedClass.getName() + " " + e);
}
catch(IllegalAccessException e)
{
- System.out.println("[warn] Error unsetting advisor for " + advisedClass.getName() + " " + e);
+ logger.warn("Error unsetting advisor for " + advisedClass.getName() + " " + e);
}
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/hook/JRockitClassPreProcessor.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -31,32 +31,30 @@
static
{
- //pre-load necessary classes
+ //pre-load necessary classes
Class clazz = JDK14TransformerManager.class;
clazz = AspectManager.class;
}
-
+
public JRockitClassPreProcessor()
{
ClassLibrary lib = JVMFactory.getJVM().getClassLibrary();
lib.setClassPreProcessor(this);
}
- public byte[] preProcess(ClassLoader loader, String classname, byte[] bytes)
+ public byte[] preProcess(ClassLoader loader, String classname, byte[] bytes)
{
classname = classname.replace('/', '.');
- //System.out.println("---" + classname);
if (JDK14TransformerManager.isNonAdvisableClassName(classname))
{
return bytes;
}
- //System.out.println("Transform");
-
- try
+
+ try
{
return AspectManager.instance().translate(classname, loader, bytes);
- }
- catch (Exception e)
+ }
+ catch (Exception e)
{
throw new RuntimeException(e);
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/CallerTransformer.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -29,6 +29,9 @@
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;
import javassist.CtClass;
@@ -48,6 +51,8 @@
public abstract class CallerTransformer
{
+ private static final Logger 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();
public static final String METHOD_BY_CON_INFO_CLASS_NAME = org.jboss.aop.MethodByConInfo.class.getName();
@@ -79,7 +84,7 @@
{
if (!advisor.getManager().isWithin() && !advisor.getManager().isCall() && !advisor.getManager().isWithincode())
{
- if (AspectManager.verbose) System.out.println("[debug] There are no caller pointcuts!");
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("There are no caller pointcuts!");
return false;
}
CallerExprEditor expr = callerExprEditorFactory(advisor, clazz);
@@ -315,8 +320,6 @@
{
try
{
- //System.out.println("XXX Call " + call.getMethodName() + " " + call.getMethod().getSignature() + " from " + callingClass.getName() + " - " + call.where().getName());
-
String classname = call.getClassName();
String methodName = call.getMethodName();
if (ClassAdvisor.isWithoutAdvisement(methodName)
@@ -326,7 +329,6 @@
|| !Instrumentor.isTransformable(callingClass)
)
{
- //System.out.println("XXX RETURNING");
return;
}
@@ -348,7 +350,7 @@
}
else
{
- if (AspectManager.verbose) System.out.println("[debug] MethodCall does not match: " + p.getExpr());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("MethodCall does not match: " + p.getExpr());
}
}
if (hasPointcut)
@@ -456,8 +458,7 @@
}
catch (Exception ex)
{
- System.out.println(ex.getMessage());
- ex.printStackTrace();
+ logger.error(ex.getMessage());
throw new CannotCompileException(ex);
}
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorExecutionTransformer.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -37,6 +37,8 @@
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.pointcut.Pointcut;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -46,6 +48,8 @@
*/
public abstract class ConstructorExecutionTransformer implements CodeConversionObserver
{
+ private static final Logger logger = AOPLogger.getLogger(ConstructorExecutionTransformer.class);
+
protected static final String CONSTRUCTOR_INFO_CLASS_NAME = "org.jboss.aop.ConstructorInfo";
protected Instrumentor instrumentor;
@@ -392,7 +396,7 @@
}
catch (CannotCompileException e)
{
- System.out.println(code);
+ logger.error("Cannot compile " + code);
throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
}
}
@@ -416,7 +420,7 @@
}
catch (CannotCompileException e)
{
- System.out.println(code);
+ logger.error("Cannot compile " + code);
throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/DeclareChecker.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/DeclareChecker.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/DeclareChecker.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -55,6 +55,7 @@
if (declare.getWarning())
{
sb.insert(0, "WARNING: declare-warning");
+ //System.out.println is ok here - want to guarantee that it works even if people have screwed up their logging config
System.out.println(sb.toString());
}
else
@@ -130,6 +131,7 @@
if (declare.getWarning())
{
sb.insert(0, "WARNING: declare-warning");
+ //System.out.println is ok here - want to guarantee that it works even if people have screwed up their logging config
System.out.println(sb.toString());
}
else
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorCallerTransformer.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -32,6 +32,8 @@
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
@@ -41,6 +43,8 @@
*/
public class GeneratedAdvisorCallerTransformer extends CallerTransformer
{
+ private static final Logger logger = AOPLogger.getLogger(GeneratedAdvisorCallerTransformer.class);
+
public GeneratedAdvisorCallerTransformer(Instrumentor instrumentor, AspectManager manager)
{
super(instrumentor, manager, true, new GeneratedAdvisorCallerInfoAdder(instrumentor));
@@ -165,7 +169,7 @@
}
catch(CannotCompileException e)
{
- System.out.println("Error for " + cd.callingIndex + " code:" + code);
+ logger.error("Error for " + cd.callingIndex + " code:" + code);
throw e;
}
}
@@ -268,7 +272,7 @@
}
catch(CannotCompileException e)
{
- System.out.println("Error for " + md.where + " code:" + code);
+ logger.error("Error for " + md.where + " code:" + code);
throw e;
}
}
@@ -359,7 +363,7 @@
}
catch(CannotCompileException e)
{
- System.out.println("Error for " + cd.where + ": code:" + code);
+ logger.error("Error for " + cd.where + ": code:" + code);
throw e;
}
}
@@ -440,7 +444,7 @@
}
catch(CannotCompileException e)
{
- System.out.println("Error for " + cd.callingIndex + " code:" + code);
+ logger.error("Error for " + cd.callingIndex + " code:" + code);
throw e;
}
}
@@ -470,7 +474,7 @@
}
catch(CannotCompileException e)
{
- System.out.println("Error for " + cd.con + " code:" + replaced);
+ logger.error("Error for " + cd.con + " code:" + replaced);
throw e;
}
}
@@ -518,7 +522,7 @@
}
catch(CannotCompileException e)
{
- System.out.println("Error for " + md.where + " code:" + replaced);
+ logger.error("Error for " + md.where + " code:" + replaced);
throw e;
}
}
@@ -549,7 +553,7 @@
}
catch(CannotCompileException e)
{
- System.out.println("Error for " + cd.where + " code:" + replaced);
+ logger.error("Error for " + cd.where + " code:" + replaced);
throw e;
}
}
@@ -569,7 +573,7 @@
}
catch(CannotCompileException e)
{
- System.out.println("Error for " + cd.callingIndex + " code:" + replaced);
+ logger.error("Error for " + cd.callingIndex + " code:" + replaced);
throw e;
}
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorConstructorExecutionTransformer.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -31,6 +31,8 @@
import javassist.NotFoundException;
import org.jboss.aop.util.JavassistMethodHashing;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -41,7 +43,8 @@
public class GeneratedAdvisorConstructorExecutionTransformer extends
ConstructorExecutionTransformer
{
-
+ private static final Logger logger = AOPLogger.getLogger(GeneratedAdvisorConstructorExecutionTransformer.class);
+
public GeneratedAdvisorConstructorExecutionTransformer(Instrumentor instrumentor)
{
super(instrumentor);
@@ -144,7 +147,7 @@
}
catch (CannotCompileException e)
{
- System.out.println(innerCode);
+ logger.error(innerCode);
throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
}
@@ -155,7 +158,7 @@
}
catch(CannotCompileException e)
{
- System.out.println(outerDelegatingBody(constructor));
+ logger.error(outerDelegatingBody(constructor));
throw new RuntimeException(e); //To change body of catch statement use Options | File Templates.
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -42,6 +42,9 @@
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;
+
import javassist.CannotCompileException;
import javassist.ClassPool;
import javassist.CodeConverter;
@@ -77,6 +80,8 @@
*/
public abstract class Instrumentor
{
+ private static final Logger logger = AOPLogger.getLogger(Instrumentor.class);
+
/**
* Package of AOP classes.
*/
@@ -306,7 +311,7 @@
}
else
{
- if (AspectManager.verbose)System.out.println("[warn] " + msg);
+ if (AspectManager.verbose)logger.warn(msg);
}
}
// If another interface of this mixin has a duplicate method, then its ok, but don't re-add
@@ -395,10 +400,10 @@
while (it.hasNext())
{
AnnotationIntroduction introduction = (AnnotationIntroduction) it.next();
- if (AspectManager.verbose) System.out.println("**** " + introduction.getOriginalAnnotationExpr() + " invisible: " + introduction.isInvisible() + " expr: " + introduction.getOriginalExpression());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("**** " + introduction.getOriginalAnnotationExpr() + " invisible: " + introduction.isInvisible() + " expr: " + introduction.getOriginalExpression());
if (introduction.matches(advisor, clazz))
{
- if (AspectManager.verbose) System.out.println(introduction.getAnnotation() + " binds to " + clazz.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug(introduction.getAnnotation() + " binds to " + clazz.getName());
javassist.bytecode.annotation.Annotation info = AnnotationInfoCreator.createAnnotationInfo(classPool, clazz.getClassFile2().getConstPool(), introduction.getAnnotation());
if (introduction.isInvisible())
{
@@ -685,7 +690,7 @@
try
{
if (shouldNotTransform(clazz)) return false;
- if (AspectManager.verbose) System.out.println("[trying to transform] " + clazz.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("trying to transform " + clazz.getName());
DeclareChecker.checkDeclares(manager, clazz, advisor);
@@ -742,7 +747,7 @@
processedClasses.add(clazz);
}
- if (AspectManager.verbose) System.out.println("[debug] was " + clazz.getName() + " converted: " + (basicsSet || converted));
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("was " + clazz.getName() + " converted: " + (basicsSet || converted));
if (basicsSet || converted)
{
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/InstrumentorFactory.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -25,6 +25,8 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.classpool.AOPClassPool;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -34,6 +36,8 @@
*/
public class InstrumentorFactory
{
+ private static final Logger logger = AOPLogger.getLogger(InstrumentorFactory.class);
+
protected static InstrumentorEnum instrumentor;
protected static Constructor otherInstrumentorConstructor;
@@ -42,9 +46,9 @@
public static void initialise(String property)
{
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[debug] Passed in instrumentor: " + property);
+ logger.debug("Passed in instrumentor: " + property);
}
if (property != null)
@@ -79,9 +83,9 @@
else
{
instrumentor = InstrumentorEnum.GENERATED_ADVISOR;
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[debug] Defaulting instrumentor to: " + getInstrumentorName());
+ logger.debug("Defaulting instrumentor to: " + getInstrumentorName());
}
}
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -58,6 +58,8 @@
import org.jboss.aop.pointcut.ast.ClassExpression;
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
@@ -67,6 +69,8 @@
*/
public abstract class JoinPointGenerator
{
+ private static final Logger logger = AOPLogger.getLogger(JoinPointGenerator.class);
+
public static final String INFO_FIELD = "info";
public static final String INVOKE_JOINPOINT = "invokeJoinpoint";
public static final String INVOKE_TARGET = "invokeTarget";
@@ -1076,7 +1080,7 @@
if (superDispatches.length > 2)
{
- if (AspectManager.verbose) System.out.println("[warn] - Too many dispatch() methods found in " + superClass.getName());
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Too many dispatch() methods found in " + superClass.getName());
}
for (int i = 0 ; i < superDispatches.length ; i++)
@@ -1353,10 +1357,9 @@
}
else if (AspectManager.verbose)
{
- System.out.print("[warn] No matching advice called '" + allSetups[i].getAdviceName() +
+ logger.warn("No matching advice called '" + allSetups[i].getAdviceName() +
"' could be found in " + allSetups[i].getAspectClass().getName() +
- " for joinpoint " + info + ":");
- System.out.println(AdviceMethodFactory.getAdviceMatchingMessage());
+ " for joinpoint " + info + ":" + AdviceMethodFactory.getAdviceMatchingMessage());
}
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinpointSimpleClassifier.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -30,6 +30,8 @@
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 +48,7 @@
*/
public class JoinpointSimpleClassifier extends JoinpointClassifier
{
-
+ private static final Logger logger = AOPLogger.getLogger(JoinpointSimpleClassifier.class);
/**
* Classifies the execution of a joinpoint. The joinpoint being classified
* is identified by <code>matcher</code>.
@@ -64,16 +66,16 @@
if (joinpointMatcher.matches(pointcut, advisor, member))
{
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[debug] " + member + " matches pointcut: " + pointcut.getExpr());
+ logger.debug(member + " matches pointcut: " + pointcut.getExpr());
}
return JoinpointClassification.WRAPPED;
}
}
- if (AspectManager.verbose)
+ if (AspectManager.verbose && logger.isDebugEnabled())
{
- System.out.println("[debug] " + member + " matches no pointcuts");
+ logger.debug(member + " matches no pointcuts");
}
return JoinpointClassification.NOT_INSTRUMENTED;
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -32,6 +32,8 @@
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
@@ -41,6 +43,8 @@
*/
public abstract class OptimizedBehaviourInvocations extends OptimizedInvocations
{
+ private static final Logger logger = AOPLogger.getLogger(OptimizedBehaviourInvocations.class);
+
/**
* Name of method that enforces consistency between the values contained in typed
* argument fields and those contained in arguments array.
@@ -149,7 +153,7 @@
}
catch (CannotCompileException e)
{
- System.out.println(sb.toString());
+ logger.error(sb.toString());
throw e;
}
dispatch.setModifiers(in.getModifiers());
@@ -189,7 +193,7 @@
}
catch(CannotCompileException e)
{
- System.out.println(code.toString());
+ logger.error(code.toString());
throw e;
}
setArguments.setModifiers(template.getModifiers());
@@ -239,7 +243,7 @@
}
catch(CannotCompileException e)
{
- System.out.println(code.toString());
+ logger.error(code.toString());
throw e;
}
@@ -294,7 +298,7 @@
}
catch(CannotCompileException e)
{
- System.out.println(code.toString());
+ logger.error(code.toString());
throw e;
}
assureArgsConsistency.setModifiers(javassist.Modifier.FINAL);
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -32,6 +32,8 @@
import javassist.NotFoundException;
import org.jboss.aop.classpool.AOPClassPool;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* Comment
@@ -41,6 +43,7 @@
*/
public class OptimizedCallerInvocations extends OptimizedBehaviourInvocations
{
+ private static final Logger logger = AOPLogger.getLogger(OptimizedBehaviourInvocations.class);
protected static String createOptimizedMethodCalledByConInvocationClass(
Instrumentor instrumentor,
@@ -225,7 +228,7 @@
}
catch (CannotCompileException e)
{
- System.out.println(copyCode);
+ logger.error(copyCode);
throw e;
}
copy.setModifiers(copyTemplate.getModifiers());
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -28,6 +28,8 @@
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
@@ -37,6 +39,8 @@
*/
public abstract class MatcherStrategy
{
+ private static final Logger logger = AOPLogger.getLogger(MatcherStrategy.class);
+
private final static MatcherStrategy ADVISOR_MATCHER_STRATEGY = new AdvisorMatcherStrategy();
private final static MatcherStrategy PROXY_MATCHER_STRATEGY = new ProxyMatcherStrategy();
@@ -69,7 +73,7 @@
{
if (AspectManager.verbose)
{
- System.out.println("[warn] The annotation @" + sub + " referenced in one of your pointcut expressions can not be found");
+ logger.warn("The annotation @" + sub + " referenced in one of your pointcut expressions can not be found");
}
return false;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ClassProxyContainer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ClassProxyContainer.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ClassProxyContainer.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -84,7 +84,6 @@
protected void createMethodMap()
{
initAdvisedMethodsMap();
- //System.out.println("============================================ Create method map - " + this + " " + clazz.getName());
try
{
Method[] declaredMethods = clazz.getMethods();
@@ -105,7 +104,6 @@
{
// this is a mixin method or a proxy method
}
- //System.out.println("--------> Adding method " + method);
advisedMethods.put(hash, method);
}
}
@@ -148,7 +146,6 @@
if (advisedMethods.get(hash) == null)
{
advisedMethods.put(hash, ifaceMethods[k]);
- //System.out.println("--------> Adding method " + ifaceMethods[k]);
}
}
}
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 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -26,6 +26,8 @@
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;
/**
*
@@ -34,6 +36,7 @@
*/
public class GeneratedAOPProxyFactory implements AOPProxyFactory
{
+ private static final Logger logger = AOPLogger.getLogger(GeneratedAOPProxyFactory.class);
/**
* Create a proxy
*
@@ -53,8 +56,8 @@
params.setObjectAsSuperClass(true);
params.setTarget(target);
Object proxy = proxyFactory.createAdvisedProxy(params);
- if( AspectManager.verbose )
- System.out.println("[debug] Created proxy: "+proxy.getClass()+"@"+System.identityHashCode(proxy)+" target: "+target.getClass());
+ if( AspectManager.verbose && logger.isDebugEnabled())
+ logger.debug("Created proxy: "+proxy.getClass()+"@"+System.identityHashCode(proxy)+" target: "+target.getClass());
return interfaceClass.cast(proxy);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/AOPTransformer.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -63,20 +63,16 @@
public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException
{
className = className.replace('/', '.');
- //System.out.println("<<< loading " + className);
try
{
if (classBeingRedefined != null || isNonAdvisableClassName(className))
{
- //System.out.println(" ignoring");
return null;
}
- //System.out.println(" transforming");
return aspectTransform(className, loader, classBeingRedefined, protectionDomain, classfileBuffer);
}
finally
{
- //System.out.println("finished " + className + ">>>");
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Compiler.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Compiler.java 2007-05-15 11:55:49 UTC (rev 63046)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/Compiler.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -43,6 +43,8 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.Deployment;
import org.jboss.aop.instrument.TransformationException;
+import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.logging.Logger;
/**
* takes jar or class files and adds needed jboss bytecode
@@ -52,6 +54,7 @@
*/
public class Compiler
{
+ private static final Logger logger = AOPLogger.getLogger(Compiler.class);
private FileFilter classFileFilter = new FileFilter()
{
public boolean accept(File pathname)
Added: 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 (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/AOPLogger.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -0,0 +1,75 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.util.logging;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A thin wrapper around the jboss logging framework, so that if a proper logger is not installed
+ * we get the output redirected to System.out.
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class AOPLogger extends Logger
+{
+ private static final long serialVersionUID = 1L;
+
+ static {
+ init();
+ }
+
+ protected AOPLogger(String arg0)
+ {
+ super(arg0);
+ }
+
+ public static Logger getLogger(String name)
+ {
+ return Logger.getLogger(name);
+ }
+
+ public static Logger getLogger(String name, String suffix)
+ {
+ return Logger.getLogger(name + "." + suffix);
+ }
+
+ public static Logger getLogger(Class clazz)
+ {
+ return Logger.getLogger(clazz);
+ }
+
+ public static Logger getLogger(Class clazz, String suffix)
+ {
+ return Logger.getLogger(clazz.getName() + "." + suffix);
+ }
+
+
+ protected static void init()
+ {
+ if (pluginClass == org.jboss.logging.NullLoggerPlugin.class)
+ {
+ pluginClass = SystemOutLoggerPlugin.class;
+ pluginClassName = SystemOutLoggerPlugin.class.getName();
+ }
+ }
+}
Added: projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/SystemOutLoggerPlugin.java 2007-05-15 11:57:47 UTC (rev 63047)
@@ -0,0 +1,122 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.util.logging;
+
+import org.jboss.logging.LoggerPlugin;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class SystemOutLoggerPlugin implements LoggerPlugin
+{
+ String name;
+ public void debug(Object message)
+ {
+ print("[aop-debug]", message, null);
+ }
+
+ public void debug(Object message, Throwable t)
+ {
+ print("[aop-debug]", message, t);
+ }
+
+ public void error(Object message)
+ {
+ print("[aop-error]", message, null);
+ }
+
+ public void error(Object message, Throwable t)
+ {
+ print("[aop-error]", message, t);
+ }
+
+ public void fatal(Object message)
+ {
+ print("[aop-fatal]", message, null);
+ }
+
+ public void fatal(Object message, Throwable t)
+ {
+ print("[aop-debug]", message, t);
+ }
+
+ public void info(Object message)
+ {
+ print("[aop-info]", message, null);
+ }
+
+ public void info(Object message, Throwable t)
+ {
+ print("[aop-info]", message, t);
+ }
+
+ public void init(String name)
+ {
+ this.name = name;
+ }
+
+ public boolean isDebugEnabled()
+ {
+ return true;
+ }
+
+ public boolean isInfoEnabled()
+ {
+ return true;
+ }
+
+ public boolean isTraceEnabled()
+ {
+ return true;
+ }
+
+ public void trace(Object message)
+ {
+ print("[aop-trace]", message, null);
+ }
+
+ public void trace(Object message, Throwable t)
+ {
+ print("[aop-trace]", message, null);
+ }
+
+ public void warn(Object message)
+ {
+ print("[aop-warn]", message, null);
+ }
+
+ public void warn(Object message, Throwable t)
+ {
+ print("[aop-warn]", message, null);
+ }
+
+ private void print(String prefix, Object message, Throwable t)
+ {
+ System.out.println(prefix + " " + name + " " + message);
+ if (t != null)
+ {
+ t.printStackTrace(System.out);
+ }
+ }
+}
More information about the jboss-cvs-commits
mailing list