From 78b93434ca2200dcc690d67143ee3ea938359439 Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 8 May 2009 17:13:17 +0000 Subject: Clean up git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@773050 13f79535-47bb-0310-9956-ffa450edef68 --- sandbox/rfeng/aop-logging/pom.xml | 100 --------------------- .../apache/tuscany/sca/aspectj/LoggingAspect.java | 93 ------------------- .../apache/tuscany/sca/aspectj/TracingAspect.java | 100 --------------------- .../tuscany/sca/aspectj/MyTracingAspect.java | 82 ----------------- .../tuscany/sca/aspectj/TracingTestCase.java | 41 --------- .../src/test/resources/META-INF/aop.xml | 17 ---- sandbox/rfeng/aop-logging/test.bat | 5 -- 7 files changed, 438 deletions(-) delete mode 100644 sandbox/rfeng/aop-logging/pom.xml delete mode 100644 sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java delete mode 100644 sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java delete mode 100644 sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java delete mode 100644 sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java delete mode 100644 sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml delete mode 100644 sandbox/rfeng/aop-logging/test.bat (limited to 'sandbox/rfeng') diff --git a/sandbox/rfeng/aop-logging/pom.xml b/sandbox/rfeng/aop-logging/pom.xml deleted file mode 100644 index 1c14ac250b..0000000000 --- a/sandbox/rfeng/aop-logging/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 1.4-SNAPSHOT - - - tuscany-aop-logging - Apache Tuscany AOP-based Logging and Tracing - - - - org.aspectj - aspectjrt - 1.6.1 - - - org.aspectj - aspectjlib - 1.6.1 - - - org.aspectj - aspectjweaver - 1.6.1 - test - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - LATEST - - - **/*TestCase.java - - brief - false - once - - - - - - org.codehaus.mojo - aspectj-maven-plugin - 1.0 - - 1.5 - - - - - - - - compile - - test-compile - - - - - - - - diff --git a/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java b/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java deleted file mode 100644 index 8ad64d498b..0000000000 --- a/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java +++ /dev/null @@ -1,93 +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; - -/** - * @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() { - - } - - // @Around("anyMethodCall() || anyLog()") - @Around("anyLog()") - public Object around(ProceedingJoinPoint jp) throws Throwable { - System.out.println("Around: " + jp); - long start = System.currentTimeMillis(); - try { - return jp.proceed(); - } finally { - long end = System.currentTimeMillis(); - System.out.println("Roundtrip is " + (end - start) + "ms for " + jp.getSignature()); - } - - } - - @Before("anyMethodCall()") - public void before(JoinPoint jp) { - System.out.println("Before: " + jp); - System.out.println("Location: " + jp.getSourceLocation()); - System.out.println("This: " + jp.getThis()); - System.out.println("Target: " + jp.getTarget()); - System.out.println("Input: " + Arrays.asList(jp.getArgs())); - } - - @After("anyMethodCall()") - public void after(JoinPoint jp) { - System.out.println("After: " + jp); - } - - @AfterReturning(pointcut = "anyMethodCall()", returning = "result") - public void afterReturning(JoinPoint jp, Object result) { - System.out.println("After returning: " + jp + " " + result); - } - - @AfterThrowing(pointcut = "anyMethodCall()", throwing = "e") - public void afterThrowing(Exception e) { - } - -} diff --git a/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java deleted file mode 100644 index 53ef73573b..0000000000 --- a/sandbox/rfeng/aop-logging/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java +++ /dev/null @@ -1,100 +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(); - - /** ignore join points outside this scope - use within(..) */ - @Pointcut("") - protected abstract void withinScope(); - - @Pointcut("withinScope() && call(* java..*.*(..))") - protected void exit() { - } - - @Pointcut("withinScope() && entry() && !cflowbelow(entry())") - void start() { - } - - @Pointcut("withinScope() && cflow(entry()) && !cflowbelow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect)") - 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); - } - - @After("trace() && supportsAfterAdvice()") - public void afterTrace(JoinPoint jp) { - logExit(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) { - logException(jp, e); - } - - @After("start()") - public void afterStart() { - completeLog(); - } - - protected abstract void logEnter(JoinPoint jp); - - protected abstract void logExit(JoinPoint jp); - protected abstract void logExit(JoinPoint jp, Object result); - protected abstract void logException(JoinPoint jp, Throwable throwable); - - protected abstract void startLog(); - - protected abstract void completeLog(); - -} diff --git a/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java b/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java deleted file mode 100644 index 3d70d03365..0000000000 --- a/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/MyTracingAspect.java +++ /dev/null @@ -1,82 +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; - -/** - * @version $Rev$ $Date$ - */ -@Aspect -public class MyTracingAspect extends TracingAspect { - - public MyTracingAspect() { - super(); - } - - @Override - protected void completeLog() { - System.out.println("completeLog()"); - } - - @Pointcut("execution(public * org.apache.tuscany.sca..*.*(..)) &&!within(java..*)") - protected void entry() { - } - - @Pointcut("within(org.apache.tuscany.sca..*) && !within(org.apache.tuscany.sca.aspectj.*Aspect)") - protected void withinScope() { - } - - @Override - protected void logEnter(JoinPoint jp) { - System.out.println("> " + jp.getSignature()); - if (jp.getArgs().length != 0) { - System.out.println("Input: " + Arrays.asList(jp.getArgs())); - } - } - - @Override - protected void logExit(JoinPoint jp) { - // System.out.println("> " + jp.getSignature()); - } - - @Override - protected void logException(JoinPoint jp, Throwable throwable) { - System.out.println("! " + jp.getSignature() + " " + throwable.getMessage()); - } - - @Override - protected void logExit(JoinPoint jp, Object result) { - System.out.println("< " + jp.getSignature()); - if (!jp.getSignature().toString().startsWith("void ")) { - System.out.println("Output: " + result); - } - } - - @Override - protected void startLog() { - System.out.println("startLog()"); - } - -} diff --git a/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java b/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java deleted file mode 100644 index 7b76faaf36..0000000000 --- a/sandbox/rfeng/aop-logging/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java +++ /dev/null @@ -1,41 +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.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(); - } -} diff --git a/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml b/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml deleted file mode 100644 index d42fdd9897..0000000000 --- a/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/sandbox/rfeng/aop-logging/test.bat b/sandbox/rfeng/aop-logging/test.bat deleted file mode 100644 index 379f5be580..0000000000 --- a/sandbox/rfeng/aop-logging/test.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -set ASPECTJ_HOME=c:\aspectj1.6 -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 -- cgit v1.2.3