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/18 11:00:53 UTC
svn commit: r900323 - in
/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj: ./ META-INF/ src/
src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/tuscany/ src/main/java/org/apache/tuscany/sca/
src/main/java/...
Author: ramkumar
Date: Mon Jan 18 10:00:52 2010
New Revision: 900323
URL: http://svn.apache.org/viewvc?rev=900323&view=rev
Log:
Adding aspect bases logging and tracing module in 2.x
Added:
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/LICENSE
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/NOTICE
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/maven-eclipse.xml (with props)
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml (with props)
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java (with props)
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java (with props)
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java (with props)
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java (with props)
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml (with props)
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java (with props)
tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/resources/
Added: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/LICENSE?rev=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/LICENSE (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/LICENSE Mon Jan 18 10:00:52 2010
@@ -0,0 +1,205 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
Added: 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=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/MANIFEST.MF (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/META-INF/MANIFEST.MF Mon Jan 18 10:00:52 2010
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+SCA-Version: 1.1
+Bundle-Name: Apache Tuscany SCA AOP-based Logging and Tracing
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0
+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"
+Bundle-SymbolicName: org.apache.tuscany.sca.aspectj
+Bundle-DocURL: http://www.apache.org/
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Added: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/NOTICE?rev=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/NOTICE (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/NOTICE Mon Jan 18 10:00:52 2010
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/maven-eclipse.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/maven-eclipse.xml?rev=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/maven-eclipse.xml (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/maven-eclipse.xml Mon Jan 18 10:00:52 2010
@@ -0,0 +1,8 @@
+<project default="copy-resources">
+ <target name="init"/>
+ <target name="copy-resources" depends="init">
+ <copy todir="target/classes/META-INF" filtering="true">
+ <fileset dir="." includes="LICENSE|NOTICE"/>
+ </copy>
+ </target>
+</project>
\ No newline at end of file
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/maven-eclipse.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/maven-eclipse.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml?rev=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml Mon Jan 18 10:00:52 2010
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-modules</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-tracing-aspectj</artifactId>
+ <name>Apache Tuscany SCA AOP-based Logging and Tracing</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjlib</artifactId>
+ <version>1.6.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <!-- Copy the aspectjweaver jar to avoid surefire problems for
+ directorites with space -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.6.2</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency
+ </outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: 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=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java Mon Jan 18 10:00:52 2010
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+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;
+
+/**
+ * LoggingAspect performs standard logging of method signatures, arguments, and
+ * return values. All Tuscany methods, constructors, and statics are logged.
+ * @version $Rev$ $Date$
+ */
+@Aspect
+public class LoggingAspect {
+ @Pointcut("call(* org.apache.tuscany.sca..*(..)) && (!within(org.apache.tuscany.sca.aspectj.*Aspect))")
+ public void anyMethodCall() {
+ }
+
+ @Pointcut("execution(* org.apache.tuscany.sca..*(..)) && (!within(org.apache.tuscany.sca.aspectj.*Aspect))")
+ public void anyMethodExecution() {
+ }
+
+ @Pointcut("call(* java.util.logging.Logger.info(..))")
+ public void anyLogCall() {
+ }
+
+ @Pointcut("cflow(anyMethodExecution()) && anyLogCall()")
+ public void anyLog() {
+ }
+
+ @Pointcut("call(org.apache.tuscany.sca..*.new(..))")
+ public void anyConstructor() {
+ }
+
+ // e.g. org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper
+ @Pointcut("staticinitialization(org.apache.tuscany.sca.implementation..*)")
+ public void anyStatic() {
+ }
+
+ @Before("anyMethodCall()")
+ public void before(JoinPoint jp) {
+ // System.out.println("Logging anyMethodCall before jp=" + jp);
+ // System.out.println("Logging anyMethodCall before jp.getSourceLocation=" + jp.getSourceLocation());
+ // System.out.println("Logging anyMethodCall before jp.getThis=" + jp.getThis());
+ // System.out.println("Logging anyMethodCall before jp.getTarget=" + jp.getTarget());
+ System.out.println("Logging Before anyMethodCall jp.getSignature=" + jp.getSignature());
+ java.lang.Object[] args = jp.getArgs();
+ if (( args != null ) && ( args.length > 0 )) {
+ System.out.println("Logging Before anyMethodCall jp.getArgs=" + Arrays.asList(args));
+ }
+ }
+
+ @AfterReturning(pointcut = "anyMethodCall()", returning = "result")
+ public void afterReturning(JoinPoint jp, Object result) {
+ // Note that result is null for methods with void return.
+ System.out.println("Logging AfterReturning anyMethodCall jp=" + jp + ", result=" + result);
+ }
+
+ @AfterThrowing(pointcut = "anyMethodCall()", throwing = "t")
+ public void afterThrowing(JoinPoint jp, Throwable t) {
+ System.out.println("Logging AfterThrowing anyMethodCall jp=" + jp + ", t=" + t);
+ }
+
+ @Before("anyConstructor()")
+ public void beforeConstructor(JoinPoint jp) {
+ System.out.println("Logging Before anyConstructor jp.getSignature=" + jp.getSignature());
+ java.lang.Object[] args = jp.getArgs();
+ if (( args != null ) && ( args.length > 0 )) {
+ System.out.println("Logging Before anyConstructor jp.getArgs=" + Arrays.asList(args));
+ }
+ }
+
+ @Before("anyStatic()")
+ public void beforeStatic(JoinPoint jp) {
+ System.out.println("Logging Before anyStatic before jp=" + jp);
+ System.out.println("Logging anyMethodCall before jp.getSourceLocation=" + jp.getSourceLocation());
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: 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=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java Mon Jan 18 10:00:52 2010
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+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;
+
+/**
+ * SimpleTraceAspect performs tracing of method signatures, arguments, and
+ * return values. All Tuscany methods, constructors, and statics are traced.
+ *
+ * @version $Rev$ $Date$
+ */
+@Aspect
+public class SimpleTracingAspect extends TracingAspect {
+
+ @Pointcut("execution(public * org.apache.tuscany.sca..*.*(..))")
+ // @Pointcut("call(* org.apache.tuscany.sca..*(..))")
+ protected void entry() {
+ }
+
+ @Pointcut("within(org.apache.tuscany.sca..*) && !within(org.apache.tuscany.sca.aspectj..*Aspect)")
+ protected void withinScope() {
+ }
+
+ @Override
+ protected void startLog() {
+ System.out.println(">>> ----------------------------------------------------");
+ }
+
+ @Override
+ protected void completeLog() {
+ System.out.println("<<< ----------------------------------------------------");
+ }
+
+ @Override
+ protected void logEnter(JoinPoint jp) {
+ System.out.println("> logEnter jp.getSignature=" + jp.getSignature());
+ java.lang.Object[] args = jp.getArgs();
+ if (( args != null ) && ( args.length > 0 )) {
+ // See http://www.eclipse.org/aspectj/doc/released/progguide/pitfalls-infiniteLoops.html
+ // System.out.println("Logging anyMethodCall before jp.getArgs=" + Arrays.asList(args));
+ System.out.print(" logEnter jp.getArgs(" + args.length + ")=[" );
+ for ( int i = 0; i < args.length; i++ ){
+ if ( i > 0 ) System.out.print( ",");
+ System.out.print( args[ i ]);
+ }
+ System.out.println("]" );
+ }
+ }
+
+ @Override
+ protected void logExit(JoinPoint jp, Object result) {
+ // Note that result is null for methods with void return.
+ System.out.println("< logExit jp.getSignature=" + jp.getSignature() +", result=" + result );
+ }
+
+ @Override
+ protected void logThrowable(JoinPoint jp, Throwable throwable) {
+ while ( throwable.getCause() != null )
+ throwable = throwable.getCause();
+ System.out.println("! logThrowable jp.getSignature=" + jp.getSignature() + ", throwable=" + throwable);
+ // System.out.println("! logThowable stackTrace=" );
+ // throwable.printStackTrace( System.out );
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: 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=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java Mon Jan 18 10:00:52 2010
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+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;
+
+/**
+ * The TimingAspect is used to perform timing metrics on various calls.
+ * The Pointcut "timedCall" is not defined here, but rather in the aop.xml
+ * configuration file. You may provide a point cut to state which type
+ * of call you would like timed and reported in the output files.
+ *
+ * @version $Rev$ $Date$
+ */
+@Aspect
+public abstract class TimingAspect {
+ // Abstract pointcut. Pointcut is defined in aop.xml file.
+ @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/TimingAspect.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java?rev=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java Mon Jan 18 10:00:52 2010
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.aspectj;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+
+/**
+ * @version $Rev$ $Date$
+ */
+
+@Aspect
+public abstract class TracingAspect {
+
+ @Pointcut("")
+ protected abstract void entry();
+
+ @Pointcut("")
+ protected abstract void withinScope();
+
+ @Pointcut("call(* java..*.*(..))")
+ protected void exit() {
+ }
+
+ @Pointcut("entry() && !cflowbelow(entry())")
+ void start() {
+ }
+
+ // @Pointcut("withinScope() && cflow(entry()) && !cflow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect) && !within(*.toString)")
+ @Pointcut("withinScope() && entry()")
+ // @Pointcut("withinScope() && entry()&& !cflow(execution(String toString())")
+ void trace() {
+ }
+
+ @Pointcut("!handler(*) && !preinitialization(new(..))")
+ protected void supportsAfterAdvice() {
+ }
+
+ @Before("start()")
+ public void beforeStart() {
+ startLog();
+ }
+
+ @Before("trace() && supportsAfterAdvice()")
+ public void beforeTrace(JoinPoint jp) {
+ logEnter(jp);
+ }
+
+ @AfterReturning(pointcut = "trace() && supportsAfterAdvice()", returning = "result")
+ public void afterReturning(JoinPoint jp, Object result) {
+ logExit(jp, result);
+ }
+
+ @AfterThrowing(pointcut = "trace() && supportsAfterAdvice()", throwing = "e")
+ public void afterThrowing(JoinPoint jp, Throwable e) {
+ logThrowable(jp, e);
+ }
+
+ @After("start()")
+ public void afterStart() {
+ completeLog();
+ }
+
+ protected abstract void logEnter(JoinPoint jp);
+ protected abstract void logExit(JoinPoint jp, Object result);
+ protected abstract void logThrowable(JoinPoint jp, Throwable throwable);
+
+ protected abstract void startLog();
+ protected abstract void completeLog();
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: 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=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml Mon Jan 18 10:00:52 2010
@@ -0,0 +1,43 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<aspectj>
+
+ <aspects>
+ <!-- Uncomment either of these two aspects to perform standard logging -->
+ <!-- or standard tracing on the Tuscany runtime. -->
+ <!-- <aspect name="org.apache.tuscany.sca.aspectj.SimpleTracingAspect" /> -->
+ <!-- <aspect name="org.apache.tuscany.sca.aspectj.LoggingAspect" /> -->
+
+ <!-- Following is a concrete-aspect that defines the point cut for -->
+ <!-- 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, *">
+ <pointcut name="timedCall"
+ expression="call(* java.util.logging.Logger.info(..))"/>
+ </concrete-aspect>
+ </aspects>
+
+ <!--weaver options="-verbose -debug -showWeaveInfo"-->
+ <weaver options="-verbose">
+ <include within="org.apache.tuscany.sca..*" />
+ </weaver>
+
+</aspectj>
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java?rev=900323&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java Mon Jan 18 10:00:52 2010
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.aspectj;
+
+import java.util.logging.Logger;
+
+import org.junit.Test;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class TracingTestCase {
+
+ @Test
+ public void testAOP() {
+ Logger log = Logger.getLogger(getClass().getName());
+ System.out.println("doSomething()");
+ log.info("Hello, Log");
+ }
+
+ public static void main(String[] args) {
+ new TracingTestCase().testAOP();
+ }
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date