You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2010/01/21 13:33:15 UTC
svn commit: r901680 - in
/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj: META-INF/
src/main/java/org/apache/tuscany/sca/aspectj/ src/main/resources/META-INF/
Author: ramkumar
Date: Thu Jan 21 12:33:11 2010
New Revision: 901680
URL: http://svn.apache.org/viewvc?rev=901680&view=rev
Log:
Added UserTimingAspect class to make the timing aspect work
Added:
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java (with props)
Modified:
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
Modified: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/MANIFEST.MF?rev=901680&r1=901679&r2=901680&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/MANIFEST.MF Thu Jan 21 12:33:11 2010
@@ -6,8 +6,8 @@
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-Description: Apache Tuscany SCA AOP-based Logging and Tracing
-Import-Package: org.aspectj.lang;version="1.6.2",
- org.aspectj.lang.annotation;version="1.6.2"
+Import-Package: org.aspectj.lang.*;version="1.6.2",
+ org.aspectj.lang.annotation.*;version="1.6.2"
Bundle-SymbolicName: org.apache.tuscany.sca.aspectj
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Modified: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java?rev=901680&r1=901679&r2=901680&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java Thu Jan 21 12:33:11 2010
@@ -22,11 +22,8 @@
import java.util.Arrays;
import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut;
Modified: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java?rev=901680&r1=901679&r2=901680&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java Thu Jan 21 12:33:11 2010
@@ -19,8 +19,6 @@
package org.apache.tuscany.sca.aspectj;
-import java.util.Arrays;
-
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
Modified: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java?rev=901680&r1=901679&r2=901680&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java Thu Jan 21 12:33:11 2010
@@ -19,16 +19,9 @@
package org.apache.tuscany.sca.aspectj;
-import java.util.Arrays;
-
-import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut;
/**
Added: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java?rev=901680&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java Thu Jan 21 12:33:11 2010
@@ -0,0 +1,26 @@
+package org.apache.tuscany.sca.aspectj;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+
+@Aspect
+public class UserTimingAspect {
+ @Pointcut
+ public void timedCall() {
+
+ }
+
+ @Around("timedCall()")
+ public Object timedSection(ProceedingJoinPoint jp) throws Throwable {
+ System.out.println("Timing Around timedSection jp=" + jp);
+ long start = System.currentTimeMillis();
+ try {
+ return jp.proceed();
+ } finally {
+ long end = System.currentTimeMillis();
+ System.out.println("Timing Around timedSection Roundtrip is " + (end - start) + "ms for jp.getSignature=" + jp.getSignature());
+ }
+ }
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml?rev=901680&r1=901679&r2=901680&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml Thu Jan 21 12:33:11 2010
@@ -28,8 +28,7 @@
<!-- the TimingAspect. Which ever calls you define in this pointcut -->
<!-- will be timed and displayed in the logs. -->
<concrete-aspect name="org.apache.tuscany.sca.aspectj.UserTimingAspect"
- extends="org.apache.tuscany.sca.aspectj.TimingAspect"
- precedence="org.apache.tuscany.sca.aspectj.UserTimingAspect, *">
+ extends="org.apache.tuscany.sca.aspectj.TimingAspect">
<pointcut name="timedCall"
expression="call(* java.util.logging.Logger.info(..))"/>
</concrete-aspect>