Update pointcuts

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@683143 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 8 insertions, 454 deletions

diff --git a/sandbox/rfeng/aop-logging/.checkstyle b/sandbox/rfeng/aop-logging/.checkstyle
deleted file mode 100644
index e3c216986d..0000000000
--- a/sandbox/rfeng/aop-logging/.checkstyle
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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.

--->

-<fileset-config file-format-version="1.2.0" simple-config="true">

-    <fileset name="all" enabled="true" check-config-name="Tuscany Checks" local="false">

-        <file-match-pattern match-pattern="." include-pattern="true"/>

-    </fileset>

-</fileset-config>

diff --git a/sandbox/rfeng/aop-logging/.pmd b/sandbox/rfeng/aop-logging/.pmd
deleted file mode 100644
index 84af2f4d5d..0000000000
--- a/sandbox/rfeng/aop-logging/.pmd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.

--->

-<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>

diff --git a/sandbox/rfeng/aop-logging/.ruleset b/sandbox/rfeng/aop-logging/.ruleset
deleted file mode 100644
index ac8671859d..0000000000
--- a/sandbox/rfeng/aop-logging/.ruleset
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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.

--->

-<ruleset name="pmd-eclipse">

-  <description>PMD Plugin preferences rule set</description>

-  

-  

-  <rule ref="rulesets/basic.xml/BooleanInstantiation"/>

-  <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>

-  <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>

-<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->

-  <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>

-<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->

-<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->

-  <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>

-  <rule ref="rulesets/basic.xml/JumbledIncrementer"/>

-<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->

-  <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>

-  <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>

-  <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>

-  <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>

-  <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>

-<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->

-  

-<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->

-<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->

-<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->

-<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->

-

-<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->

-<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->

-<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->

-  

-<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->

-<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->

-<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->

-<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->

-<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->

-<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->

-

-<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>

-<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->

-<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->

-<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->

-<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->

-<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->

-<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->

-<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->

-<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->

-<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>

-<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->

-

-<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->

-<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->

-<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->

-

-<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->

-<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->

-<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->

-<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->

-<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->

-<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>

-<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->

-<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->

-<!--<rule ref="rulesets/design.xml/BadComparison"/>-->

-<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->

-<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->

-<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->

-<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>

-<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->

-<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->

-<rule ref="rulesets/design.xml/IdempotentOperations"/>

-<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->

-<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->

-<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->

-<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->

-<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->

-<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->

-<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>

-<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>

-<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>

-<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>

-<rule ref="rulesets/design.xml/SimplifyConditional"/>

-<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->

-<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->

-<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>

-<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->

-<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->

-<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->

-

-<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->

-<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->

-<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->

-<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->

-<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->

-<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->

-

-<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->

-<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->

-<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->

-<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->

-

-<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->

-<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->

-

-<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->

-<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->

-<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->

-<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->

-<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->

-<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->

-<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->

-<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->

-

-  <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->

-  <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->

-  <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->

-  <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->

-  

-  <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->

-  <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->

-  <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->

-  <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->

-  <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->

-  <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->

-  <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->

-  <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->

-  <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->

-  <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->

-  <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->

-  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->

-  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->

-  <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->

-  <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->

-  <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->

-

-  <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->

-  <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->

-

-  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->

-  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->

- 

-  <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->

-  <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->

-  <!--<rule ref="rulesets/strings.xml/StringToString"/>-->

-  <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->

-  <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->

-  

-  <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->

-  <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->

-  

-  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>

-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>

-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>

-  <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->

-  

-</ruleset>

diff --git a/sandbox/rfeng/aop-logging/LICENSE.txt b/sandbox/rfeng/aop-logging/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/sandbox/rfeng/aop-logging/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 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, serviceDefinition 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.
diff --git a/sandbox/rfeng/aop-logging/NOTICE.txt b/sandbox/rfeng/aop-logging/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/sandbox/rfeng/aop-logging/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
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
index 4babfcca65..7c04341718 100644
--- 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
@@ -38,11 +38,11 @@ public class MyTracingAspect extends TracingAspect {
         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() {
     }
 
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
index c9aeee3a63..d42fdd9897 100644
--- a/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml
+++ b/sandbox/rfeng/aop-logging/src/test/resources/META-INF/aop.xml
@@ -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>
diff --git a/sandbox/rfeng/aop-logging/test.bat b/sandbox/rfeng/aop-logging/test.bat
index 4a160e6ff2..379f5be580 100644
--- a/sandbox/rfeng/aop-logging/test.bat
+++ b/sandbox/rfeng/aop-logging/test.bat
@@ -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