@@ -186,6 +186,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor { | |||
} | |||
String resourcePath = System.getProperty("org.aspectj.weaver.loadtime.configuration",AOP_XML); | |||
trace.event("parseDefinitions",this,resourcePath); | |||
StringTokenizer st = new StringTokenizer(resourcePath,";"); | |||
while(st.hasMoreTokens()){ |
@@ -34,14 +34,6 @@ public abstract class AbstractTrace implements Trace { | |||
public abstract void exit(String methodName, Throwable th); | |||
public void event(String methodName) { | |||
throw new UnsupportedOperationException("event"); | |||
} | |||
public void event(String methodName, Object thiz, Object[] args) { | |||
throw new UnsupportedOperationException("event"); | |||
} | |||
/* | |||
* Convenience methods | |||
*/ | |||
@@ -61,6 +53,10 @@ public abstract class AbstractTrace implements Trace { | |||
exit(methodName,new Boolean(b)); | |||
} | |||
public void event (String methodName, Object thiz, Object arg) { | |||
event(methodName,thiz,new Object[] { arg }); | |||
} | |||
public void warn(String message) { | |||
warn(message,null); | |||
} |
@@ -54,6 +54,18 @@ public class CommonsTrace extends AbstractTrace { | |||
} | |||
} | |||
public void event(String methodName, Object thiz, Object[] args) { | |||
if (log.isDebugEnabled()) { | |||
log.debug(formatMessage("-", className, methodName, thiz, args)); | |||
} | |||
} | |||
public void event(String methodName) { | |||
if (log.isDebugEnabled()) { | |||
log.debug(formatMessage("-", className, methodName, null, null)); | |||
} | |||
} | |||
public boolean isTraceEnabled () { | |||
return log.isDebugEnabled(); | |||
} |
@@ -55,6 +55,19 @@ public class DefaultTrace extends AbstractTrace { | |||
println(formatMessage("<",tracedClass.getName(),methodName,th, null)); | |||
} | |||
} | |||
public void event(String methodName, Object thiz, Object[] args) { | |||
if (traceEnabled) { | |||
println(formatMessage("-",tracedClass.getName(),methodName,thiz, args)); | |||
} | |||
} | |||
public void event(String methodName) { | |||
if (traceEnabled) { | |||
println(formatMessage("-",tracedClass.getName(),methodName,null,null)); | |||
} | |||
} | |||
public void debug (String message) { | |||
println(formatMessage("?",message,null)); | |||
} |
@@ -51,6 +51,8 @@ public interface Trace { | |||
public void enter (String methodName, Object thiz, boolean z); | |||
public void exit (String methodName, boolean b); | |||
public void event (String methodName, Object thiz, Object arg); | |||
public boolean isTraceEnabled (); | |||
@@ -73,6 +73,18 @@ public abstract class AbstractTraceTest extends TestCase { | |||
trace.exit("testExit"); | |||
} | |||
public void testEvent() { | |||
trace.event("testEvent"); | |||
} | |||
public void testEventWithThisAndArgs() { | |||
trace.event("testEventWithThisAndArgs",this,new Object[] { "arg1", "arg2" }); | |||
} | |||
public void testEventWithThisAndArg() { | |||
trace.event("testEventWithThisAndArg",this,"arg1"); | |||
} | |||
public void testDebug() { | |||
trace.debug("debug"); | |||
} |
@@ -56,6 +56,21 @@ public class Jdk14Trace extends AbstractTrace { | |||
} | |||
} | |||
public void event(String methodName, Object thiz, Object[] args) { | |||
if (logger.isLoggable(Level.FINE)) { | |||
logger.logp(Level.FINER,name,methodName,"EVENT",formatObj(thiz)); | |||
if (args != null && logger.isLoggable(Level.FINER)) { | |||
logger.logp(Level.FINER,name,methodName,"EVENT",args); | |||
} | |||
} | |||
} | |||
public void event(String methodName) { | |||
if (logger.isLoggable(Level.FINE)) { | |||
logger.logp(Level.FINER,name,methodName,"EVENT"); | |||
} | |||
} | |||
public boolean isTraceEnabled() { | |||
return logger.isLoggable(Level.FINER); | |||
} |