From 1fb6a28a73ca17dbb8c4b3059db590e2f9620943 Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 3 Aug 2011 09:21:41 +0000 Subject: Correct tag name git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1153404 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tuscany/sca/aspectj/LoggingAspect.java | 105 --------------------- .../tuscany/sca/aspectj/SimpleTracingAspect.java | 87 ----------------- .../apache/tuscany/sca/aspectj/TimingAspect.java | 60 ------------ .../apache/tuscany/sca/aspectj/TracingAspect.java | 92 ------------------ 4 files changed, 344 deletions(-) delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java delete mode 100644 sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java (limited to 'sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca') diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java deleted file mode 100644 index 630bcb285b..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * 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()); - } - -} diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java deleted file mode 100644 index 965cfa5b5d..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * 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 ); - } - -} diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java deleted file mode 100644 index 262742e867..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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()); - } - } -} diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java deleted file mode 100644 index 0178ebdb6e..0000000000 --- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * 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(); -} -- cgit v1.2.3