[jboss-cvs] JBossAS SVN: r65219 - in projects/aop/trunk/aop: src/resources/test and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: flavia.rainone at jboss.com
Date: 2007-09-06 20:05:34 -0400 (Thu, 06 Sep 2007)
New Revision: 65219

Added:
   projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidJDK50TestCase.java
Removed:
   projects/aop/trunk/aop/src/resources/test/beforeafterArgs/
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCaseJDK50.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/
Modified:
   projects/aop/trunk/aop/build-tests-jdk14.xml
   projects/aop/trunk/aop/build-tests-jdk50.xml
   projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Arg2TestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspect2.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectGenerics.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectInterfaces.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectInvertedArgs.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgPOJOInterface.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO2.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerInvalidTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Implementor.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Interface.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointInvalidPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointInvalidTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdvicePOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdvicePOJOCaller.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdviceTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAfterAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAfterCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAroundAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAroundCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedBeforeAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedBeforeCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedFinallyAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedFinallyCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedThrowingAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedThrowingCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/POJOException.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubClass.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubInterface.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubValue.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperClass.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperInterface.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperValue.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerInvalidPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetInvalidTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownInvalidPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownInvalidTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownPOJO.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownTestCase.java
Log:
Refactoring: renamed beforeafterArgs test package to annotatedAdviceParams.

Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml	2007-09-06 23:10:14 UTC (rev 65218)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml	2007-09-07 00:05:34 UTC (rev 65219)
@@ -242,7 +242,7 @@
          <classpath refid="javac.classpath"/>
          <include name="**/*.java"/>
          <exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/>
-         <exclude name="org/jboss/test/aop/**/*JDK50.java"/>
+         <exclude name="org/jboss/test/aop/**/*JDK50TestCase.java"/>
       </javac>
    </target>
 
@@ -529,7 +529,7 @@
          <param name="caller" value="precompiled-genadvisor-tests"/>
       </antcall>
       <antcall target="_run-precompiled-test" inheritRefs="true">
-         <param name="test" value="beforeafterArgs"/>
+         <param name="test" value="annotatedAdviceParams"/>
          <param name="caller" value="precompiled-genadvisor-tests"/>
       </antcall>
       <antcall target="_run-precompiled-test" inheritRefs="true">

Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml	2007-09-06 23:10:14 UTC (rev 65218)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml	2007-09-07 00:05:34 UTC (rev 65219)
@@ -399,7 +399,7 @@
          <param name="caller" value="javaagent-genadvisor-tests"/>
       </antcall>
       <antcall target="_run-javaagent-test" inheritRefs="true">
-         <param name="test" value="beforeafterArgs"/>
+         <param name="test" value="annotatedAdviceParams"/>
          <param name="caller" value="javaagent-genadvisor-tests"/>
       </antcall>
       <antcall target="_run-javaagent-test" inheritRefs="true">
@@ -577,7 +577,7 @@
          <param name="caller" value="precompiled-genadvisor-tests"/>
       </antcall>
       <antcall target="_run-precompiled-test" inheritRefs="true">
-         <param name="test" value="beforeafterArgs"/>
+         <param name="test" value="annotatedAdviceParams"/>
          <param name="caller" value="precompiled-genadvisor-tests"/>
       </antcall>
       <antcall target="_run-precompiled-test" inheritRefs="true">

Copied: projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams (from rev 65215, projects/aop/trunk/aop/src/resources/test/beforeafterArgs)

Modified: projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/beforeafterArgs/jboss-aop.xml	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/resources/test/annotatedAdviceParams/jboss-aop.xml	2007-09-07 00:05:34 UTC (rev 65219)
@@ -5,1750 +5,1750 @@
 
    <!-- @Arg test -->
    
-   <aspect class="org.jboss.test.aop.beforeafterArgs.ArgAspect" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.ArgAspect" scope="PER_VM"/>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch1(..))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <around name="around5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch1(..))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch1Around1(..))">
-      <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch1Around1(..))">
+      <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch1Around2(..))">
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch1Around2(..))">
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch1Around3(..))">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch1Around3(..))">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch1After2(..))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch1After2(..))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch1After3(..))">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch1After3(..))">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch1After5(..))">
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch1After5(..))">
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch2(..))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <around name="around6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch2(..))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch2Before3(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch2Before3(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch2After1(..))">
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch2After1(..))">
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch2After2(..))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch2After2(..))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch2After3(..))">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch2After3(..))">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch2After5(..))">
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch2After5(..))">
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch3(..))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch3(..))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch3Before3(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch3Before3(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch3After1(..))">/>
-		<after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch3After1(..))">/>
+		<after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch3After2(..))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch3After2(..))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch3After3(..))">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch3After3(..))">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch3After5(..))">
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch3After5(..))">
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch4(..))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <around name="around6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch4(..))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch4Before3(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch4Before3(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch5(..))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-		<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch5(..))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+		<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch5Before3(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch5Before3(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch6(..))">
-      <around name="around6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch6(..))">
+      <around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch6After1(..))">
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch6After1(..))">
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch6After2(..))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch6After2(..))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch6After3(..))">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch6After3(..))">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch6After5(..))">
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch6After5(..))">
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch7(..))">
-      <around name="around6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch7(..))">
+      <around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch7After1(..))">
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch7After1(..))">
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch7After2(..))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch7After2(..))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch7After3(..))">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch7After3(..))">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch7After5(..))">
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch7After5(..))">
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch8(..))">
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch8(..))">
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch8After1(..))">
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch8After1(..))">
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch8After2(..))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch8After2(..))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch8After3(..))">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch8After3(..))">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch8After5(..))">
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch8After5(..))">
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->bunch9(..))">
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->bunch9(..))">
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9Before6(..))">
-      <before name="before6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch9Before6(..))">
+      <before name="before6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9Around7(..))">
-      <around name="around7" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch9Around7(..))">
+      <around name="around7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9After1(..))">
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch9After1(..))">
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9After2(..))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch9After2(..))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9After3(..))">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch9After3(..))">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->bunch9After5(..))">
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->bunch9After5(..))">
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect"/>
    </bind>
 
-   <aspect class="org.jboss.test.aop.beforeafterArgs.ArgAspect2" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2" scope="PER_VM"/>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO2->bunchArgs(..))">
-      <advice name="bunchArgs" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO2->bunchArgs(..))">
+      <advice name="bunchArgs" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO2->bunchArgsWithInvocation(..))">
-      <advice name="bunchArgsWithInvocation" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO2->bunchArgsWithInvocation(..))">
+      <advice name="bunchArgsWithInvocation" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO2->bunchWrapped(..))">
-      <advice name="wrap" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO2->bunchWrapped(..))">
+      <advice name="wrap" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
    </bind>
  
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO2->bunch(..))">
-      <advice name="bunch" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
-      <advice name="bunch1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
-      <advice name="arg1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
-      <advice name="arg2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
-      <advice name="arg3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
-      <advice name="arg4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
-      <advice name="arg15" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
-      <advice name="arg24" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
-      <advice name="emptyArg" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO2->bunch(..))">
+      <advice name="bunch" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
+      <advice name="bunch1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
+      <advice name="arg1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
+      <advice name="arg2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
+      <advice name="arg3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
+      <advice name="arg4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
+      <advice name="arg15" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
+      <advice name="arg24" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
+      <advice name="emptyArg" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
    </bind>
 
-   <bind pointcut="execution(java.lang.String org.jboss.test.aop.beforeafterArgs.ArgsPOJO2->echo(java.lang.String))">
-      <advice name="echo" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspect2"/>
+   <bind pointcut="execution(java.lang.String org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO2->echo(java.lang.String))">
+      <advice name="echo" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspect2"/>
    </bind>
 
- 	<aspect class="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces" scope="PER_VM"/>
+ 	<aspect class="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces" scope="PER_VM"/>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsPOJO->*(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Before4(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before4(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Before5(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before5(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Around4(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around4(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Around5(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <around name="around5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around5(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*After4(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*After4(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*After5(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*After5(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Throwing4(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <throwing name="throwing4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Throwing4(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <throwing name="throwing4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Throwing5(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <throwing name="throwing5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Throwing5(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <throwing name="throwing5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Finally4(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Finally4(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Finally5(org.jboss.test.aop.beforeafterArgs.Interface))">
-      <finally name="finally5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInterfaces"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Finally5(org.jboss.test.aop.annotatedAdviceParams.Interface))">
+      <finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInterfaces"/>
    </bind>
    
-   <aspect class="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs" scope="PER_VM"/>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsPOJO->*(java.lang.String,java.util.Collection))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
-      <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
-      <throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*(java.lang.String,java.util.Collection))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
+      <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
+      <throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Before2(java.lang.String,java.util.Collection))">
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before2(java.lang.String,java.util.Collection))">
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Around2(java.lang.String,java.util.Collection))">
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around2(java.lang.String,java.util.Collection))">
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*After2(java.lang.String,java.util.Collection))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*After2(java.lang.String,java.util.Collection))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Throwing2(java.lang.String,java.util.Collection))">
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Throwing2(java.lang.String,java.util.Collection))">
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Finally2(java.lang.String,java.util.Collection))">
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Finally2(java.lang.String,java.util.Collection))">
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs"/>
    </bind>
    
-   <aspect class="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics" scope="PER_VM"/>
 
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsPOJO->*(java.util.List))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <before name="before6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <around name="around6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <throwing name="throwing4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <throwing name="throwing5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <throwing name="throwing6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
-      <finally name="finally6" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->*(java.util.List))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <before name="before6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <throwing name="throwing4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <throwing name="throwing5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <throwing name="throwing6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
+      <finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Before7(java.util.List))">
-      <before name="before7" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before7(java.util.List))">
+      <before name="before7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Before8(java.util.List))">
-      <before name="before8" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Before8(java.util.List))">
+      <before name="before8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Around5(java.util.List))">
-      <around name="around5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around5(java.util.List))">
+      <around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Around7(java.util.List))">
-      <around name="around7" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around7(java.util.List))">
+      <around name="around7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Around8(java.util.List))">
-      <around name="around8" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Around8(java.util.List))">
+      <around name="around8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*After5(java.util.List))">/>
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*After5(java.util.List))">/>
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*After7(java.util.List))">
-      <after name="after7" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*After7(java.util.List))">
+      <after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*After8(java.util.List))">
-      <after name="after8" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*After8(java.util.List))">
+      <after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Throwing2(java.util.List))">
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Throwing2(java.util.List))">
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Throwing7(java.util.List))">
-      <throwing name="throwing7" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Throwing7(java.util.List))">
+      <throwing name="throwing7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Throwing8(java.util.List))">
-      <throwing name="throwing8" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Throwing8(java.util.List))">
+      <throwing name="throwing8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Finally5(java.util.List))">
-      <finally name="finally5" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Finally5(java.util.List))">
+      <finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Finally7(java.util.List))">
-      <finally name="finally7" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Finally7(java.util.List))">
+      <finally name="finally7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
-   <bind pointcut="execution(void org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->*Finally8(java.util.List))">
-      <finally name="finally8" aspect="org.jboss.test.aop.beforeafterArgs.ArgAspectGenerics"/>
+   <bind pointcut="execution(void org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->*Finally8(java.util.List))">
+      <finally name="finally8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgAspectGenerics"/>
    </bind>
    
    <!-- @Args test -->
-	<aspect class="org.jboss.test.aop.beforeafterArgs.ArgsAspect" scope="PER_VM"/>
+	<aspect class="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect" scope="PER_VM"/>
 
-	<bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->field1)">
-		<before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-		<before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+	<bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->field1)">
+		<before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+		<before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field1Before4)">
-		<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field1Before4)">
+		<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field1Before5)">
-		<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field1Before5)">
+		<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="set(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->field2)">
-      <before name="before6" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->field2)">
+      <before name="before6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="set(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field2NonexistentAdvice)">
-      <before name="XXX6" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field2NonexistentAdvice)">
+      <before name="XXX6" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="set(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field2Finally2)">
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field2Finally2)">
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
 
-	<bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->field3)">
-    	<around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-		<after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-		<after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+	<bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->field3)">
+    	<around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+		<after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+		<after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field3After4)">
-    	<after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field3After4)">
+    	<after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
 
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field3After5)">
-		<after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field3After5)">
+		<after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-	<bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->field4)">
-		<before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-		<before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-    	<around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-		<after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-		<after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+	<bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->field4)">
+		<before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+		<before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+    	<around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+		<after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+		<after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field4Before4)">
-		<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field4Before4)">
+		<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field4Before5)">
-		<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field4Before5)">
+		<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field4After4)">
-		<after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field4After4)">
+		<after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field4After5)">
-		<after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field4After5)">
+		<after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
    
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->field4Finally2)">
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->field4Finally2)">
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
    </bind>
 
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method1(..))">
-	   <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-	   <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
- 	   <throwing name="throwing" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method1(..))">
+	   <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+	   <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+ 	   <throwing name="throwing" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method2(..))">
-	   <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-	   <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
- 	   <throwing name="throwing" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method2(..))">
+	   <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+	   <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+ 	   <throwing name="throwing" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->method2Finally2(..))">
-	   <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->method2Finally2(..))">
+	   <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method3(..))">
-	   <before name="before7" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-	   <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-	   <after name="after7" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method3(..))">
+	   <before name="before7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+	   <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+	   <after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method4(..))">
-	   <before name="before7" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-	   <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-	   <after name="after7" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method4(..))">
+	   <before name="before7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+	   <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+	   <after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->method4Finally2(..))">
-	   <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->method4Finally2(..))">
+	   <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
 	
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method5(..))">
-	   <throwing name="throwing" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method5(..))">
+	   <throwing name="throwing" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
 	
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method6(..))">
-	   <throwing name="throwing" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method6(..))">
+	   <throwing name="throwing" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->method6Finally2(..))">
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->method6Finally2(..))">
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
    
-	<bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method5(..)) AND withincode(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method7(..))">
-      <before name="before8" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <after name="after8" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-	   <throwing name="throwing" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+	<bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method5(..)) AND withincode(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method7(..))">
+      <before name="before8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+	   <throwing name="throwing" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
 	
-   <bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method6(..)) AND withincode(* org.jboss.test.aop.beforeafterArgs.ArgsPOJO->method8(..))">
-      <before name="before8" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <after name="after8" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-	   <throwing name="throwing" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method6(..)) AND withincode(* org.jboss.test.aop.annotatedAdviceParams.ArgsPOJO->method8(..))">
+      <before name="before8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+	   <throwing name="throwing" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
    
-   <bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->method6Finally2(..)) AND withincode(* org.jboss.test.aop.beforeafterArgs.ArgsInvalidPOJO->method8Finally2(..))">
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ArgsAspect"/>
+   <bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->method6Finally2(..)) AND withincode(* org.jboss.test.aop.annotatedAdviceParams.ArgsInvalidPOJO->method8Finally2(..))">
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ArgsAspect"/>
 	</bind>
    
    <!-- @Caller test -->
-	<aspect class="org.jboss.test.aop.beforeafterArgs.CallerAspect" scope="PER_VM"/>
+	<aspect class="org.jboss.test.aop.annotatedAdviceParams.CallerAspect" scope="PER_VM"/>
 
    <stack name="CallerAdvices">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
 	</stack>
 	
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO2->new(int,..))">
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO2->new(int,..))">
 		<stack-ref name="CallerAdvices"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(short,..))">
-      <before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(short,..))">
+      <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(int,..))">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(int,..))">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(long,..))">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(long,..))">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(float,..))">
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(float,..))">
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(double,..))">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(double,..))">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO2->*()) AND !call(* *->method*_())">
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO2->*()) AND !call(* *->method*_())">
 		<stack-ref name="CallerAdvices"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO2->method*_())">
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO2->method*_())">
       <stack-ref name="CallerAdvices"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_Before4())">
-      <before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_Before4())">
+      <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_Around3())">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_Around3())">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_After3())">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_After3())">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_Throwing2())">
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_Throwing2())">
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_Finally3())">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_Finally3())">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO->method1())">
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO->method1())">
       <stack-ref name="CallerAdvices"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Before2())">
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Before2())">
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Before3())">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Before3())">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Before4())">
-      <before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Before4())">
+      <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Around2())">
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Around2())">
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Around3())">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Around3())">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Around4())">
-      <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Around4())">
+      <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1After2())">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1After2())">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1After3())">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1After3())">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Throwing2())">
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Throwing2())">
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Throwing3())">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Throwing3())">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Finally1())">
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Finally1())">
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Finally3())">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Finally3())">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Finally4())">
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Finally4())">
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO->method3())">
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO->method3())">
       <stack-ref name="CallerAdvices"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Before2())">
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Before2())">
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Before3())">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Before3())">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Before4())">
-      <before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Before4())">
+      <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Around2())">
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Around2())">
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Around3())">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Around3())">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Around4())">
-      <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Around4())">
+      <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3After2())">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3After2())">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3After3())">
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3After3())">
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Throwing2())">
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Throwing2())">
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Throwing3())">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Throwing3())">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Finally1())">
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Finally1())">
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Finally3())">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Finally3())">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
    
-   <bind pointcut="execution(public void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Finally4())">
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.CallerAspect"/>
+   <bind pointcut="execution(public void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Finally4())">
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.CallerAspect"/>
    </bind>
 
    <!-- @JoinPoint test -->
-	<aspect class="org.jboss.test.aop.beforeafterArgs.JoinPointAspect" scope="PER_VM"/>
+	<aspect class="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect" scope="PER_VM"/>
 
-	<bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->number)">
-		<before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-		<after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->number)">
+		<before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+		<after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
 
-   <bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->numberBefore9)">
-      <before name="before9" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->numberBefore9)">
+      <before name="before9" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-	<bind pointcut="set(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->text)">
-		<before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->text)">
+		<before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
 
-   <bind pointcut="set(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->textAfter2)">
-		<after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->textAfter2)">
+		<after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="set(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->textAfter8)">
-      <after name="after8" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->textAfter8)">
+      <after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-	<bind pointcut="get(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->text)">
-		<after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="get(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->text)">
+		<after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
 	
-   <bind pointcut="get(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->textBefore5)">
-		<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="get(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->textBefore5)">
+		<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->method1(..))">
-    	<before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-		<after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->method1(..))">
+    	<before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+		<after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->method1Finally9(..))">
-=      <finally name="finally9" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->method1Finally9(..))">
+=      <finally name="finally9" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->method2(..))">
-    	<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-		<after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-   	<throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->method2(..))">
+    	<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+		<after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+   	<throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->method3(..))">
-     	<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-		<after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->method3(..))">
+     	<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+		<after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->method3Throwing2(..))">
-   	<throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->method3Throwing2(..))">
+   	<throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->method4(..))">
-   	<throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->method4(..))">
+   	<throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
 
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->method5(..))">
-   	<throwing name="throwing4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->method5(..))">
+   	<throwing name="throwing4" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->method5Around(..))">
-      <around name="around" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->method5Around(..))">
+      <around name="around" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->method5Finally4(..))">
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->method5Finally4(..))">
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->method6(..))">
-   	<throwing name="throwing5" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->method6(..))">
+   	<throwing name="throwing5" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->new(boolean)) AND withincode(org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->new(..))">
-      <before name="before6" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <throwing name="throwing6" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally5" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->new(boolean)) AND withincode(org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->new(..))">
+      <before name="before6" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <throwing name="throwing6" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->new(boolean)) AND withincode(public void org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->*(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <throwing name="throwing7" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally6" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->new(boolean)) AND withincode(public void org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->*(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <throwing name="throwing7" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->new(boolean)) AND withincode(public void org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->*Throwing9(..))">
-      <throwing name="throwing9" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->new(boolean)) AND withincode(public void org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->*Throwing9(..))">
+      <throwing name="throwing9" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->new(boolean)) AND withincode(public void org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->*Throwing10(..))">
-      <throwing name="throwing10" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->new(boolean)) AND withincode(public void org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->*Throwing10(..))">
+      <throwing name="throwing10" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
 
-   <bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->*Method(boolean)) AND withincode(org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->new(..))">
-      <before name="before7" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <throwing name="throwing8" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->*Method(boolean)) AND withincode(org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->new(..))">
+      <before name="before7" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <throwing name="throwing8" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->*MethodThrowing9(boolean)) AND withincode(org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->new(..))">
-      <throwing name="throwing9" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->*MethodThrowing9(boolean)) AND withincode(org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->new(..))">
+      <throwing name="throwing9" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->*MethodThrowing10(boolean)) AND withincode(org.jboss.test.aop.beforeafterArgs.JoinPointInvalidPOJO->new(..))">
-      <throwing name="throwing10" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->*MethodThrowing10(boolean)) AND withincode(org.jboss.test.aop.annotatedAdviceParams.JoinPointInvalidPOJO->new(..))">
+      <throwing name="throwing10" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->*Method(boolean)) AND withincode(public void org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->*(..))">
-      <before name="before8" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <throwing name="throwing8" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally7" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->*Method(boolean)) AND withincode(public void org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->*(..))">
+      <before name="before8" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <throwing name="throwing8" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally7" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="execution(org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->new(short,boolean))">
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <after name="after7" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally7" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="execution(org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->new(short,boolean))">
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally7" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
-   <bind pointcut="construction(org.jboss.test.aop.beforeafterArgs.JoinPointPOJO->new(float,boolean))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
-      <finally name="finally8" aspect="org.jboss.test.aop.beforeafterArgs.JoinPointAspect"/>
+   <bind pointcut="construction(org.jboss.test.aop.annotatedAdviceParams.JoinPointPOJO->new(float,boolean))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
+      <finally name="finally8" aspect="org.jboss.test.aop.annotatedAdviceParams.JoinPointAspect"/>
    </bind>
    
    <!-- Return type and @Return test -->
-	<aspect class="org.jboss.test.aop.beforeafterArgs.ReturnAspect" scope="PER_VM"/>
+	<aspect class="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect" scope="PER_VM"/>
 	
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method1(..))">
-		<after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method1(..))">
+		<after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 	
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method1Before(..))">
-		<before name="before" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method1Before(..))">
+		<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method2(..))">
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method2(..))">
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method2Around2(..))">
-		<around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method2Around2(..))">
+		<around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method3(..))">
-		<around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method3(..))">
+		<around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method3Before(..))">
-		<before name="before" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method3Before(..))">
+		<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method4(..))">
-		<around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-		<after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method4(..))">
+		<around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+		<after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method5(..))">
-		<around name="around5" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-		<after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method5(..))">
+		<around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+		<after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method5Finally5(..))">
-      <finally name="finally5" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method5Finally5(..))">
+      <finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method6(..))">
-		<after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally6" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method6(..))">
+		<after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method6Around6(..))">
-		<around name="around6" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method6Around6(..))">
+		<around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method7(..))">
-		<around name="around7" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-		<after name="after7" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally7" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method7(..))">
+		<around name="around7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+		<after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally7" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method8(..))">
-		<around name="around8" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-		<after name="after8" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally8" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method8(..))">
+		<around name="around8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+		<after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally8" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method8Before(..))">
-		<before name="before" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method8Before(..))">
+		<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method9Around9(..))">
-		<around name="around9" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9Around9(..))">
+		<around name="around9" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
   	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method9After9(..))">
-		<after name="after9" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9After9(..))">
+		<after name="after9" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
   	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method9Finally9(..))">
-      <finally name="finally9" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method9Finally9(..))">
+      <finally name="finally9" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
   	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method10(..))">
-		<around name="around10" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally10" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method10(..))">
+		<around name="around10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method10Before(..))">
-		<before name="before" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method10Before(..))">
+		<before name="before" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnInvalidPOJO->method10After10(..))">
-		<after name="after10" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnInvalidPOJO->method10After10(..))">
+		<after name="after10" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method11(..))">
-		<around name="around11" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-		<after name="after11" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally11" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method11(..))">
+		<around name="around11" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+		<after name="after11" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally11" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method12(..))">
-		<around name="around12" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-		<after name="after12" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally12" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method12(..))">
+		<around name="around12" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+		<after name="after12" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally12" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ReturnPOJO->method13(..))">
-		<around name="around12" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-		<finally name="finally12" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
-      <finally name="finally13" aspect="org.jboss.test.aop.beforeafterArgs.ReturnAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ReturnPOJO->method13(..))">
+		<around name="around12" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+		<finally name="finally12" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
+      <finally name="finally13" aspect="org.jboss.test.aop.annotatedAdviceParams.ReturnAspect"/>
 	</bind>
    
    <!-- @Target test -->
-	<aspect class="org.jboss.test.aop.beforeafterArgs.TargetAspect" scope="PER_VM"/>
+	<aspect class="org.jboss.test.aop.annotatedAdviceParams.TargetAspect" scope="PER_VM"/>
 
    <stack name="TargetAdvices">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
 	</stack>
 	
-   <bind pointcut="execution(org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO->new(int,..))">
+   <bind pointcut="execution(org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO->new(int,..))">
 		<stack-ref name="TargetAdvices"/>
    </bind>
 
-   <bind pointcut="execution(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->new(short,..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->new(short,..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->new(int,..))">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->new(int,..))">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->new(long,..))">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->new(long,..))">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->new(double,..))">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->new(double,..))">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="field(int org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO->*)">
+   <bind pointcut="field(int org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO->*)">
 		<stack-ref name="TargetAdvices"/>
    </bind>
 	
-   <bind pointcut="field(int org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->*Before)">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="field(int org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->*Before)">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="field(int org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->*Around)">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="field(int org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->*Around)">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="field(int org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->*Throwing)">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="field(int org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->*Throwing)">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="field(int org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->*Finally)">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="field(int org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->*Finally)">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO->method1(..))">
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO->method1(..))">
 		<stack-ref name="TargetAdvices"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Before(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Before(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Around(..))">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Around(..))">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Throwing(..))">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Throwing(..))">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method1Finally(..))">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method1Finally(..))">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO->method2(..))">
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO->method2(..))">
 		<stack-ref name="TargetAdvices"/>
    </bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method2Before(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method2Before(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method2Around(..))">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method2Around(..))">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method2Throwing(..))">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method2Throwing(..))">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method2Finally(..))">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method2Finally(..))">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO->method3(..))">
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO->method3(..))">
 		<stack-ref name="TargetAdvices"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Before(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Before(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Around(..))">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Around(..))">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Throwing(..))">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Throwing(..))">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method3Finally(..))">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method3Finally(..))">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO->method4(..))">
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO->method4(..))">
 		<stack-ref name="TargetAdvices"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method4Before(..))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method4Before(..))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method4Around(..))">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method4Around(..))">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method4Throwing(..))">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method4Throwing(..))">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO->method4Finally(..))">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO->method4Finally(..))">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO2->new(int,..))">
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO2->new(int,..))">
 		<stack-ref name="TargetAdvices"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(.., short))">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(.., short))">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(.., int))">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(.., int))">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(.., long))">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(.., long))">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="call(org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->new(.., double))">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="call(org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->new(.., double))">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
 
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerPOJO2->method*_())">
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerPOJO2->method*_())">
 		<stack-ref name="TargetAdvices"/>
    </bind>
 
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_Before())">
-      <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_Before())">
+      <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_Around())">
-      <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_Around())">
+      <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_Throwing())">
-      <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_Throwing())">
+      <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
-   <bind pointcut="call(void org.jboss.test.aop.beforeafterArgs.TargetCallerInvalidPOJO2->method*_Finally())">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.TargetAspect"/>
+   <bind pointcut="call(void org.jboss.test.aop.annotatedAdviceParams.TargetCallerInvalidPOJO2->method*_Finally())">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.TargetAspect"/>
    </bind>
    
    <!-- @Thrown test -->
-	<aspect class="org.jboss.test.aop.beforeafterArgs.ThrownAspect" scope="PER_VM"/>
+	<aspect class="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect" scope="PER_VM"/>
 
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownPOJO->method1(..))">
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownPOJO->method1(..))">
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
 
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownInvalidPOJO->method1Throwing1(..))">
-		<throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownInvalidPOJO->method1Throwing1(..))">
+		<throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownPOJO->method2(..))">
-		<throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownPOJO->method2(..))">
+		<throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
 	
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownPOJO->method3(..))">
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownPOJO->method3(..))">
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownInvalidPOJO->method3Throwing3(..))">
-		<throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownInvalidPOJO->method3Throwing3(..))">
+		<throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownInvalidPOJO->method3Finally3(..))">
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownInvalidPOJO->method3Finally3(..))">
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
 	
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownPOJO->method4(..))">
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownPOJO->method4(..))">
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
 	
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownInvalidPOJO->method4Throwing4(..))">
-		<throwing name="throwing4" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownInvalidPOJO->method4Throwing4(..))">
+		<throwing name="throwing4" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownPOJO->method5(..))">
-      <finally name="finally5" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownPOJO->method5(..))">
+      <finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownInvalidPOJO->method5Throwing5(..))">
-		<throwing name="throwing5" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownInvalidPOJO->method5Throwing5(..))">
+		<throwing name="throwing5" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
 	
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownPOJO->method6(..))">
-		<throwing name="throwing6" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
-      <finally name="finally6" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownPOJO->method6(..))">
+		<throwing name="throwing6" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
+      <finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
    
-   <bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownPOJO->method7(..))">
+   <bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownPOJO->method7(..))">
 	</bind>
    
-	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.ThrownInvalidPOJO->method7Throwing8(..))">
-		<throwing name="throwing8" aspect="org.jboss.test.aop.beforeafterArgs.ThrownAspect"/>
+	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.ThrownInvalidPOJO->method7Throwing8(..))">
+		<throwing name="throwing8" aspect="org.jboss.test.aop.annotatedAdviceParams.ThrownAspect"/>
 	</bind>
 
    <!-- overloaded advices test -->
    
-   <aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect" scope="PER_VM"/>
 
-  	<bind pointcut="set(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->text)">
-   	<before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-      <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-   	<before name="before13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-      <before name="before14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-      <before name="before15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-      <before name="before16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
-      <before name="before17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
+  	<bind pointcut="set(* org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->text)">
+   	<before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+      <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+   	<before name="before13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+      <before name="before14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+      <before name="before15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+      <before name="before16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
+      <before name="before17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
   	</bind>
   	
-  	<bind pointcut="field(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->text)">
-  	   <before name="before17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeAspect"/>
+  	<bind pointcut="field(* org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->text)">
+  	   <before name="before17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeAspect"/>
   	</bind>
   	
-   <aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect" scope="PER_VM"/>
   	   
-  	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->method1(int,long))">
-   	<around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-      <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/> 
-   	<around name="around13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-   	<around name="around14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-    	<around name="around15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
-    	<around name="around16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundAspect"/>
+  	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->method1(int,long))">
+   	<around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+      <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/> 
+   	<around name="around13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+   	<around name="around14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+    	<around name="around15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
+    	<around name="around16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundAspect"/>
   	</bind>
    
-   <aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect" scope="PER_VM"/>
    
-  	<bind pointcut="execution(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->method2(..))">
-   	<after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-   	<after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-   	<after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-   	<after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-   	<after name="after7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-   	<after name="after8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-   	<after name="after9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-   	<after name="after10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after18" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after19" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after20" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after21" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after22" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after23" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after24" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after25" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after26" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after27" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after28" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after29" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after30" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after31" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after32" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after33" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after34" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after35" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after36" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after37" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after38" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after39" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after40" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after41" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after42" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after43" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after44" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after45" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after46" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after47" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after48" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after49" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after50" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after51" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after52" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after53" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after54" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after55" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after56" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after57" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after58" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after59" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after60" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after61" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after62" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after63" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after64" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after65" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
-      <after name="after66" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterAspect"/>
+  	<bind pointcut="execution(* org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->method2(..))">
+   	<after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+   	<after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+   	<after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+   	<after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+   	<after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+   	<after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+   	<after name="after9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+   	<after name="after10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after18" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after19" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after20" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after21" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after22" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after23" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after24" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after25" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after26" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after27" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after28" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after29" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after30" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after31" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after32" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after33" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after34" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after35" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after36" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after37" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after38" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after39" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after40" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after41" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after42" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after43" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after44" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after45" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after46" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after47" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after48" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after49" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after50" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after51" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after52" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after53" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after54" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after55" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after56" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after57" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after58" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after59" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after60" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after61" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after62" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after63" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after64" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after65" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
+      <after name="after66" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterAspect"/>
   	</bind>
   	
-  	<aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect" scope="PER_VM"/>
+  	<aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect" scope="PER_VM"/>
    
-  	<bind pointcut="execution(org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->new(org.jboss.test.aop.beforeafterArgs.SubInterface,org.jboss.test.aop.beforeafterArgs.Implementor))">
-   	<throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing18" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing19" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing20" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing21" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing22" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing23" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing24" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing25" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing26" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing27" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing28" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing29" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing30" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing31" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing32" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing33" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing34" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
+  	<bind pointcut="execution(org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->new(org.jboss.test.aop.annotatedAdviceParams.SubInterface,org.jboss.test.aop.annotatedAdviceParams.Implementor))">
+   	<throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing18" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing19" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing20" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing21" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing22" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing23" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing24" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing25" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing26" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing27" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing28" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing29" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing30" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing31" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing32" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing33" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing34" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
   	</bind>
   	
-  	<bind pointcut="execution(org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->new(org.jboss.test.aop.beforeafterArgs.Interface,org.jboss.test.aop.beforeafterArgs.Implementor,int))">
-   	<throwing name="throwing35" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing36" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing37" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
-   	<throwing name="throwing38" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingAspect"/>
+  	<bind pointcut="execution(org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->new(org.jboss.test.aop.annotatedAdviceParams.Interface,org.jboss.test.aop.annotatedAdviceParams.Implementor,int))">
+   	<throwing name="throwing35" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing36" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing37" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
+   	<throwing name="throwing38" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingAspect"/>
   	</bind>
   	
-   <aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect" scope="PER_VM"/>
 
-   <bind pointcut="execution(public java.lang.String org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->method5(int,long))">
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally18" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally19" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally20" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally21" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally22" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally23" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally24" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally25" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally26" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally27" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally28" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally29" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally30" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally31" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally32" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally33" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally34" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally35" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally36" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally37" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally38" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally39" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally40" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally41" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally42" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally43" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally44" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally45" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally46" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally47" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally48" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally49" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally50" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally51" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally52" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally53" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally54" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally55" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally56" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally57" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally58" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally59" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally60" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally61" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally62" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally63" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally64" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally65" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally66" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally67" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally68" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally69" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally70" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
-      <finally name="finally71" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyAspect"/>
+   <bind pointcut="execution(public java.lang.String org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->method5(int,long))">
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally18" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally19" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally20" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally21" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally22" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally23" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally24" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally25" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally26" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally27" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally28" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally29" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally30" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally31" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally32" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally33" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally34" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally35" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally36" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally37" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally38" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally39" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally40" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally41" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally42" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally43" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally44" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally45" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally46" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally47" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally48" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally49" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally50" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally51" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally52" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally53" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally54" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally55" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally56" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally57" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally58" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally59" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally60" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally61" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally62" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally63" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally64" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally65" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally66" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally67" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally68" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally69" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally70" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
+      <finally name="finally71" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyAspect"/>
    </bind>
    
-  	<aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect" scope="PER_VM"/>
-  	<aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect" scope="PER_VM"/>
-  	<aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect" scope="PER_VM"/>
-   <aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect" scope="PER_VM"/>
+  	<aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect" scope="PER_VM"/>
+  	<aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect" scope="PER_VM"/>
+  	<aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect" scope="PER_VM"/>
+   <aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect" scope="PER_VM"/>
   	
-   <bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->method3(int))">
-      <before name="before1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before18" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before19" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before20" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before21" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before22" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before23" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before24" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before25" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before26" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before27" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before28" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before29" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before30" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before31" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before32" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before33" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before34" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before35" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before36" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before37" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before38" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before39" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before40" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before41" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before42" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before43" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <before name="before44" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedBeforeCallAspect"/>
-  	   <around name="around1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around18" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around19" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around20" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around21" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around22" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around23" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around24" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around25" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around26" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around27" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around28" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-      <around name="around29" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around30" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around31" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around32" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around33" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around34" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around35" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around36" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around37" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around38" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around39" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around40" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around41" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around42" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around43" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around44" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <around name="around45" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAroundCallAspect"/>
-  	   <after name="after1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after18" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after19" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-  	   <after name="after20" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after21" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after22" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after23" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after24" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after25" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after26" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after27" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after28" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after29" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after30" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after31" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after32" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after33" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after34" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after35" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after36" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after37" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after38" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after39" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after40" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after41" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after42" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after43" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after44" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after45" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after46" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after47" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after48" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after49" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <after name="after50" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedAfterCallAspect"/>
-      <finally name="finally1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally18" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally19" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally20" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally21" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally22" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally23" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally24" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally25" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally26" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally27" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally28" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally29" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally30" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally31" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally32" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally33" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally34" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally35" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally36" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally37" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally38" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally39" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally40" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally41" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally42" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally43" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally44" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally45" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally46" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally47" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally48" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally49" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally50" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally51" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally52" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally53" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally54" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally55" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally56" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally57" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally58" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally59" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally60" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally61" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
-      <finally name="finally62" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedFinallyCallAspect"/>
+   <bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->method3(int))">
+      <before name="before1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before18" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before19" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before20" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before21" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before22" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before23" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before24" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before25" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before26" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before27" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before28" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before29" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before30" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before31" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before32" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before33" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before34" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before35" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before36" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before37" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before38" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before39" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before40" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before41" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before42" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before43" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <before name="before44" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedBeforeCallAspect"/>
+  	   <around name="around1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around18" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around19" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around20" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around21" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around22" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around23" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around24" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around25" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around26" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around27" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around28" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+      <around name="around29" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around30" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around31" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around32" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around33" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around34" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around35" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around36" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around37" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around38" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around39" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around40" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around41" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around42" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around43" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around44" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <around name="around45" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAroundCallAspect"/>
+  	   <after name="after1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after18" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after19" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+  	   <after name="after20" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after21" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after22" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after23" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after24" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after25" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after26" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after27" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after28" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after29" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after30" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after31" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after32" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after33" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after34" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after35" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after36" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after37" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after38" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after39" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after40" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after41" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after42" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after43" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after44" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after45" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after46" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after47" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after48" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after49" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <after name="after50" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedAfterCallAspect"/>
+      <finally name="finally1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally18" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally19" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally20" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally21" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally22" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally23" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally24" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally25" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally26" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally27" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally28" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally29" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally30" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally31" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally32" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally33" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally34" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally35" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally36" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally37" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally38" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally39" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally40" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally41" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally42" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally43" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally44" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally45" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally46" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally47" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally48" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally49" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally50" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally51" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally52" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally53" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally54" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally55" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally56" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally57" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally58" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally59" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally60" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally61" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
+      <finally name="finally62" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedFinallyCallAspect"/>
   	</bind>
   	
-  	<aspect class="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect" scope="PER_VM"/>
+  	<aspect class="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect" scope="PER_VM"/>
   	
-  	<bind pointcut="call(* org.jboss.test.aop.beforeafterArgs.OverloadedAdvicePOJO->method4(boolean))">
-  	   <throwing name="throwing1" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing2" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing3" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing4" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing5" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing6" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing7" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing8" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing9" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing10" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing11" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing12" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing13" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing14" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing15" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing16" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing17" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing18" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing19" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing20" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing21" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing22" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing23" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing24" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing25" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing26" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing27" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing28" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing29" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing30" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing31" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing32" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing33" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing34" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing35" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing36" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
-  	   <throwing name="throwing37" aspect="org.jboss.test.aop.beforeafterArgs.OverloadedThrowingCallAspect"/>
+  	<bind pointcut="call(* org.jboss.test.aop.annotatedAdviceParams.OverloadedAdvicePOJO->method4(boolean))">
+  	   <throwing name="throwing1" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing2" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing3" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing4" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing5" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing6" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing7" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing8" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing9" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing10" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing11" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing12" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing13" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing14" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing15" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing16" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing17" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing18" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing19" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing20" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing21" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing22" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing23" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing24" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing25" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing26" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing27" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing28" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing29" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing30" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing31" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing32" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing33" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing34" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing35" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing36" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
+  	   <throwing name="throwing37" aspect="org.jboss.test.aop.annotatedAdviceParams.OverloadedThrowingCallAspect"/>
   	</bind>
 </aop>
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams (from rev 65215, projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs)

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Arg2TestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Arg2TestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Arg2TestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import org.jboss.test.aop.AOPTestWithSetup;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import java.util.Collection;
 
@@ -36,7 +36,7 @@
  * only with generated advisors).
  * 
  * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
- * @see org.jboss.test.aop.beforeafterArgs.ArgAspect
+ * @see org.jboss.test.aop.annotatedAdviceParams.ArgAspect
  */
 public class ArgAspect
 {

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspect2.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspect2.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspect2.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
   * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectGenerics.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspectGenerics.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectGenerics.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,8 +36,8 @@
  * Aspect used on @Arg parameter tests that involve generic argument types.
  * 
  * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
- * @see org.jboss.test.aop.beforeafterArgs.ArgAspect
- * @see org.jboss.test.aop.beforeafterArgs.ArgAspetInterfaces
+ * @see org.jboss.test.aop.annotatedAdviceParams.ArgAspect
+ * @see org.jboss.test.aop.annotatedAdviceParams.ArgAspetInterfaces
  */
 public class ArgAspectGenerics
 {

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectInterfaces.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspectInterfaces.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectInterfaces.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 
@@ -32,8 +32,8 @@
  * arguments.
  * 
  * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
- * @see org.jboss.test.aop.beforeafterArgs.ArgAspect
- * @see org.jboss.test.aop.beforeafterArgs.ArgAspectInvertedArgs
+ * @see org.jboss.test.aop.annotatedAdviceParams.ArgAspect
+ * @see org.jboss.test.aop.annotatedAdviceParams.ArgAspectInvertedArgs
  */
 public class ArgAspectInterfaces
 {

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectInvertedArgs.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspectInvertedArgs.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgAspectInvertedArgs.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 
@@ -31,8 +31,8 @@
  * Aspect used on @Arg parameter tests that involve arguments in inverted positions.
  * 
  * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
- * @see org.jboss.test.aop.beforeafterArgs.ArgAspect
- * @see org.jboss.test.aop.beforeafterArgs.ArgAspetInterfaces
+ * @see org.jboss.test.aop.annotatedAdviceParams.ArgAspect
+ * @see org.jboss.test.aop.annotatedAdviceParams.ArgAspetInterfaces
  */
 public class ArgAspectInvertedArgs
 {

Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidJDK50TestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidJDK50TestCase.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidJDK50TestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -0,0 +1,386 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.aop.annotatedAdviceParams;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.jboss.aop.advice.NoMatchingAdviceException;
+import org.jboss.test.aop.AOPTestWithSetup;
+
+/**
+ * Tests that have been temporarily removed from {@link ArgInvalidTestCase} (task
+ * JBAOP-458)
+ * 
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class ArgInvalidJDK50TestCase extends AOPTestWithSetup
+{
+   private ArgsInvalidPOJO pojo;
+
+   public static void main(String[] args)
+   {
+      TestRunner.run(suite());
+   }
+
+   public static Test suite()
+   {
+      TestSuite suite = new TestSuite("ArgTestCase");
+      suite.addTestSuite(ArgInvalidJDK50TestCase.class);
+      return suite;
+   }
+
+   public ArgInvalidJDK50TestCase(String name)
+   {
+      super(name);
+   }
+
+   public void setUp() throws Exception
+   {
+      super.setUp();
+      this.pojo = new ArgsInvalidPOJO();
+      ArgAspect.clear();
+      ArgAspectInterfaces.clear();
+      ArgAspectInvertedArgs.clear();
+      ArgAspectGenerics.clear();
+   }
+
+   public void testGenerics1()
+   {
+      List<SuperValue> list = new ArrayList<SuperValue>();
+      boolean thrown = false;
+      try
+      {
+         pojo.method13Before7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Before8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Around5(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Around7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Around8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13After5(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13After7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13After8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Throwing2(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Throwing7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Throwing8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Finally5(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Finally7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method13Finally8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+   }
+   
+   public void testGenerics2() throws POJOException
+   {
+      List<SuperValue> list = new ArrayList<SuperValue>();
+      boolean thrown = false;
+      try
+      {
+         pojo.method14Before7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Before8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Around5(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Around7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Around8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14After5(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14After7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14After8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Throwing2(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Throwing7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Throwing8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Finally5(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Finally7(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+      
+      thrown = false;
+      try
+      {
+         pojo.method14Finally8(list);
+      }
+      catch(NoMatchingAdviceException e)
+      {
+         thrown = true;
+      }
+      assertTrue(thrown);
+   }
+}
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Deleted: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCaseJDK50.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCaseJDK50.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgInvalidTestCaseJDK50.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -1,386 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.aop.beforeafterArgs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.jboss.aop.advice.NoMatchingAdviceException;
-import org.jboss.test.aop.AOPTestWithSetup;
-
-/**
- * Tests that have been temporarily removed from {@link ArgInvalidTestCase} (task
- * JBAOP-458)
- * 
- * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
- */
-public class ArgInvalidTestCaseJDK50 extends AOPTestWithSetup
-{
-   private ArgsInvalidPOJO pojo;
-
-   public static void main(String[] args)
-   {
-      TestRunner.run(suite());
-   }
-
-   public static Test suite()
-   {
-      TestSuite suite = new TestSuite("ArgTestCase");
-      suite.addTestSuite(ArgInvalidTestCaseJDK50.class);
-      return suite;
-   }
-
-   public ArgInvalidTestCaseJDK50(String name)
-   {
-      super(name);
-   }
-
-   public void setUp() throws Exception
-   {
-      super.setUp();
-      this.pojo = new ArgsInvalidPOJO();
-      ArgAspect.clear();
-      ArgAspectInterfaces.clear();
-      ArgAspectInvertedArgs.clear();
-      ArgAspectGenerics.clear();
-   }
-
-   public void testGenerics1()
-   {
-      List<SuperValue> list = new ArrayList<SuperValue>();
-      boolean thrown = false;
-      try
-      {
-         pojo.method13Before7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Before8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Around5(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Around7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Around8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13After5(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13After7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13After8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Throwing2(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Throwing7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Throwing8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Finally5(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Finally7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method13Finally8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-   }
-   
-   public void testGenerics2() throws POJOException
-   {
-      List<SuperValue> list = new ArrayList<SuperValue>();
-      boolean thrown = false;
-      try
-      {
-         pojo.method14Before7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Before8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Around5(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Around7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Around8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14After5(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14After7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14After8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Throwing2(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Throwing7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Throwing8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Finally5(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Finally7(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-      
-      thrown = false;
-      try
-      {
-         pojo.method14Finally8(list);
-      }
-      catch(NoMatchingAdviceException e)
-      {
-         thrown = true;
-      }
-      assertTrue(thrown);
-   }
-}
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgPOJOInterface.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgPOJOInterface.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgPOJOInterface.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Interface implemented by {@link ArgsPOJO2}.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,8 +41,8 @@
  * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
  * 
  * @see ArgsTestCase
- * @see org.jboss.test.aop.beforeafterArgs.Arg2TestCase
- * @see org.jboss.test.aop.args.ArgumentsTestCase
+ * @see org.jboss.test.aop.annotatedAdviceParams.Arg2TestCase
+ * @see org.jboss.test.aop.arguments.ArgumentsTestCase
  */
 public class ArgTestCase extends AOPTestWithSetup
 {

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsInvalidPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import java.util.Collection;
 import java.util.List;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsInvalidTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsInvalidTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import java.util.Collection;
 import java.util.List;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO2.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsPOJO2.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsPOJO2.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 
 
@@ -33,8 +33,6 @@
  */
 public class ArgsPOJO2 implements ArgPOJOInterface
 {
-   /* ArgTestCase */
-   
    public String echo(String echo)
    {
       return echo;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgsTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ArgsTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/CallerAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/CallerInvalidTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerInvalidTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/CallerTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/CallerTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Implementor.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Implementor.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Implementor.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Class used on before/after/throwing annotated parameter tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Interface.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/Interface.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/Interface.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * @author  <a href="flavia.rainone at jboss.com">Flavia Rainone</a>

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointInvalidPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Plain old java object used on @JoinPoint parameter tests with invalid advices(its

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointInvalidTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointInvalidTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Plain old java object used on @JoinPoint parameter tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/JoinPointTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdvicePOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdvicePOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdvicePOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Plain old java object used on overloaded advice tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdvicePOJOCaller.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdvicePOJOCaller.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdvicePOJOCaller.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Plain old java object used on overloaded advice tests )for Call and Target

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdviceTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAdviceTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAfterAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAfterAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAfterCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterCallAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAfterCallAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAroundAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAroundAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAroundAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
   * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAroundCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAroundCallAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedAroundCallAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedBeforeAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedBeforeAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedBeforeCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeCallAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedBeforeCallAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedFinallyAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedFinallyAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import java.io.Serializable;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedFinallyCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyCallAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedFinallyCallAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedThrowingAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedThrowingAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedThrowingCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingCallAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/OverloadedThrowingCallAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/POJOException.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/POJOException.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/POJOException.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Class used on before/after/throwing annotated parameter tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnInvalidPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Plain old java object used both on @Return parameter tests with invalid advices(

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnInvalidTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnInvalidTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Plain old java object used both on @Return parameter tests, and on advice return

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ReturnTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubClass.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubClass.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubClass.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Class used on before/after/throwing annotated parameter tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubInterface.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubInterface.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubInterface.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Class used on before/after/throwing annotated parameter tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubValue.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SubValue.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SubValue.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperClass.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperClass.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperClass.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Class used on before/after/throwing annotated parameter tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperInterface.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperInterface.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperInterface.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Class used on before/after/throwing annotated parameter tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperValue.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/SuperValue.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/SuperValue.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
 * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 */ 
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetCallerInvalidPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerInvalidPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 enum InvalidCallType {CONSTRUCTOR_BEFORE, CONSTRUCTOR_AROUND, CONSTRUCTOR_AFTER,
    CONSTRUCTOR_THROWING, CONSTRUCTOR_FINALLY,

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetCallerPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetCallerPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 enum CallType {CONSTRUCTOR, METHOD, STATIC_METHOD}
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetInvalidTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetInvalidTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/TargetTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/TargetTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ThrownAspect.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownAspect.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Assert;
 

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownInvalidPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ThrownInvalidPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownInvalidPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Plain old java object used on @Thrown parameter tests with invalid advices (its

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ThrownInvalidTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownInvalidTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownPOJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ThrownPOJO.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownPOJO.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 /**
  * Plain old java object used on @Thrown parameter tests.

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ThrownTestCase.java	2007-09-06 22:45:16 UTC (rev 65215)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/annotatedAdviceParams/ThrownTestCase.java	2007-09-07 00:05:34 UTC (rev 65219)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.test.aop.beforeafterArgs;
+package org.jboss.test.aop.annotatedAdviceParams;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;