[jboss-cvs] JBossAS SVN: r77493 - in projects/aop/trunk/aop/src/main/org/jboss/aop: advice and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 26 11:09:30 EDT 2008
Author: stalep
Date: 2008-08-26 11:09:29 -0400 (Tue, 26 Aug 2008)
New Revision: 77493
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.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/ClassicWeavingStrategy.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java
projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedClassAdvisor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/CallerTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/AOPLogger.java
Log:
[JBAOP-623] Changed AOPLogger to check if NullLoggerPlugin was used properly, if it is we use our own LoggerPlugin.
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java 2008-08-26 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -75,6 +75,7 @@
import org.jboss.aop.pointcut.PointcutMethodMatch;
import org.jboss.aop.util.JoinPointComparator;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
+import org.jboss.aop.util.logging.AOPLogger;
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.signature.ConstructorSignature;
import org.jboss.metadata.spi.signature.FieldSignature;
@@ -219,6 +220,8 @@
*/
protected static Object NULL_ASPECT = new Object();
+ private static final AOPLogger logger = AOPLogger.getLogger(Advisor.class);
+
//When resolving annotations from the annotation repository we don't want to hit the annotation repository with the metadata from base-aspects.xml (@security, @transaction etc.)
//EJB 3 uses a custom metadata loader that tries to load up all these classes by name, and that will cause errors when loading up the annotations
@@ -1345,7 +1348,7 @@
throw new RuntimeException(e);
}
*/
- System.err.println("[debug] method matched binding: " + method.toString());
+ logger.debug("method matched binding: " + method.toString());
}
binding.addAdvisor(this);
MethodMatchInfo info = methodInfos.getMatchInfo(keys[i]);
@@ -1370,7 +1373,7 @@
{
if (AspectManager.verbose)
{
- System.err.println("[debug] removing matched binding: "+method.toString());
+ logger.debug("removing matched binding: "+method.toString());
}
MethodMatchInfo info = methodInfos.getMatchInfo(keys[i]);
info.removeMatchedBinding(binding, match);
@@ -1396,7 +1399,7 @@
if ((!write && binding.getPointcut().matchesGet(this, field))
|| (write && binding.getPointcut().matchesSet(this, field)))
{
- if (AspectManager.verbose) System.err.println("[debug] Removing field, matched " + ((write) ? "write" : "read") + " binding: " + field);
+ if (AspectManager.verbose) logger.debug("Removing field, matched " + ((write) ? "write" : "read") + " binding: " + field);
fieldInfos[i].clear();
for(AdviceBinding ab : bindings)
@@ -1428,7 +1431,7 @@
Constructor<?> constructor = constructors[i];
if (binding.getPointcut().matchesExecution(this, constructor))
{
- if (AspectManager.verbose) System.err.println("[debug] Removing constructor, matched binding: " + constructor);
+ if (AspectManager.verbose) logger.debug("Removing constructor, matched binding: " + constructor);
constructorInfos[i].clear();
for(AdviceBinding ab : bindingCol.getConstructorExecutionBindings())
{
@@ -1458,7 +1461,7 @@
Constructor<?> constructor = info.getConstructor();
if (binding.getPointcut().matchesConstruction(this, constructor))
{
- if (AspectManager.verbose) System.err.println("[debug] Removing construction, matched binding: " + constructor);
+ if (AspectManager.verbose) logger.debug("Removing construction, matched binding: " + constructor);
constructionInfos[i].clear();
for(AdviceBinding ab : bindingCol.getConstructionBindings())
{
@@ -1848,7 +1851,7 @@
Constructor<?> constructor = constructors[i];
if (binding.getPointcut().matchesExecution(this, constructor))
{
- if (AspectManager.verbose) System.err.println("[debug] constructor matched binding: " + constructor);
+ if (AspectManager.verbose) logger.debug("constructor matched binding: " + constructor);
adviceBindings.add(binding);
binding.addAdvisor(this);
pointcutResolved(constructorInfos[i], binding, new ConstructorJoinpoint(constructor));
@@ -1871,7 +1874,7 @@
Constructor<?> constructor = info.getConstructor();
if (binding.getPointcut().matchesConstruction(this, constructor))
{
- if (AspectManager.verbose) System.err.println("[debug] construction matched binding: " + constructor);
+ if (AspectManager.verbose) logger.debug("construction matched binding: " + constructor);
adviceBindings.add(binding);
binding.addAdvisor(this);
pointcutResolved(info, binding, new ConstructorJoinpoint(constructor));
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 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -991,8 +991,7 @@
}
catch (Exception e)
{
- System.err.println("[error] " + e.getMessage() + " " + url);
- if (AspectManager.verbose) e.printStackTrace();
+ logger.error(e.getMessage() + " " + url, e);
throw new RuntimeException(e);
}
}
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 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -441,7 +441,7 @@
if ((!write && binding.getPointcut().matchesGet(this, field))
|| (write && binding.getPointcut().matchesSet(this, field)))
{
- if (AspectManager.verbose) System.err.println("[debug] field matched " + ((write) ? "write" : "read") + " binding: " + field);
+ if (AspectManager.verbose) logger.debug("field matched " + ((write) ? "write" : "read") + " binding: " + field);
adviceBindings.add(binding);
binding.addAdvisor(this);
pointcutResolved(newFieldInfos[i], binding, new FieldJoinpoint(field));
@@ -1301,7 +1301,7 @@
public void addConstructorCallerPointcut(int callingIndex, String calledClass, long calledMethodHash, AdviceBinding binding) throws Exception
{
- if (AspectManager.verbose) System.err.println("constructor call matched binding " + binding.getPointcut().getExpr());
+ if (AspectManager.verbose) logger.debug("constructor call matched binding " + binding.getPointcut().getExpr());
adviceBindings.add(binding);
binding.addAdvisor(this);
HashMap<String, TLongObjectHashMap> callingCon = methodCalledByConBindings[callingIndex];
@@ -1339,7 +1339,7 @@
private void addConstructorCalledByConPointcut(int callingIndex, String calledClass, long calledConHash, AdviceBinding binding) throws Exception
{
- if (AspectManager.verbose) System.err.println("constructor call matched binding " + binding.getPointcut().getExpr());
+ if (AspectManager.verbose) logger.debug("constructor call matched binding " + binding.getPointcut().getExpr());
adviceBindings.add(binding);
binding.addAdvisor(this);
HashMap<String, TLongObjectHashMap> callingCon = conCalledByConBindings[callingIndex];
@@ -2488,7 +2488,7 @@
private void addMethodCalledByMethodPointcut(long callingMethodHash, String calledClass, long calledMethodHash, AdviceBinding binding) throws Exception
{
//Called via resolveCallerMethodInfo, maps are initialised
- if (AspectManager.verbose) System.err.println("method call matched binding " + binding.getPointcut().getExpr());
+ if (AspectManager.verbose) logger.debug("method call matched binding " + binding.getPointcut().getExpr());
adviceBindings.add(binding);
binding.addAdvisor(ClassAdvisor.this);
HashMap<String, TLongObjectHashMap> callingMethod = (HashMap<String, TLongObjectHashMap>)methodCalledByMethodBindings.get(callingMethodHash);
@@ -2767,7 +2767,7 @@
private void addConstructorCalledByMethodPointcut(long callingMethodHash, String calledClass, long calledMethodHash, AdviceBinding binding) throws Exception
{
- if (AspectManager.verbose) System.err.println("method call matched binding " + binding.getPointcut().getExpr());
+ if (AspectManager.verbose) logger.debug("method call matched binding " + binding.getPointcut().getExpr());
adviceBindings.add(binding);
binding.addAdvisor(ClassAdvisor.this);
HashMap<String, TLongObjectHashMap> callingMethod = (HashMap<String, TLongObjectHashMap>) conCalledByMethodBindings.get(callingMethodHash);
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 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassicWeavingStrategy.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -131,9 +131,9 @@
if (!(ex instanceof NotFoundException))
{
if (verbose)
- ex.printStackTrace();
+ logger.error(ex);
else
- System.err.println("[error] " + ex.getMessage() + ".. Do verbose mode if you want full stack trace.");
+ logger.error("[error] " + ex.getMessage() + ".. Do verbose mode if you want full stack trace.");
}
throw ex;
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 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -97,10 +97,10 @@
String path = System.getProperty("jboss.aop.class.path", null);
if (path == null)
{
- if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("jboss.aop.class.path is NULL");
+ if (AspectManager.verbose) logger.debug("jboss.aop.class.path is NULL");
return;
}
- if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("jboss.aop.class.path: " + path);
+ if (AspectManager.verbose) logger.debug("jboss.aop.class.path: " + path);
StringTokenizer t = new StringTokenizer(path, File.pathSeparator);
while (t.hasMoreTokens())
{
@@ -108,7 +108,7 @@
File f = new File(token);
if (!f.exists())
{
- System.err.println("[error] Unable to find jboss.aop.class.path: " + f.getName());
+ logger.error("Unable to find jboss.aop.class.path: " + f.getName());
}
try
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedClassAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedClassAdvisor.java 2008-08-26 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedClassAdvisor.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -54,6 +54,7 @@
import org.jboss.aop.joinpoint.MethodJoinpoint;
import org.jboss.aop.pointcut.PointcutMethodMatch;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
+import org.jboss.aop.util.logging.AOPLogger;
/**
* Comment
@@ -70,6 +71,7 @@
public static final String ADD_FIELD_WRITE_INFO = "addFieldWriteInfo";
public static final String GET_PARENT_ADVISOR = "getParentAdvisor";
+ private static final AOPLogger logger = AOPLogger.getLogger(GeneratedClassAdvisor.class);
// TODO Flavia
// ArrayList<ConstructorInfo> constructorInfos = new ArrayList();
@@ -288,7 +290,7 @@
adviceBindings.add(binding);
if (AspectManager.verbose)
{
- System.err.println("method matched binding " + binding.getPointcut().getExpr() + " " + method.toString());
+ logger.error("method matched binding " + binding.getPointcut().getExpr() + " " + method.toString());
}
binding.addAdvisor(this);
pointcutResolved(info, binding, new MethodJoinpoint(method));
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 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -89,10 +89,9 @@
if (!(ex instanceof NotFoundException))
{
if (verbose)
- ex.printStackTrace();
+ logger.error(ex);
else
- System.err.println("[error] " + ex.getMessage() +
- ".. Do verbose mode if you want full stack trace.");
+ logger.error(ex.getMessage()+".. Do verbose mode if you want full stack trace.");
}
throw ex;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java 2008-08-26 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/PrecedenceSorter.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -27,6 +27,7 @@
import java.util.LinkedHashMap;
import org.jboss.aop.AspectManager;
+import org.jboss.aop.util.logging.AOPLogger;
/**
*
@@ -35,6 +36,8 @@
*/
public class PrecedenceSorter
{
+ private static final AOPLogger logger = AOPLogger.getLogger(PrecedenceSorter.class);
+
static Comparator<InterceptorEntry> interceptorComparator = new Comparator<InterceptorEntry>()
{
public int compare(InterceptorEntry objA, InterceptorEntry objB)
@@ -122,7 +125,7 @@
}
catch (RuntimeException e)
{
- System.err.print(interceptor.getName());
+ logger.error(interceptor.getName());
throw 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 2008-08-26 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/CallerTransformer.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -364,7 +364,7 @@
}
catch (Exception ex)
{
- System.err.println("error getting:" + classname + ". '" + methodName + "'");
+ logger.error("error getting:" + classname + ". '" + methodName + "'");
ex.printStackTrace();
throw new CannotCompileException(ex);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 2008-08-26 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -42,6 +42,7 @@
import org.jboss.aop.MethodByMethodInfo;
import org.jboss.aop.MethodInfo;
import org.jboss.aop.classpool.AOPClassPool;
+import org.jboss.aop.util.logging.AOPLogger;
/**
* Comment
@@ -51,6 +52,7 @@
*/
public class GeneratedAdvisorInstrumentor extends Instrumentor
{
+ private static final AOPLogger logger = AOPLogger.getLogger(GeneratedAdvisorInstrumentor.class);
//field names in advised class
private static final String CURRENT_ADVISOR = "currentAdvisor$aop";
private static final String INSTANCE_ADVISOR = "instanceAdvisor$aop";
@@ -130,7 +132,7 @@
{
if (AspectManager.suppressTransformationErrors)
{
- System.err.println("[warn] AOP Instrumentor failed to transform " + clazz.getName());
+ logger.error("[warn] AOP Instrumentor failed to transform " + clazz.getName());
e.printStackTrace();
return false;
}
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 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/Instrumentor.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -806,8 +806,7 @@
{
if (AspectManager.suppressTransformationErrors)
{
- System.err.println("[warn] AOP Instrumentor failed to transform " + clazz.getName());
- e.printStackTrace();
+ logger.error("[warn] AOP Instrumentor failed to transform " + clazz.getName(), e);
return false;
}
else
@@ -1018,8 +1017,7 @@
e.printStackTrace();
if (AspectManager.suppressTransformationErrors)
{
- System.err.println("[warn] AOP Instrumentor failed to updated wrapping status.");
- e.printStackTrace();
+ logger.error("[warn] AOP Instrumentor failed to updated wrapping status.", e);
}
else
{
@@ -1119,8 +1117,7 @@
e.printStackTrace();
if (AspectManager.suppressTransformationErrors)
{
- System.err.println("[warn] AOP Instrumentor failed to updated wrapping status.");
- e.printStackTrace();
+ logger.error("[warn] AOP Instrumentor failed to updated wrapping status.", e);
}
else if (e instanceof TransformationException)
{
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 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -382,17 +382,17 @@
}
catch (NotFoundException e)
{
- System.err.println("Exception generating " + className + ": " + e.getMessage());
+ logger.error("Exception generating " + className + ": " + e.getMessage(), e);
throw e;
}
catch (CannotCompileException e)
{
- System.err.println("Exception generating " + className + ": " + e.getMessage());
+ logger.error("Exception generating " + className + ": " + e.getMessage(), e);
throw e;
}
catch (ClassNotFoundException e)
{
- System.err.println("Exception generating " + className + ": " + e.getMessage());
+ logger.error("Exception generating " + className + ": " + e.getMessage(), e);
throw e;
}
}
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 15:06:49 UTC (rev 77492)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/logging/AOPLogger.java 2008-08-26 15:09:29 UTC (rev 77493)
@@ -58,20 +58,24 @@
private AOPLogger(final Class<?> clazz)
{
- if(!"org.jboss.logging.Log4jLoggerPlugin.class".equals(org.jboss.logging.Logger.getPluginClassName()))
+ org.jboss.logging.Logger log;
+ log = org.jboss.logging.Logger.getLogger(clazz);
+ if(log.getLoggerPlugin().getClass().getName().equals( org.jboss.logging.NullLoggerPlugin.class.getName()))
{
- 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());
+ org.jboss.logging.Logger.setPluginClassName(SystemOutLoggerPlugin.class.getName());
+ log = org.jboss.logging.Logger.getLogger(clazz);
}
- logger = org.jboss.logging.Logger.getLogger(clazz);
+
+ logger = log;
}
+ @SuppressWarnings("deprecation")
public boolean isInfoEnabled()
{
return logger.isInfoEnabled();
}
+ @SuppressWarnings("deprecation")
public boolean isDebugEnabled()
{
return logger.isDebugEnabled();
More information about the jboss-cvs-commits
mailing list