summaryrefslogtreecommitdiffstats
path: root/sandbox/rfeng/aop-logging/src
diff options
context:
space:
mode:
Diffstat (limited to 'sandbox/rfeng/aop-logging/src')
-rw-r--r--sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java4
-rw-r--r--sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml4
2 files changed, 5 insertions, 3 deletions
diff --git a/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java b/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java
index 4babfcca65..7c04341718 100644
--- a/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java
+++ b/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java
@@ -38,11 +38,11 @@ public class MyTracingAspect extends TracingAspect {
System.out.println("completeLog()");
}
- @Pointcut("execution(* org.apache.tuscany.sca.aspectj.TracingTestCase.testAOP(..))")
+ @Pointcut("execution(public * org.apache.tuscany.sca..*.*(..))")
protected void entry() {
}
- @Pointcut("within(org.apache.tuscany.sca..*)")
+ @Pointcut("within(org.apache.tuscany.sca..*) && !within(org.apache.tuscany.sca.aspectj.*Aspect)")
protected void withinScope() {
}
diff --git a/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml b/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml
index c9aeee3a63..d42fdd9897 100644
--- a/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml
+++ b/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml
@@ -3,13 +3,15 @@
<aspects>
<!-- declare two existing aspects to the weaver -->
<aspect name="org.apache.tuscany.sca.aspectj.MyTracingAspect" />
+ <!--
<aspect name="org.apache.tuscany.sca.aspectj.LoggingAspect" />
+ -->
</aspects>
<!--weaver options="-verbose -debug -showWeaveInfo"-->
<weaver options="">
- <include within="org.apache.tuscany.sca.aspectj.TracingTestCase" />
+ <include within="org.apache.tuscany.sca..*" />
</weaver>
</aspectj>