Update to aspectj 1.6.1

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@683127 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 3 deletions

diff --git a/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
index 91489bae7d..7a6e4c5ded 100644
--- a/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
+++ b/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
@@ -35,15 +35,19 @@ public abstract class TracingAspect {
     @Pointcut("")
     protected abstract void entry();
 
-    @Pointcut("call(* java..*.*(..))")
+    /** ignore join points outside this scope - use within(..) */
+    @Pointcut("")
+    protected abstract void withinScope();
+
+    @Pointcut("withinScope() && call(* java..*.*(..))")
     protected void exit() {
     }
 
-    @Pointcut("entry() && !cflowbelow(entry())")
+    @Pointcut("withinScope() && entry() && !cflowbelow(entry())")
     void start() {
     }
 
-    @Pointcut("cflow(entry()) && !exit() && !cflowbelow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect)")
+    @Pointcut("withinScope() && cflow(entry()) && !cflowbelow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect)")
     void trace() {
     }