You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/08/06 08:19:26 UTC
svn commit: r683127 - in /tuscany/sandbox/rfeng/aop-logging: pom.xml
src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java
Author: rfeng
Date: Tue Aug 5 23:19:25 2008
New Revision: 683127
URL: http://svn.apache.org/viewvc?rev=683127&view=rev
Log:
Update to aspectj 1.6.1
Modified:
tuscany/sandbox/rfeng/aop-logging/pom.xml
tuscany/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
tuscany/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java
Modified: tuscany/sandbox/rfeng/aop-logging/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/aop-logging/pom.xml?rev=683127&r1=683126&r2=683127&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/aop-logging/pom.xml (original)
+++ tuscany/sandbox/rfeng/aop-logging/pom.xml Tue Aug 5 23:19:25 2008
@@ -22,22 +22,29 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.4-SNAPSHOT</version>
+<!--
<relativePath>../pom.xml</relativePath>
+-->
</parent>
<artifactId>tuscany-aop-logging</artifactId>
<name>Apache Tuscany AOP-based Logging and Tracing</name>
<dependencies>
<dependency>
- <groupId>aspectj</groupId>
+ <groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.5.3</version>
+ <version>1.6.1</version>
</dependency>
<dependency>
- <groupId>aspectj</groupId>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjlib</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.5.3</version>
+ <version>1.6.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -59,14 +66,14 @@
<!-- I hit a bug in maven-surefire-plugin
http://jira.codehaus.org/browse/SUREFIRE-128 -->
<!--
- <argLine>-ea -Xmx128m -javaagent:"${settings.localRepository}/aspectj/aspectjweaver/1.5.3/aspectjweaver-1.5.3.jar"</argLine>
+ <argLine>-ea -Xmx128m -javaagent:"${settings.localRepository}/aspectj/aspectjweaver/1.6.1/aspectjweaver-1.6.1.jar"</argLine>
-->
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0</version>
<configuration>
<complianceLevel>1.5</complianceLevel>
<!--
Modified: tuscany/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java?rev=683127&r1=683126&r2=683127&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java (original)
+++ tuscany/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java Tue Aug 5 23:19:25 2008
@@ -35,15 +35,19 @@
@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() {
}
Modified: tuscany/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java?rev=683127&r1=683126&r2=683127&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java (original)
+++ tuscany/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java Tue Aug 5 23:19:25 2008
@@ -41,6 +41,10 @@
@Pointcut("execution(* org.apache.tuscany.sca.aspectj.TracingTestCase.testAOP(..))")
protected void entry() {
}
+
+ @Pointcut("within(org.apache.tuscany.sca..*)")
+ protected void withinScope() {
+ }
@Override
protected void logEnter(StaticPart jp) {