Author: rfeng
Date: Wed Aug 6 00:41:25 2008
New Revision: 683143
URL: http://svn.apache.org/viewvc?rev=683143&view=rev
Log:
Update pointcuts
Removed:
tuscany/sandbox/rfeng/aop-logging/.checkstyle
tuscany/sandbox/rfeng/aop-logging/.pmd
tuscany/sandbox/rfeng/aop-logging/.ruleset
tuscany/sandbox/rfeng/aop-logging/LICENSE.txt
tuscany/sandbox/rfeng/aop-logging/NOTICE.txt
Modified:
tuscany/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java
tuscany/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml
tuscany/sandbox/rfeng/aop-logging/test.bat
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=683143&r1=683142&r2=683143&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
Wed Aug 6 00:41:25 2008
@@ -38,11 +38,11 @@
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() {
}
Modified: tuscany/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml?rev=683143&r1=683142&r2=683143&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml
(original)
+++ tuscany/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml Wed
Aug 6 00:41:25 2008
@@ -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>
Modified: tuscany/sandbox/rfeng/aop-logging/test.bat
URL:
http://svn.apache.org/viewvc/tuscany/sandbox/rfeng/aop-logging/test.bat?rev=683143&r1=683142&r2=683143&view=diff
==============================================================================
--- tuscany/sandbox/rfeng/aop-logging/test.bat (original)
+++ tuscany/sandbox/rfeng/aop-logging/test.bat Wed Aug 6 00:41:25 2008
@@ -1,3 +1,5 @@
@echo off
set ASPECTJ_HOME=c:\aspectj1.6
-call %ASPECTJ_HOME%\bin\aj5.bat -cp target\classes;target\test-classes
org.apache.tuscany.sca.aspectj.TracingTestCase
\ No newline at end of file
+set TUSCANY_HOME=C:\Apache\tuscany-sca-1.3
+set
CP=%TUSCANY_HOME%\lib\tuscany-sca-manifest.jar;%TUSCANY_HOME%\samples\calculator\target\sample-calculator.jar
+call %ASPECTJ_HOME%\bin\aj5.bat -cp %CP%;target\classes;target\test-classes
calculator.CalculatorClient
\ No newline at end of file
