[jboss-cvs] JBossAS SVN: r63439 - in projects/aop/trunk/aop/src: main/org/jboss/aop/instrument and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Jun 9 01:32:35 EDT 2007


Author: flavia.rainone at jboss.com
Date: 2007-06-09 01:32:34 -0400 (Sat, 09 Jun 2007)
New Revision: 63439

Added:
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/Construction.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCall.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByConstructor.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByMethod.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorExecution.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldAccess.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/JoinPointBean.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCall.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByConstructor.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByMethod.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodExecution.java
Removed:
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ICallerConstructorInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ICallerMethodInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByConInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByMethodInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructionInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructorInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IFieldInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IJoinPointInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByConInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByMethodInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodInfo.java
Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/CallerConstructorInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/CallerMethodInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/ConByConInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/ConByMethodInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/ConstructionInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/ConstructorInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/FieldInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/JoinPointInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByConInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByMethodInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructionJoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingCallAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnAspect.java
Log:
[JBAOP-373] Refactoring of new interface names plus adaptation of tests complete. (notice the name of the interfaces are not definitive yet)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/CallerConstructorInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/CallerConstructorInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/CallerConstructorInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -22,7 +22,7 @@
 package org.jboss.aop;
 
 import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.ICallerConstructorInfo;
+import org.jboss.aop.joinpoint.ConstructorCall;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -34,7 +34,7 @@
  * @version $Revision$
  *
  **/
-public abstract class CallerConstructorInfo extends JoinPointInfo implements ICallerConstructorInfo
+public abstract class CallerConstructorInfo extends JoinPointInfo implements ConstructorCall
 {
    private final Constructor constructor;
    private final Class callingClass;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/CallerMethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/CallerMethodInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/CallerMethodInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -22,7 +22,7 @@
 package org.jboss.aop;
 
 import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.ICallerMethodInfo;
+import org.jboss.aop.joinpoint.MethodCall;
 
 import java.lang.reflect.Method;
 
@@ -33,7 +33,7 @@
  * @version $Revision$
  *
  **/
-public abstract class CallerMethodInfo extends JoinPointInfo implements ICallerMethodInfo
+public abstract class CallerMethodInfo extends JoinPointInfo implements MethodCall
 {
    private final Class callingClass;
    private final Class calledClass;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ConByConInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ConByConInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ConByConInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -26,7 +26,7 @@
 
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.ConstructorCalledByConstructorJoinpoint;
-import org.jboss.aop.joinpoint.IConByConInfo;
+import org.jboss.aop.joinpoint.ConstructorCallByConstructor;
 import org.jboss.aop.joinpoint.Joinpoint;
 
 /**
@@ -34,7 +34,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision$
  */
-public class ConByConInfo extends CallerConstructorInfo implements IConByConInfo
+public class ConByConInfo extends CallerConstructorInfo implements ConstructorCallByConstructor
 {
    private final int callingIndex;
    private final Constructor calling;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ConByMethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ConByMethodInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ConByMethodInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -26,7 +26,7 @@
 
 import org.jboss.aop.advice.Interceptor;
 import org.jboss.aop.joinpoint.ConstructorCalledByMethodJoinpoint;
-import org.jboss.aop.joinpoint.IConByMethodInfo;
+import org.jboss.aop.joinpoint.ConstructorCallByMethod;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.aop.util.MethodHashing;
 
@@ -35,7 +35,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision$
  */
-public class ConByMethodInfo extends CallerConstructorInfo implements IConByMethodInfo
+public class ConByMethodInfo extends CallerConstructorInfo implements ConstructorCallByMethod
 {
    private final long callingMethodHash;
    private final Method callingMethod;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ConstructionInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ConstructionInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ConstructionInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -24,7 +24,7 @@
 import java.lang.reflect.Constructor;
 
 import org.jboss.aop.joinpoint.ConstructorJoinpoint;
-import org.jboss.aop.joinpoint.IConstructionInfo;
+import org.jboss.aop.joinpoint.Construction;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.aop.util.MethodHashing;
 
@@ -34,7 +34,7 @@
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
  * @version $Revision$
  */
-public class ConstructionInfo extends JoinPointInfo implements IConstructionInfo
+public class ConstructionInfo extends JoinPointInfo implements Construction
 {
    private Constructor constructor;
    private int index;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ConstructorInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ConstructorInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ConstructorInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -25,7 +25,7 @@
 import java.lang.reflect.Method;
 
 import org.jboss.aop.joinpoint.ConstructorJoinpoint;
-import org.jboss.aop.joinpoint.IConstructorInfo;
+import org.jboss.aop.joinpoint.ConstructorExecution;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.aop.util.MethodHashing;
 
@@ -35,7 +35,7 @@
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
  * @version $Revision$
  */
-public class ConstructorInfo extends JoinPointInfo implements IConstructorInfo
+public class ConstructorInfo extends JoinPointInfo implements ConstructorExecution
 {
    private Method wrapper;
    private Constructor constructor;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/FieldInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/FieldInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/FieldInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -28,7 +28,7 @@
 import java.security.PrivilegedExceptionAction;
 
 import org.jboss.aop.joinpoint.FieldJoinpoint;
-import org.jboss.aop.joinpoint.IFieldInfo;
+import org.jboss.aop.joinpoint.FieldAccess;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.aop.util.MethodHashing;
 
@@ -38,7 +38,7 @@
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
  * @version $Revision$
  */
-public class FieldInfo extends JoinPointInfo implements IFieldInfo
+public class FieldInfo extends JoinPointInfo implements FieldAccess
 {
    private int index;
    private Field advisedField;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/JoinPointInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/JoinPointInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/JoinPointInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -26,10 +26,10 @@
 
 import org.jboss.aop.advice.GeneratedAdvisorInterceptor;
 import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.IJoinPointInfo;
+import org.jboss.aop.joinpoint.JoinPointBean;
 import org.jboss.aop.joinpoint.Joinpoint;
 
-public abstract class JoinPointInfo implements IJoinPointInfo
+public abstract class JoinPointInfo implements JoinPointBean
 {
    private Interceptor[] interceptors;
 

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByConInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByConInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByConInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -25,7 +25,7 @@
 import java.lang.reflect.Method;
 
 import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.IMethodByConInfo;
+import org.jboss.aop.joinpoint.MethodCallByConstructor;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.aop.joinpoint.MethodCalledByConstructorJoinpoint;
 
@@ -34,7 +34,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision$
  */
-public class MethodByConInfo extends CallerMethodInfo implements IMethodByConInfo
+public class MethodByConInfo extends CallerMethodInfo implements MethodCallByConstructor
 {
 
    private final int callingIndex;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByMethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByMethodInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByMethodInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -24,7 +24,7 @@
 import java.lang.reflect.Method;
 
 import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.IMethodByMethodInfo;
+import org.jboss.aop.joinpoint.MethodCallByMethod;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.aop.joinpoint.MethodCalledByMethodJoinpoint;
 import org.jboss.aop.util.MethodHashing;
@@ -34,7 +34,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision$
  */
-public class MethodByMethodInfo extends CallerMethodInfo implements IMethodByMethodInfo
+public class MethodByMethodInfo extends CallerMethodInfo implements MethodCallByMethod
 {
    private final long callingMethodHash;
    private final Method callingMethod;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -21,7 +21,7 @@
   */
 package org.jboss.aop;
 
-import org.jboss.aop.joinpoint.IMethodInfo;
+import org.jboss.aop.joinpoint.MethodExecution;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.aop.joinpoint.MethodJoinpoint;
 import org.jboss.aop.util.MethodHashing;
@@ -31,7 +31,7 @@
 /**
  *  This class is here to eliminate a hash lookup in invokeMethod
  */
-public class MethodInfo extends JoinPointInfo implements IMethodInfo
+public class MethodInfo extends JoinPointInfo implements MethodExecution
 {
    private Method advisedMethod;
    private Method unadvisedMethod;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -38,7 +38,9 @@
 import org.jboss.aop.GeneratedClassAdvisor;
 import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.AdviceMethodProperties;
+import org.jboss.aop.joinpoint.ConstructorCallByConstructor;
 import org.jboss.aop.joinpoint.ConstructorCalledByConstructorInvocation;
+import org.jboss.aop.joinpoint.JoinPointBean;
 import org.jboss.aop.util.ReflectToJavassist;
 
 /**
@@ -51,6 +53,7 @@
    public static final String JOINPOINT_CLASS_PREFIX = JoinPointGenerator.JOINPOINT_CLASS_PREFIX + "CByC_";
    public static final String JOINPOINT_FIELD_PREFIX = JoinPointGenerator.JOINPOINT_FIELD_PREFIX + "CByC_";
 
+   private static final Class JOINPOINT_TYPE = ConstructorCallByConstructor.class;
    private static final Class INVOCATION_TYPE = ConstructorCalledByConstructorInvocation.class;
    private static final CtClass INVOCATION_CT_TYPE;
    static
@@ -115,19 +118,20 @@
       return (Class)returnType.get();
    }
 
-   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup)
+   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
    {
-      Constructor ctor = ((ConByConInfo)info).getConstructor();
+      ConstructorCallByConstructor call = (ConstructorCallByConstructor) joinPoint;
+      Constructor ctor = call.getConstructor();
       AdviceMethodProperties properties = new AdviceMethodProperties(
             setup.getAspectClass(),
             setup.getAdviceName(),
-            info.getClass(),
+            JOINPOINT_TYPE,
             INVOCATION_TYPE,
             ctor.getDeclaringClass(),
             ctor.getParameterTypes(),
             ctor.getExceptionTypes(),
-            ((ConByConInfo) info).getCalledClass(), false,
-            ((ConByConInfo) info).getCallingClass(),
+            call.getCalledClass(), false,
+            call.getCallingClass(),
             true);
       return properties;
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -38,8 +38,9 @@
 import org.jboss.aop.GeneratedClassAdvisor;
 import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.AdviceMethodProperties;
-import org.jboss.aop.advice.AdviceMethodProperties.OptionalParameters;
+import org.jboss.aop.joinpoint.ConstructorCallByMethod;
 import org.jboss.aop.joinpoint.ConstructorCalledByMethodInvocation;
+import org.jboss.aop.joinpoint.JoinPointBean;
 import org.jboss.aop.util.ReflectToJavassist;
 
 /**
@@ -51,6 +52,7 @@
 {
    public static final String JOINPOINT_CLASS_PREFIX = JoinPointGenerator.JOINPOINT_CLASS_PREFIX + "CByM_";
    public static final String JOINPOINT_FIELD_PREFIX = JoinPointGenerator.JOINPOINT_FIELD_PREFIX + "CByM_";
+   private static final Class JOINPOINT_TYPE = ConstructorCallByMethod.class;
    private static final Class INVOCATION_TYPE = ConstructorCalledByMethodInvocation.class;
    private static final CtClass INVOCATION_CT_TYPE;
    static
@@ -125,20 +127,21 @@
       return (Class)returnType.get();
    }
 
-   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup)
+   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
    {
-      Constructor ctor = ((ConByMethodInfo)info).getConstructor();
+      ConstructorCallByMethod call = (ConstructorCallByMethod) joinPoint;
+      Constructor ctor = call.getConstructor();
       AdviceMethodProperties properties = new AdviceMethodProperties(
                setup.getAspectClass(),
                setup.getAdviceName(),
-               info.getClass(),
+               JOINPOINT_TYPE,
                INVOCATION_TYPE,
                ctor.getDeclaringClass(),
                ctor.getParameterTypes(),
                ctor.getExceptionTypes(),
-               ((ConByMethodInfo) info).getCalledClass(),
+               call.getCalledClass(),
                false,
-               ((ConByMethodInfo) info).getCallingClass(),
+               call.getCallingClass(),
                hasCallingObject());
       return properties;
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructionJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructionJoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructionJoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -38,7 +38,9 @@
 import org.jboss.aop.GeneratedClassAdvisor;
 import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.AdviceMethodProperties;
+import org.jboss.aop.joinpoint.Construction;
 import org.jboss.aop.joinpoint.ConstructionInvocation;
+import org.jboss.aop.joinpoint.JoinPointBean;
 import org.jboss.aop.util.ReflectToJavassist;
 
 /**
@@ -50,6 +52,8 @@
 {
    public static final String JOINPOINT_CLASS_PREFIX = JoinPointGenerator.JOINPOINT_CLASS_PREFIX + "construction_";
    public static final String JOINPOINT_FIELD_PREFIX = JoinPointGenerator.JOINPOINT_FIELD_PREFIX + "construction_";
+   
+   private static final Class JOINPOINT_TYPE = Construction.class;
    private static final Class INVOCATION_TYPE = ConstructionInvocation.class;
    private static final CtClass INVOCATION_CT_TYPE;
    static
@@ -104,13 +108,13 @@
       return null;
    }
 
-   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup)
+   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
    {
-      Constructor ctor = ((ConstructionInfo)info).getConstructor();
+      Constructor ctor = ((Construction)joinPoint).getConstructor();
       return new AdviceMethodProperties(
             setup.getAspectClass(),
             setup.getAdviceName(),
-            info.getClass(),
+            JOINPOINT_TYPE,
             INVOCATION_TYPE,
             ctor.getDeclaringClass(),
             ctor.getParameterTypes(),

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -39,7 +39,9 @@
 import org.jboss.aop.GeneratedClassAdvisor;
 import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.AdviceMethodProperties;
+import org.jboss.aop.joinpoint.ConstructorExecution;
 import org.jboss.aop.joinpoint.ConstructorInvocation;
+import org.jboss.aop.joinpoint.JoinPointBean;
 import org.jboss.aop.util.ReflectToJavassist;
 
 /**
@@ -51,6 +53,7 @@
 {
    public static final String JOINPOINT_CLASS_PREFIX = JoinPointGenerator.JOINPOINT_CLASS_PREFIX + "constructor_";
    public static final String JOINPOINT_FIELD_PREFIX = JoinPointGenerator.JOINPOINT_FIELD_PREFIX + "constructor_";
+   private static final Class JOINPOINT_TYPE = ConstructorExecution.class;
    private static final Class INVOCATION_TYPE = ConstructorInvocation.class;
    private static final CtClass INVOCATION_CT_TYPE;
    static
@@ -108,13 +111,13 @@
       return (Class)returnType.get();
    }
 
-   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup)
+   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
    {
-      Constructor ctor = ((ConstructorInfo)info).getConstructor();
+      Constructor ctor = ((ConstructorExecution)joinPoint).getConstructor();
       return new AdviceMethodProperties(
             setup.getAspectClass(),
             setup.getAdviceName(),
-            info.getClass(),
+            JOINPOINT_TYPE,
             INVOCATION_TYPE,
             ctor.getDeclaringClass(),
             ctor.getParameterTypes(),

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -38,8 +38,10 @@
 import org.jboss.aop.GeneratedClassAdvisor;
 import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.AdviceMethodProperties;
+import org.jboss.aop.joinpoint.FieldAccess;
 import org.jboss.aop.joinpoint.FieldReadInvocation;
 import org.jboss.aop.joinpoint.FieldWriteInvocation;
+import org.jboss.aop.joinpoint.JoinPointBean;
 import org.jboss.aop.util.JavassistToReflect;
 import org.jboss.aop.util.ReflectToJavassist;
 
@@ -54,6 +56,7 @@
    public static final String READ_JOINPOINT_FIELD_PREFIX = JOINPOINT_FIELD_PREFIX + "r_";
    public static final String WRITE_JOINPOINT_CLASS_PREFIX = JOINPOINT_CLASS_PREFIX + "w_";
    public static final String READ_JOINPOINT_CLASS_PREFIX = JOINPOINT_CLASS_PREFIX + "r_";
+   private static final Class JOINPOINT_TYPE = FieldAccess.class;
    private static final Class READ_INVOCATION_TYPE = FieldReadInvocation.class;
    private static final Class WRITE_INVOCATION_TYPE = FieldWriteInvocation.class;
    private static final CtClass READ_INVOCATION_CT_TYPE;
@@ -80,7 +83,7 @@
       super(advisor, info, getParameters((FieldInfo) info),
             ((FieldInfo) info).isRead()? 0: 1);
 
-      if (read((FieldInfo)info))
+      if (((FieldInfo)info).isRead())
       {
          read = true;
          returnType = new WeakReference(((FieldInfo)info).getAdvisedField().getType());
@@ -101,10 +104,10 @@
    {
       FieldInfo finfo = (FieldInfo)info;
       joinpointClassName =
-         getGeneratedJoinPointClassName(fieldName(finfo), read(finfo));
+         getGeneratedJoinPointClassName(fieldName(finfo), finfo.isRead());
 
       joinpointFieldName =
-         getGeneratedJoinPointFieldName(fieldName(finfo), read(finfo));
+         getGeneratedJoinPointFieldName(fieldName(finfo), finfo.isRead());
    }
 
    private String fieldName(FieldInfo info)
@@ -112,11 +115,6 @@
       return info.getAdvisedField().getName();
    }
 
-   private boolean read(FieldInfo info)
-   {
-      return info.isRead();
-   }
-
    protected boolean isVoid()
    {
       return !read;
@@ -131,17 +129,17 @@
       return null;
    }
 
-   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup)
+   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
    {
-      FieldInfo finfo = (FieldInfo)info;
-      Field field = finfo.getAdvisedField();
+      FieldAccess fieldAccess = (FieldAccess)joinPoint;
+      Field field = fieldAccess.getAdvisedField();
       return new AdviceMethodProperties(
                setup.getAspectClass(),
                setup.getAdviceName(),
-               info.getClass(),
-               (read(finfo)) ? READ_INVOCATION_TYPE : WRITE_INVOCATION_TYPE,
-               (read(finfo)) ? getReturnType() : Void.TYPE,
-               (read(finfo)) ? new Class[] {} : new Class[] {field.getType()},
+               JOINPOINT_TYPE,
+               (fieldAccess.isRead()) ? READ_INVOCATION_TYPE : WRITE_INVOCATION_TYPE,
+               (fieldAccess.isRead()) ? getReturnType() : Void.TYPE,
+               (fieldAccess.isRead()) ? new Class[] {} : new Class[] {field.getType()},
                null,
                field.getDeclaringClass(),
                hasTargetObject());

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -54,6 +54,7 @@
 import org.jboss.aop.advice.Scope;
 import org.jboss.aop.advice.annotation.AdviceMethodFactory;
 import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.joinpoint.JoinPointBean;
 import org.jboss.aop.pointcut.ast.ASTCFlowExpression;
 import org.jboss.aop.pointcut.ast.ClassExpression;
 import org.jboss.aop.util.JavassistUtils;
@@ -361,7 +362,7 @@
 
    protected abstract boolean isVoid();
    protected abstract Class getReturnType(); 
-   protected abstract AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup);
+   protected abstract AdviceMethodProperties getAdviceMethodProperties(JoinPointBean info, AdviceSetup setup);
    
    protected boolean isCaller()
    {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -38,6 +38,8 @@
 import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.MethodByConInfo;
 import org.jboss.aop.advice.AdviceMethodProperties;
+import org.jboss.aop.joinpoint.JoinPointBean;
+import org.jboss.aop.joinpoint.MethodCallByConstructor;
 import org.jboss.aop.joinpoint.MethodCalledByConstructorInvocation;
 import org.jboss.aop.util.ReflectToJavassist;
 
@@ -46,6 +48,8 @@
    public static final String JOINPOINT_CLASS_PREFIX = JoinPointGenerator.JOINPOINT_CLASS_PREFIX + "MByC_";
    public static final String JOINPOINT_FIELD_PREFIX = JoinPointGenerator.JOINPOINT_FIELD_PREFIX + "MByC_";
    private static final Class INVOCATION_TYPE = MethodCalledByConstructorInvocation.class;
+   private static final Class JOINPOINT_TYPE = MethodCallByConstructor.class;
+   
    private static final CtClass INVOCATION_CT_TYPE;
    static
    {
@@ -126,20 +130,20 @@
       return (Class)returnType.get();
    }
 
-   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup)
+   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
    {
-      Method method = ((MethodByConInfo)info).getMethod();
+      Method method = ((MethodCallByConstructor)joinPoint).getMethod();
       return new AdviceMethodProperties(
                setup.getAspectClass(),
                setup.getAdviceName(),
-               info.getClass(),
+               JOINPOINT_TYPE,
                INVOCATION_TYPE,
                method.getReturnType(),
                method.getParameterTypes(),
                method.getExceptionTypes(),
                method.getDeclaringClass(),
                hasTargetObject(),
-               ((MethodByConInfo) info).getCallingClass(),
+               ((MethodCallByConstructor) joinPoint).getCallingClass(),
                hasCallingObject());
    }
 

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -38,6 +38,8 @@
 import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.MethodByMethodInfo;
 import org.jboss.aop.advice.AdviceMethodProperties;
+import org.jboss.aop.joinpoint.JoinPointBean;
+import org.jboss.aop.joinpoint.MethodCallByMethod;
 import org.jboss.aop.joinpoint.MethodCalledByMethodInvocation;
 import org.jboss.aop.util.ReflectToJavassist;
 
@@ -45,6 +47,7 @@
 {
    public static final String JOINPOINT_CLASS_PREFIX = JoinPointGenerator.JOINPOINT_CLASS_PREFIX + "MByM_";
    public static final String JOINPOINT_FIELD_PREFIX = JoinPointGenerator.JOINPOINT_FIELD_PREFIX + "MByM_";
+   private static final Class JOINPOINT_TYPE = MethodCallByMethod.class;
    private static final Class INVOCATION_TYPE = MethodCalledByMethodInvocation.class;
    private static final CtClass INVOCATION_CT_TYPE;
    static
@@ -136,20 +139,20 @@
       return (Class)returnType.get();
    }
 
-   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup)
+   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
    {
-      Method method = ((MethodByMethodInfo)info).getMethod();
+      Method method = ((MethodCallByMethod)joinPoint).getMethod();
       return new AdviceMethodProperties(
                setup.getAspectClass(),
                setup.getAdviceName(),
-               info.getClass(),
+               JOINPOINT_TYPE,
                INVOCATION_TYPE,
                method.getReturnType(),
                method.getParameterTypes(),
                method.getExceptionTypes(),
                method.getDeclaringClass(),
                hasTargetObject(),
-               ((MethodByMethodInfo) info).getCallingClass(),
+               ((MethodCallByMethod) joinPoint).getCallingClass(),
                hasCallingObject());
    }
 

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -38,6 +38,8 @@
 import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.AdviceMethodProperties;
+import org.jboss.aop.joinpoint.JoinPointBean;
+import org.jboss.aop.joinpoint.MethodExecution;
 import org.jboss.aop.joinpoint.MethodInvocation;
 import org.jboss.aop.util.ReflectToJavassist;
 
@@ -49,7 +51,9 @@
 public class MethodJoinPointGenerator extends JoinPointGenerator
 {
    private static final Class INVOCATION_TYPE = MethodInvocation.class;
+   private static final Class JOINPOINT_TYPE = MethodExecution.class;
    private static final CtClass INVOCATION_CT_TYPE;
+
    static
    {
       try
@@ -121,13 +125,13 @@
       return (Class)returnType.get();
    }
 
-   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointInfo info, AdviceSetup setup)
+   protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
    {
-      Method method = ((MethodInfo)info).getAdvisedMethod();
+      Method method = ((MethodExecution)joinPoint).getAdvisedMethod();
       return new AdviceMethodProperties(
                setup.getAspectClass(), 
                setup.getAdviceName(), 
-               info.getClass(), 
+               JOINPOINT_TYPE, 
                INVOCATION_TYPE, 
                method.getReturnType(), 
                method.getParameterTypes(), 

Copied: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/Construction.java (from rev 63365, projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructionInfo.java)
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/Construction.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/Construction.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Constructor;
+
+/**
+ * Represents a call made on a constructor woven with the
+ * <i>construction</i> syntax
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface Construction extends JoinPointBean
+{
+
+   /**
+    * Gets the constructor being called
+    */
+   Constructor getConstructor();
+}
\ No newline at end of file

Added: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCall.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCall.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCall.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Constructor;
+
+/**
+ * Represents calls made to a constructor by either a method or a constructor
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ConstructorCall extends JoinPointBean
+{
+   /**
+    * Gets the constructor being called
+    */
+   Constructor getConstructor();
+
+   /**
+    * Gets the class making the call
+    */
+   Class getCallingClass();
+
+   /**
+    * Gets the class being called
+    */
+   Class getCalledClass();
+
+}
\ No newline at end of file

Added: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByConstructor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByConstructor.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByConstructor.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Constructor;
+
+/**
+ * Represents a call to a constructor made by a constructor
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ConstructorCallByConstructor extends ConstructorCall
+{
+   /**
+    * Gets the calling constructor
+    */
+   Constructor getCalling();
+
+}
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByMethod.java (from rev 63365, projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByMethodInfo.java)
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByMethod.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByMethod.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Method;
+
+/**
+ * Represents a call to a constructor made by a method
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ConstructorCallByMethod extends ConstructorCall
+{
+   /**
+    * Gets the method hash of the calling method
+    */
+   long getCallingMethodHash();
+
+   /**
+    * Gets the method making the call
+    */
+   Method getCallingMethod();
+}
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorExecution.java (from rev 63365, projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructorInfo.java)
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorExecution.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorExecution.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Constructor;
+
+/**
+ * Represents a contructor call with an <i>execution</i>
+ * pointcut
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ConstructorExecution extends JoinPointBean
+{
+   /**
+    * Gets the constructor being called
+    */
+   Constructor getConstructor();
+
+}
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldAccess.java (from rev 63365, projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IFieldInfo.java)
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldAccess.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldAccess.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Field;
+
+/**
+ * Represents a field read or write 
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface FieldAccess extends JoinPointBean
+{
+   /**
+    * Gets the field being read or written
+    */
+   Field getAdvisedField();
+
+   /**
+    * Gets whether we are reading the field
+    */
+   boolean isRead();
+
+}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ICallerConstructorInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ICallerConstructorInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ICallerConstructorInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Constructor;
-
-/**
- * Represents calls made to a constructor by either a method or a constructor
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface ICallerConstructorInfo extends IJoinPointInfo
-{
-   /**
-    * Gets the constructor being called
-    */
-   Constructor getConstructor();
-
-   /**
-    * Gets the class making the call
-    */
-   Class getCallingClass();
-
-   /**
-    * Gets the class being called
-    */
-   Class getCalledClass();
-
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ICallerMethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ICallerMethodInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ICallerMethodInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Method;
-
-/**
- * Represents calls made to a method or a constructor by either a method or a constructor
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface ICallerMethodInfo extends IJoinPointInfo
-{
-   /**
-    * Gets the class containing the method/constructor making the call
-    */
-   Class getCallingClass();
-
-   /**
-    * Gets the class containing the method being called 
-    */
-   Class getCalledClass();
-
-   /**
-    * Gets the method being called
-    */
-   Method getMethod();
-
-   /**
-    * Gets the method hash of the method being called
-    */
-   long getCalledMethodHash();
-
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByConInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByConInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByConInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Constructor;
-
-/**
- * Represents a call to a constructor made by a constructor
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IConByConInfo extends ICallerConstructorInfo
-{
-   /**
-    * Gets the calling constructor
-    */
-   Constructor getCalling();
-
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByMethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByMethodInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConByMethodInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Method;
-
-/**
- * Represents a call to a constructor made by a method
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IConByMethodInfo extends ICallerConstructorInfo
-{
-   /**
-    * Gets the method hash of the calling method
-    */
-   long getCallingMethodHash();
-
-   /**
-    * Gets the method making the call
-    */
-   Method getCallingMethod();
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructionInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructionInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructionInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Constructor;
-
-/**
- * Represents a call made on a constructor woven with the
- * <i>construction</i> syntax
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IConstructionInfo extends IJoinPointInfo
-{
-
-   /**
-    * Gets the constructor being called
-    */
-   Constructor getConstructor();
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructorInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructorInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IConstructorInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Constructor;
-
-/**
- * Represents a contructor call with an <i>execution</i>
- * pointcut
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IConstructorInfo extends IJoinPointInfo
-{
-   /**
-    * Gets the constructor being called
-    */
-   Constructor getConstructor();
-
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IFieldInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IFieldInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IFieldInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Field;
-
-/**
- * Represents a field read or write 
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IFieldInfo extends IJoinPointInfo
-{
-   /**
-    * Gets the field being read or written
-    */
-   Field getAdvisedField();
-
-   /**
-    * Gets whether we are reading the field
-    */
-   boolean isRead();
-
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IJoinPointInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IJoinPointInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IJoinPointInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import org.jboss.aop.Advisor;
-
-/**
- * Represents a call made on a joinpoint
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IJoinPointInfo
-{
-   /**
-    * Gets the advisor
-    */
-   Advisor getAdvisor();
-
-   /**
-    * Gets the advisor's class
-    */
-   Class getClazz();
-
-   /**
-    * Resolves metadata on the class
-    */
-   Object resolveClassMetaData(Object key, Object attr);
-
-   /**
-    * Resolves annotations for the class
-    */
-   Object resolveClassAnnotation(Class annotation);
-
-   /**
-    * Resolves annotations on the particular joinpoint (field, constructor, method etc.)
-    */
-   Object resolveAnnotation(Class annotation);
-
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByConInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByConInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByConInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Constructor;
-
-/**
- * Represents a method being called by a constructor
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IMethodByConInfo extends ICallerMethodInfo
-{
-   /**
-    * Gets the constructor making the call
-    */
-   Constructor getCalling();
-
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByMethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByMethodInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByMethodInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Method;
-
-/**
- * Represents a method being called by a method
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IMethodByMethodInfo extends ICallerMethodInfo
-{
-   /**
-    * Gets the method hash of the method making the call
-    */
-   long getCallingMethodHash();
-
-   /**
-    * Gets the method making the call
-    */
-   Method getCallingMethod();
-
-}
\ No newline at end of file

Deleted: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodInfo.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodInfo.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
-
-import java.lang.reflect.Method;
-
-/**
- * Represents a method call with an <i>execution</i>
- * pointcut
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public interface IMethodInfo extends IJoinPointInfo
-{
-   /**
-    * Gets the method being called
-    */
-   Method getAdvisedMethod();
-
-   /**
-    * Gets the hash of the method being called
-    */
-   long getHash();
-}
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/JoinPointBean.java (from rev 63365, projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IJoinPointInfo.java)
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/JoinPointBean.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/JoinPointBean.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import org.jboss.aop.Advisor;
+
+/**
+ * Represents a call made on a joinpoint
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface JoinPointBean
+{
+   /**
+    * Gets the advisor
+    */
+   Advisor getAdvisor();
+
+   /**
+    * Gets the advisor's class
+    */
+   Class getClazz();
+
+   /**
+    * Resolves metadata on the class
+    */
+   Object resolveClassMetaData(Object key, Object attr);
+
+   /**
+    * Resolves annotations for the class
+    */
+   Object resolveClassAnnotation(Class annotation);
+
+   /**
+    * Resolves annotations on the particular joinpoint (field, constructor, method etc.)
+    */
+   Object resolveAnnotation(Class annotation);
+
+}
\ No newline at end of file

Added: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCall.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCall.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCall.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Method;
+
+/**
+ * Represents calls made to a method by either a method or a constructor
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface MethodCall extends JoinPointBean
+{
+   /**
+    * Gets the class containing the method/constructor making the call
+    */
+   Class getCallingClass();
+
+   /**
+    * Gets the class containing the method being called 
+    */
+   Class getCalledClass();
+
+   /**
+    * Gets the method being called
+    */
+   Method getMethod();
+
+   /**
+    * Gets the method hash of the method being called
+    */
+   long getCalledMethodHash();
+
+}
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByConstructor.java (from rev 63365, projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByConInfo.java)
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByConstructor.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByConstructor.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Constructor;
+
+/**
+ * Represents a method being called by a constructor
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface MethodCallByConstructor extends MethodCall
+{
+   /**
+    * Gets the constructor making the call
+    */
+   Constructor getCalling();
+
+}
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByMethod.java (from rev 63365, projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodByMethodInfo.java)
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByMethod.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByMethod.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Method;
+
+/**
+ * Represents a method being called by a method
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface MethodCallByMethod extends MethodCall
+{
+   /**
+    * Gets the method hash of the method making the call
+    */
+   long getCallingMethodHash();
+
+   /**
+    * Gets the method making the call
+    */
+   Method getCallingMethod();
+
+}
\ No newline at end of file

Copied: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodExecution.java (from rev 63365, projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/IMethodInfo.java)
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodExecution.java	                        (rev 0)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodExecution.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.aop.joinpoint;
+
+import java.lang.reflect.Method;
+
+/**
+ * Represents a method call with an <i>execution</i>
+ * pointcut
+ * 
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public interface MethodExecution extends JoinPointBean
+{
+   /**
+    * Gets the method being called
+    */
+   Method getAdvisedMethod();
+
+   /**
+    * Gets the hash of the method being called
+    */
+   long getHash();
+}
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,13 +23,13 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.ConstructorInfo;
-import org.jboss.aop.FieldInfo;
-import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Return;
 import org.jboss.aop.advice.annotation.Thrown;
+import org.jboss.aop.joinpoint.ConstructorExecution;
+import org.jboss.aop.joinpoint.FieldAccess;
+import org.jboss.aop.joinpoint.MethodExecution;
 
 /**
  * 
@@ -60,25 +60,25 @@
       Assert.assertFalse(POJO.joinPointRun);
    }
    
-   public void before(@JoinPoint MethodInfo mjp, @Arg int i)
+   public void before(@JoinPoint MethodExecution mjp, @Arg int i)
    {
       before = "before2";
       Assert.assertFalse(POJO.joinPointRun);
    }
    
-   public void before(@JoinPoint FieldInfo fjp, @Arg int i)
+   public void before(@JoinPoint FieldAccess fjp, @Arg int i)
    {
       before = "before3";
       Assert.assertFalse(POJO.joinPointRun);
    }
    
-   public void before(@JoinPoint FieldInfo fjp)
+   public void before(@JoinPoint FieldAccess fjp)
    {
       before = "before4";
       Assert.assertFalse(POJO.joinPointRun);
    }
    
-   public void before(@JoinPoint FieldInfo fjp, @Arg SubValue val)
+   public void before(@JoinPoint FieldAccess fjp, @Arg SubValue val)
    {
       before = "before5";
       Assert.assertFalse(POJO.joinPointRun);
@@ -96,7 +96,7 @@
       Assert.assertFalse(POJO.joinPointRun);
    }
    
-   public POJO after(@JoinPoint MethodInfo mjp, @Return POJO ret, @Arg int i,
+   public POJO after(@JoinPoint MethodExecution mjp, @Return POJO ret, @Arg int i,
          @Arg long l)
    {
       after = "after1";
@@ -104,7 +104,7 @@
       return ret;
    }
    
-   public POJO after(@JoinPoint ConstructorInfo cjp, @Return POJO ret)
+   public POJO after(@JoinPoint ConstructorExecution cjp, @Return POJO ret)
    {
       after = "after2";
       Assert.assertTrue(POJO.joinPointRun);
@@ -112,14 +112,14 @@
    }
    
    //This should be able to handle writes
-   public int after(@JoinPoint FieldInfo fp, @Arg int i)
+   public int after(@JoinPoint FieldAccess fp, @Arg int i)
    {
       after = "after3";
       return i;
    }
    
    //This should be able to handle reads
-   public SubValue after(@JoinPoint FieldInfo fp, @Return SubValue ret)
+   public SubValue after(@JoinPoint FieldAccess fp, @Return SubValue ret)
    {
       after = "after4";
       ret.doubleValue();
@@ -159,13 +159,13 @@
       exception = t;
    }
    
-   public void throwing(@JoinPoint MethodInfo mjp, @Thrown Throwable t)
+   public void throwing(@JoinPoint MethodExecution mjp, @Thrown Throwable t)
    {
       throwing = "throwing2";
       exception = t;
    }
    
-   public void throwing(@JoinPoint MethodInfo mjp, @Thrown Throwable t, @Arg int i)
+   public void throwing(@JoinPoint MethodExecution mjp, @Thrown Throwable t, @Arg int i)
    {
       throwing = "throwing3";
       exception = t;

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,10 +23,10 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Return;
+import org.jboss.aop.joinpoint.JoinPointBean;
 
 /**
  * 
@@ -46,13 +46,13 @@
    }
    
 
-   public void before(@JoinPoint JoinPointInfo jp, @Arg SuperValue superValue, @Arg int i)
+   public void before(@JoinPoint JoinPointBean jp, @Arg SuperValue superValue, @Arg int i)
    {
       before = "before";
       Assert.assertFalse(POJO.joinPointRun);
    }
    
-   public Object after(@JoinPoint JoinPointInfo jp, @Return Object ret,
+   public Object after(@JoinPoint JoinPointBean jp, @Return Object ret,
          @Arg SuperValue superValue, @Arg int i)
    {
       after = "after";

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,12 +23,12 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.ConstructorInfo;
-import org.jboss.aop.FieldInfo;
-import org.jboss.aop.JoinPointInfo;
-import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Thrown;
+import org.jboss.aop.joinpoint.ConstructorExecution;
+import org.jboss.aop.joinpoint.FieldAccess;
+import org.jboss.aop.joinpoint.JoinPointBean;
+import org.jboss.aop.joinpoint.MethodExecution;
 
 /**
  * Aspect used on @JoinPoint parameter tests.
@@ -38,24 +38,24 @@
 public class JoinPointAspect
 {
    static String beforeAdvice = null;
-   static JoinPointInfo beforeJoinPointInfo = null;
+   static JoinPointBean beforeJoinPoint = null;
    static String afterAdvice = null;
-   static JoinPointInfo afterJoinPointInfo = null;
+   static JoinPointBean afterJoinPoint = null;
    static String throwingAdvice = null;
-   static JoinPointInfo throwingJoinPointInfo = null;
+   static JoinPointBean throwingJoinPoint = null;
    static String finallyAdvice = null;
-   static JoinPointInfo finallyJoinPointInfo = null;
+   static JoinPointBean finallyJoinPoint = null;
    
    public static void clear()
    {
       beforeAdvice = null;
-      beforeJoinPointInfo = null;
+      beforeJoinPoint = null;
       afterAdvice = null;
-      afterJoinPointInfo = null;
+      afterJoinPoint = null;
       throwingAdvice = null;
-      throwingJoinPointInfo = null;
+      throwingJoinPoint = null;
       finallyAdvice = null;
-      finallyJoinPointInfo = null;
+      finallyJoinPoint = null;
    }
    
    public void before1()
@@ -66,33 +66,33 @@
    public void before2(@JoinPoint Object joinPointInfo)
    {
       beforeAdvice = "before2";
-      beforeJoinPointInfo = (JoinPointInfo) joinPointInfo;
+      beforeJoinPoint = (JoinPointBean) joinPointInfo;
    }
    
-   public void before3(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before3(@JoinPoint JoinPointBean joinPointInfo)
    {
       beforeAdvice = "before3";
-      beforeJoinPointInfo = joinPointInfo;
+      beforeJoinPoint = joinPointInfo;
    }   
    
-   public void before4(@JoinPoint MethodInfo joinPointInfo)
+   public void before4(@JoinPoint MethodExecution joinPointInfo)
    {
       beforeAdvice = "before4";
-      beforeJoinPointInfo = (JoinPointInfo) joinPointInfo;
+      beforeJoinPoint = (JoinPointBean) joinPointInfo;
    }
    
-   public void before5(@JoinPoint MethodInfo joinPointInfo)
+   public void before5(@JoinPoint MethodExecution joinPointInfo)
    {
       Assert.fail("This advice should never be executed");
    }
    
-   public void after1(@JoinPoint FieldInfo joinPointInfo)
+   public void after1(@JoinPoint FieldAccess joinPointInfo)
    {
       afterAdvice = "after1";
-      afterJoinPointInfo = joinPointInfo;
+      afterJoinPoint = joinPointInfo;
    }
    
-   public void after2(@JoinPoint ConstructorInfo constructorInfo)
+   public void after2(@JoinPoint ConstructorExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -105,32 +105,32 @@
    public void after4(@JoinPoint Object joinPointInfo)
    {
       afterAdvice = "after4";
-      afterJoinPointInfo = (JoinPointInfo) joinPointInfo;
+      afterJoinPoint = (JoinPointBean) joinPointInfo;
    }
    
-   public void after5(@JoinPoint JoinPointInfo joinPointInfo)
+   public void after5(@JoinPoint JoinPointBean joinPointInfo)
    {
       afterAdvice = "after5";
-      afterJoinPointInfo = joinPointInfo;
+      afterJoinPoint = joinPointInfo;
    }
    
    public void throwing1(@Thrown Throwable throwable, @JoinPoint Object joinPointInfo)
    {
       throwingAdvice = "throwing1";
-      throwingJoinPointInfo = (JoinPointInfo) joinPointInfo;
+      throwingJoinPoint = (JoinPointBean) joinPointInfo;
    }
    
-   public void throwing2(@JoinPoint ConstructorInfo joinPointInfo,
+   public void throwing2(@JoinPoint ConstructorExecution joinPointInfo,
          @Thrown Throwable throwable)
    {
       Assert.fail("This advice should never be executed");
    }
    
    public void throwing3(@Thrown Throwable throwable,
-         @JoinPoint JoinPointInfo joinPointInfo)
+         @JoinPoint JoinPointBean joinPointInfo)
    {
       throwingAdvice = "throwing3";
-      throwingJoinPointInfo = joinPointInfo;
+      throwingJoinPoint = joinPointInfo;
    }
    
    public void throwing4(@Thrown Throwable throwable)
@@ -138,17 +138,17 @@
       throwingAdvice = "throwing4";
    }
    
-   public void throwing5(@JoinPoint MethodInfo joinPointInfo, @Thrown Throwable throwable)
+   public void throwing5(@JoinPoint MethodExecution joinPointInfo, @Thrown Throwable throwable)
    {
       throwingAdvice = "throwing5";
-      throwingJoinPointInfo = joinPointInfo;
+      throwingJoinPoint = joinPointInfo;
    }
    
 
-   public void finally1(@JoinPoint FieldInfo joinPointInfo)
+   public void finally1(@JoinPoint FieldAccess joinPointInfo)
    {
       finallyAdvice = "finally1";
-      finallyJoinPointInfo = joinPointInfo;
+      finallyJoinPoint = joinPointInfo;
    }
    
    public void finally2()
@@ -159,10 +159,10 @@
    public void finally3(@JoinPoint Object joinPointInfo)
    {
       finallyAdvice = "finally3";
-      finallyJoinPointInfo = (JoinPointInfo) joinPointInfo;
+      finallyJoinPoint = (JoinPointBean) joinPointInfo;
    }
    
-   public void finally4(@JoinPoint ConstructorInfo joinPointInfo)
+   public void finally4(@JoinPoint ConstructorExecution joinPointInfo)
    {
       Assert.fail("This advice should never be executed");
    }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -25,8 +25,8 @@
 import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
-import org.jboss.aop.FieldInfo;
-import org.jboss.aop.MethodInfo;
+import org.jboss.aop.joinpoint.FieldAccess;
+import org.jboss.aop.joinpoint.MethodExecution;
 import org.jboss.test.aop.AOPTestWithSetup;
 
 /**
@@ -66,16 +66,16 @@
    {
       pojo.number = 0;
       assertEquals("before1", JoinPointAspect.beforeAdvice);
-      assertNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNull(JoinPointAspect.beforeJoinPoint);
       assertEquals("after1", JoinPointAspect.afterAdvice);
-      assertNotNull(JoinPointAspect.afterJoinPointInfo);
+      assertNotNull(JoinPointAspect.afterJoinPoint);
       assertNull(JoinPointAspect.throwingAdvice);
-      assertNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNull(JoinPointAspect.throwingJoinPoint);
       assertNull(JoinPointAspect.finallyAdvice);
-      assertNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNull(JoinPointAspect.finallyJoinPoint);
       
-      assertTrue(JoinPointAspect.afterJoinPointInfo instanceof FieldInfo);
-      FieldInfo fieldInfo = (FieldInfo) JoinPointAspect.afterJoinPointInfo;
+      assertTrue(JoinPointAspect.afterJoinPoint instanceof FieldAccess);
+      FieldAccess fieldInfo = (FieldAccess) JoinPointAspect.afterJoinPoint;
       assertEquals("number", fieldInfo.getAdvisedField().getName());
       assertFalse(fieldInfo.isRead());
    }
@@ -84,18 +84,18 @@
    {
       pojo.text = "test2";
       assertEquals("before2", JoinPointAspect.beforeAdvice);
-      assertNotNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNotNull(JoinPointAspect.beforeJoinPoint);
       assertNull(JoinPointAspect.afterAdvice);
-      assertNull(JoinPointAspect.afterJoinPointInfo);
+      assertNull(JoinPointAspect.afterJoinPoint);
       assertNull(JoinPointAspect.throwingAdvice);
-      assertNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNull(JoinPointAspect.throwingJoinPoint);
       assertEquals("finally1", JoinPointAspect.finallyAdvice);
-      assertNotNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNotNull(JoinPointAspect.finallyJoinPoint);
       
-      assertSame(JoinPointAspect.beforeJoinPointInfo,
-            JoinPointAspect.finallyJoinPointInfo);
-      assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof FieldInfo);
-      FieldInfo fieldInfo = (FieldInfo) JoinPointAspect.beforeJoinPointInfo;
+      assertSame(JoinPointAspect.beforeJoinPoint,
+            JoinPointAspect.finallyJoinPoint);
+      assertTrue(JoinPointAspect.beforeJoinPoint instanceof FieldAccess);
+      FieldAccess fieldInfo = (FieldAccess) JoinPointAspect.beforeJoinPoint;
       assertEquals("text", fieldInfo.getAdvisedField().getName());
       assertFalse(fieldInfo.isRead());
    }
@@ -104,16 +104,16 @@
    {
       String text = pojo.text;
       assertNull(JoinPointAspect.beforeAdvice);
-      assertNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNull(JoinPointAspect.beforeJoinPoint);
       assertEquals("after5", JoinPointAspect.afterAdvice);
-      assertNotNull(JoinPointAspect.afterJoinPointInfo);
+      assertNotNull(JoinPointAspect.afterJoinPoint);
       assertNull(JoinPointAspect.throwingAdvice);
-      assertNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNull(JoinPointAspect.throwingJoinPoint);
       assertNull(JoinPointAspect.finallyAdvice);
-      assertNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNull(JoinPointAspect.finallyJoinPoint);
       
-      assertTrue(JoinPointAspect.afterJoinPointInfo instanceof FieldInfo);
-      FieldInfo fieldInfo = (FieldInfo) JoinPointAspect.afterJoinPointInfo;
+      assertTrue(JoinPointAspect.afterJoinPoint instanceof FieldAccess);
+      FieldAccess fieldInfo = (FieldAccess) JoinPointAspect.afterJoinPoint;
       assertEquals("text", fieldInfo.getAdvisedField().getName());
       assertTrue(fieldInfo.isRead());
    }
@@ -122,16 +122,16 @@
    {
       pojo.method1();
       assertEquals("before3", JoinPointAspect.beforeAdvice);
-      assertNotNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNotNull(JoinPointAspect.beforeJoinPoint);
       assertEquals("after3", JoinPointAspect.afterAdvice);
-      assertNull(JoinPointAspect.afterJoinPointInfo);
+      assertNull(JoinPointAspect.afterJoinPoint);
       assertNull(JoinPointAspect.throwingAdvice);
-      assertNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNull(JoinPointAspect.throwingJoinPoint);
       assertNull(JoinPointAspect.finallyAdvice);
-      assertNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNull(JoinPointAspect.finallyJoinPoint);
       
-      assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof MethodInfo);
-      assertEquals("method1", ((MethodInfo) JoinPointAspect.beforeJoinPointInfo).
+      assertTrue(JoinPointAspect.beforeJoinPoint instanceof MethodExecution);
+      assertEquals("method1", ((MethodExecution) JoinPointAspect.beforeJoinPoint).
             getAdvisedMethod().getName());
    }
    
@@ -139,17 +139,17 @@
    {
       pojo.method2(false);
       assertEquals("before4", JoinPointAspect.beforeAdvice);
-      assertNotNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNotNull(JoinPointAspect.beforeJoinPoint);
       assertEquals("after4", JoinPointAspect.afterAdvice);
-      assertNotNull(JoinPointAspect.afterJoinPointInfo);
+      assertNotNull(JoinPointAspect.afterJoinPoint);
       assertNull(JoinPointAspect.throwingAdvice);
-      assertNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNull(JoinPointAspect.throwingJoinPoint);
       assertNull(JoinPointAspect.finallyAdvice);
-      assertNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNull(JoinPointAspect.finallyJoinPoint);
       
-      assertSame(JoinPointAspect.beforeJoinPointInfo, JoinPointAspect.afterJoinPointInfo);
-      assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof MethodInfo);
-      assertEquals("method2", ((MethodInfo) JoinPointAspect.beforeJoinPointInfo).
+      assertSame(JoinPointAspect.beforeJoinPoint, JoinPointAspect.afterJoinPoint);
+      assertTrue(JoinPointAspect.beforeJoinPoint instanceof MethodExecution);
+      assertEquals("method2", ((MethodExecution) JoinPointAspect.beforeJoinPoint).
             getAdvisedMethod().getName());
    }
    
@@ -167,18 +167,18 @@
       assertTrue(exceptionThrown);
       
       assertEquals("before4", JoinPointAspect.beforeAdvice);
-      assertNotNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNotNull(JoinPointAspect.beforeJoinPoint);
       assertNull(JoinPointAspect.afterAdvice);
-      assertNull(JoinPointAspect.afterJoinPointInfo);
+      assertNull(JoinPointAspect.afterJoinPoint);
       assertEquals("throwing1", JoinPointAspect.throwingAdvice);
-      assertNotNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNotNull(JoinPointAspect.throwingJoinPoint);
       assertNull(JoinPointAspect.finallyAdvice);
-      assertNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNull(JoinPointAspect.finallyJoinPoint);
       
-      assertSame(JoinPointAspect.beforeJoinPointInfo,
-            JoinPointAspect.throwingJoinPointInfo);
-      assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof MethodInfo);
-      assertEquals("method2", ((MethodInfo) JoinPointAspect.beforeJoinPointInfo).
+      assertSame(JoinPointAspect.beforeJoinPoint,
+            JoinPointAspect.throwingJoinPoint);
+      assertTrue(JoinPointAspect.beforeJoinPoint instanceof MethodExecution);
+      assertEquals("method2", ((MethodExecution) JoinPointAspect.beforeJoinPoint).
             getAdvisedMethod().getName());
    }
    
@@ -196,16 +196,16 @@
       assertTrue(exceptionThrown);
       
       assertEquals("before4", JoinPointAspect.beforeAdvice);
-      assertNotNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNotNull(JoinPointAspect.beforeJoinPoint);
       assertNull(JoinPointAspect.afterAdvice);
-      assertNull(JoinPointAspect.afterJoinPointInfo);
+      assertNull(JoinPointAspect.afterJoinPoint);
       assertNull(JoinPointAspect.throwingAdvice);
-      assertNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNull(JoinPointAspect.throwingJoinPoint);
       assertEquals("finally2", JoinPointAspect.finallyAdvice);
-      assertNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNull(JoinPointAspect.finallyJoinPoint);
       
-      assertTrue(JoinPointAspect.beforeJoinPointInfo instanceof MethodInfo);
-      assertEquals("method3", ((MethodInfo) JoinPointAspect.beforeJoinPointInfo).
+      assertTrue(JoinPointAspect.beforeJoinPoint instanceof MethodExecution);
+      assertEquals("method3", ((MethodExecution) JoinPointAspect.beforeJoinPoint).
             getAdvisedMethod().getName());
    }
    
@@ -223,18 +223,18 @@
       assertTrue(exceptionThrown);
       
       assertNull(JoinPointAspect.beforeAdvice);
-      assertNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNull(JoinPointAspect.beforeJoinPoint);
       assertNull(JoinPointAspect.afterAdvice);
-      assertNull(JoinPointAspect.afterJoinPointInfo);
+      assertNull(JoinPointAspect.afterJoinPoint);
       assertEquals("throwing3", JoinPointAspect.throwingAdvice);
-      assertNotNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNotNull(JoinPointAspect.throwingJoinPoint);
       assertEquals("finally3", JoinPointAspect.finallyAdvice);
-      assertNotNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNotNull(JoinPointAspect.finallyJoinPoint);
       
-      assertSame(JoinPointAspect.throwingJoinPointInfo,
-            JoinPointAspect.finallyJoinPointInfo);
-      assertTrue(JoinPointAspect.throwingJoinPointInfo instanceof MethodInfo);
-      assertEquals("method4", ((MethodInfo) JoinPointAspect.throwingJoinPointInfo).
+      assertSame(JoinPointAspect.throwingJoinPoint,
+            JoinPointAspect.finallyJoinPoint);
+      assertTrue(JoinPointAspect.throwingJoinPoint instanceof MethodExecution);
+      assertEquals("method4", ((MethodExecution) JoinPointAspect.throwingJoinPoint).
             getAdvisedMethod().getName());
    }
    
@@ -252,13 +252,13 @@
       assertTrue(exceptionThrown);
       
       assertNull(JoinPointAspect.beforeAdvice);
-      assertNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNull(JoinPointAspect.beforeJoinPoint);
       assertNull(JoinPointAspect.afterAdvice);
-      assertNull(JoinPointAspect.afterJoinPointInfo);
+      assertNull(JoinPointAspect.afterJoinPoint);
       assertEquals("throwing4", JoinPointAspect.throwingAdvice);
-      assertNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNull(JoinPointAspect.throwingJoinPoint);
       assertNull(JoinPointAspect.finallyAdvice);
-      assertNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNull(JoinPointAspect.finallyJoinPoint);
    }
    
    public void test10() throws POJOException
@@ -275,16 +275,16 @@
       assertTrue(exceptionThrown);
       
       assertNull(JoinPointAspect.beforeAdvice);
-      assertNull(JoinPointAspect.beforeJoinPointInfo);
+      assertNull(JoinPointAspect.beforeJoinPoint);
       assertNull(JoinPointAspect.afterAdvice);
-      assertNull(JoinPointAspect.afterJoinPointInfo);
+      assertNull(JoinPointAspect.afterJoinPoint);
       assertEquals("throwing5", JoinPointAspect.throwingAdvice);
-      assertNotNull(JoinPointAspect.throwingJoinPointInfo);
+      assertNotNull(JoinPointAspect.throwingJoinPoint);
       assertNull(JoinPointAspect.finallyAdvice);
-      assertNull(JoinPointAspect.finallyJoinPointInfo);
+      assertNull(JoinPointAspect.finallyJoinPoint);
       
-      assertTrue(JoinPointAspect.throwingJoinPointInfo instanceof MethodInfo);
-      assertEquals("method6", ((MethodInfo) JoinPointAspect.throwingJoinPointInfo).
+      assertTrue(JoinPointAspect.throwingJoinPoint instanceof MethodExecution);
+      assertEquals("method6", ((MethodExecution) JoinPointAspect.throwingJoinPoint).
             getAdvisedMethod().getName());
 
    }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAdviceTestCase.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -66,26 +66,26 @@
       // execute the join point
       pojo.text = "test2";
       // check aspect fields
-      assertEquals("FieldInfo,String", OverloadedBeforeAspect.before1);
-      assertEquals("FieldInfo,Object", OverloadedBeforeAspect.before2);
-      assertEquals("JoinPointInfo,String", OverloadedBeforeAspect.before3);
-      assertEquals("JoinPointInfo,Object", OverloadedBeforeAspect.before4);
+      assertEquals("FieldAccess,String", OverloadedBeforeAspect.before1);
+      assertEquals("FieldAccess,Object", OverloadedBeforeAspect.before2);
+      assertEquals("JoinPointBean,String", OverloadedBeforeAspect.before3);
+      assertEquals("JoinPointBean,Object", OverloadedBeforeAspect.before4);
       assertEquals("Object,String", OverloadedBeforeAspect.before5);
       assertEquals("Object,Object", OverloadedBeforeAspect.before6);
-      assertEquals("FieldInfo,Object[]", OverloadedBeforeAspect.before7);
-      assertEquals("JoinPointInfo,Object[]", OverloadedBeforeAspect.before8);
+      assertEquals("FieldAccess,Object[]", OverloadedBeforeAspect.before7);
+      assertEquals("JoinPointBean,Object[]", OverloadedBeforeAspect.before8);
       assertEquals("Object,Object[]", OverloadedBeforeAspect.before9);
-      assertEquals("FieldInfo", OverloadedBeforeAspect.before10);
-      assertEquals("JoinPointInfo", OverloadedBeforeAspect.before11);
+      assertEquals("FieldAccess", OverloadedBeforeAspect.before10);
+      assertEquals("JoinPointBean", OverloadedBeforeAspect.before11);
       assertEquals("Object", OverloadedBeforeAspect.before12);
       assertEquals("String", OverloadedBeforeAspect.before13);
       assertEquals("Object", OverloadedBeforeAspect.before14);
       assertEquals("Object[]", OverloadedBeforeAspect.before15);
       assertEquals("", OverloadedBeforeAspect.before16);
-      assertEquals("FieldInfo,String", OverloadedBeforeAspect.before17);
+      assertEquals("FieldAccess,String", OverloadedBeforeAspect.before17);
       OverloadedBeforeAspect.clear();
       String myText = pojo.text;
-      assertEquals("FieldInfo", OverloadedBeforeAspect.before17);
+      assertEquals("FieldAccess", OverloadedBeforeAspect.before17);
       
    }
    
@@ -128,43 +128,43 @@
       // execute the join point
       pojo.method2(0, null);
       // check aspect fields
-      assertEquals("Object,MethodInfo,SuperClass,float,SubValue",
+      assertEquals("Object,MethodExecution,SuperClass,float,SubValue",
             OverloadedAfterAspect.after1);
-      assertEquals("Object,MethodInfo,SuperClass,float,SuperValue",
+      assertEquals("Object,MethodExecution,SuperClass,float,SuperValue",
             OverloadedAfterAspect.after2);
-      assertEquals("Object,MethodInfo,SuperClass,float,Object",
+      assertEquals("Object,MethodExecution,SuperClass,float,Object",
             OverloadedAfterAspect.after3);
-      assertEquals("Object,MethodInfo,Object,float,SubValue",
+      assertEquals("Object,MethodExecution,Object,float,SubValue",
             OverloadedAfterAspect.after4);
-      assertEquals("Object,MethodInfo,Object,float,SuperValue",
+      assertEquals("Object,MethodExecution,Object,float,SuperValue",
             OverloadedAfterAspect.after5);
-      assertEquals("Object,MethodInfo,Object,float,Object",
+      assertEquals("Object,MethodExecution,Object,float,Object",
             OverloadedAfterAspect.after6);
-      assertEquals("Object,JoinPointInfo,SuperClass,float,SubValue",
+      assertEquals("Object,JoinPointBean,SuperClass,float,SubValue",
             OverloadedAfterAspect.after7);
-      assertEquals("SuperClass,MethodInfo,SuperClass,SubValue",
+      assertEquals("SuperClass,MethodExecution,SuperClass,SubValue",
             OverloadedAfterAspect.after8);
-      assertEquals("Object,MethodInfo,SuperClass,float",
+      assertEquals("Object,MethodExecution,SuperClass,float",
             OverloadedAfterAspect.after9);
-      assertEquals("Object,MethodInfo,SuperClass,SuperValue",
+      assertEquals("Object,MethodExecution,SuperClass,SuperValue",
             OverloadedAfterAspect.after10);
-      assertEquals("SuperClass,MethodInfo,SuperClass,Object",
+      assertEquals("SuperClass,MethodExecution,SuperClass,Object",
             OverloadedAfterAspect.after11);
-      assertEquals("SuperClass,MethodInfo,Object,SubValue",
+      assertEquals("SuperClass,MethodExecution,Object,SubValue",
             OverloadedAfterAspect.after12);
-      assertEquals("Object,MethodInfo,Object,float",
+      assertEquals("Object,MethodExecution,Object,float",
             OverloadedAfterAspect.after13);
-      assertEquals("SubClass,MethodInfo,Object,SuperValue",
+      assertEquals("SubClass,MethodExecution,Object,SuperValue",
             OverloadedAfterAspect.after14);
-      assertEquals("SubClass,MethodInfo,Object,Object",
+      assertEquals("SubClass,MethodExecution,Object,Object",
             OverloadedAfterAspect.after15);
-      assertEquals("SuperClass,JoinPointInfo,SuperClass,SubValue",
+      assertEquals("SuperClass,JoinPointBean,SuperClass,SubValue",
             OverloadedAfterAspect.after16);
-      assertEquals("SubClass,JoinPointInfo,SuperClass,float",
+      assertEquals("SubClass,JoinPointBean,SuperClass,float",
             OverloadedAfterAspect.after17);
-      assertEquals("SubClass,JoinPointInfo,SuperClass,SuperValue",
+      assertEquals("SubClass,JoinPointBean,SuperClass,SuperValue",
             OverloadedAfterAspect.after18);
-      assertEquals("SuperClass,JoinPointInfo,SuperClass,Object",
+      assertEquals("SuperClass,JoinPointBean,SuperClass,Object",
             OverloadedAfterAspect.after19);
       assertEquals("SubClass,Object,SuperClass,SubValue",
             OverloadedAfterAspect.after20);
@@ -172,42 +172,42 @@
       assertEquals("SubClass,Object,SuperClass,SuperValue",
             OverloadedAfterAspect.after22);
       assertEquals("Object,Object,SuperClass,Object", OverloadedAfterAspect.after23);
-      assertEquals("Object,MethodInfo,SuperClass,Object[]",
+      assertEquals("Object,MethodExecution,SuperClass,Object[]",
             OverloadedAfterAspect.after24);
-      assertEquals("Object,MethodInfo,Object,Object[]",
+      assertEquals("Object,MethodExecution,Object,Object[]",
             OverloadedAfterAspect.after25);
-      assertEquals("Object,JoinPointInfo,SuperClass,Object[]",
+      assertEquals("Object,JoinPointBean,SuperClass,Object[]",
             OverloadedAfterAspect.after26);
-      assertEquals("Object,JoinPointInfo,Object,Object[]",
+      assertEquals("Object,JoinPointBean,Object,Object[]",
             OverloadedAfterAspect.after27);
       assertEquals("Object,Object,SuperClass,Object[]",
             OverloadedAfterAspect.after28);
       assertEquals("Object,Object,Object,Object[]", OverloadedAfterAspect.after29);
-      assertEquals("Object,MethodInfo,SuperClass", OverloadedAfterAspect.after30);
-      assertEquals("Object,MethodInfo,Object", OverloadedAfterAspect.after31);
-      assertEquals("Object,JoinPointInfo,SuperClass", OverloadedAfterAspect.after32);
-      assertEquals("Object,MethodInfo,float,SubValue",
+      assertEquals("Object,MethodExecution,SuperClass", OverloadedAfterAspect.after30);
+      assertEquals("Object,MethodExecution,Object", OverloadedAfterAspect.after31);
+      assertEquals("Object,JoinPointBean,SuperClass", OverloadedAfterAspect.after32);
+      assertEquals("Object,MethodExecution,float,SubValue",
             OverloadedAfterAspect.after33);
-      assertEquals("Object,MethodInfo,float,SuperValue",
+      assertEquals("Object,MethodExecution,float,SuperValue",
             OverloadedAfterAspect.after34);
-      assertEquals("Object,MethodInfo,float,Object", OverloadedAfterAspect.after35);
-      assertEquals("Object,JoinPointInfo,float,SubValue",
+      assertEquals("Object,MethodExecution,float,Object", OverloadedAfterAspect.after35);
+      assertEquals("Object,JoinPointBean,float,SubValue",
             OverloadedAfterAspect.after36);
-      assertEquals("SuperClass,MethodInfo,SubValue", OverloadedAfterAspect.after37);
-      assertEquals("Object,MethodInfo,float", OverloadedAfterAspect.after38);
-      assertEquals("Object,MethodInfo,SuperValue", OverloadedAfterAspect.after39);
-      assertEquals("SuperClass,JoinPointInfo,SubValue",
+      assertEquals("SuperClass,MethodExecution,SubValue", OverloadedAfterAspect.after37);
+      assertEquals("Object,MethodExecution,float", OverloadedAfterAspect.after38);
+      assertEquals("Object,MethodExecution,SuperValue", OverloadedAfterAspect.after39);
+      assertEquals("SuperClass,JoinPointBean,SubValue",
             OverloadedAfterAspect.after40);
-      assertEquals("SubClass,JoinPointInfo,float", OverloadedAfterAspect.after41);
-      assertEquals("SubClass,JoinPointInfo,SuperValue",
+      assertEquals("SubClass,JoinPointBean,float", OverloadedAfterAspect.after41);
+      assertEquals("SubClass,JoinPointBean,SuperValue",
             OverloadedAfterAspect.after42);
       assertEquals("SubClass,Object,SubValue", OverloadedAfterAspect.after43);
       assertEquals("Object,Object,float", OverloadedAfterAspect.after44);
       assertEquals("SubClass,Object,SuperValue", OverloadedAfterAspect.after45);
-      assertEquals("SubClass,MethodInfo,Object[]", OverloadedAfterAspect.after46);
-      assertEquals("SubClass,JoinPointInfo,Object[]", OverloadedAfterAspect.after47);
-      assertEquals("Object,MethodInfo", OverloadedAfterAspect.after48);
-      assertEquals("Object,JoinPointInfo", OverloadedAfterAspect.after49);
+      assertEquals("SubClass,MethodExecution,Object[]", OverloadedAfterAspect.after46);
+      assertEquals("SubClass,JoinPointBean,Object[]", OverloadedAfterAspect.after47);
+      assertEquals("Object,MethodExecution", OverloadedAfterAspect.after48);
+      assertEquals("Object,JoinPointBean", OverloadedAfterAspect.after49);
       assertEquals("Object,SuperClass,float,SubValue",
             OverloadedAfterAspect.after50);
       assertEquals("Object,SuperClass,float,SuperValue",
@@ -241,111 +241,111 @@
       
       // check aspect fields
       
-      assertEquals("JoinPointInfo,Throwable,SubInterface,Implementor",
+      assertEquals("JoinPointBean,Throwable,SubInterface,Implementor",
             OverloadedThrowingAspect.throwing1);
       
       assertTrue(OverloadedThrowingAspect.throwing2.startsWith(
-            "JoinPointInfo,Throwable,"));
+            "JoinPointBean,Throwable,"));
       assertTrue(OverloadedThrowingAspect.throwing2.equals(
-            "JoinPointInfo,Throwable,Interface,Implementor") ||
+            "JoinPointBean,Throwable,Interface,Implementor") ||
             OverloadedThrowingAspect.throwing2.equals(
-            "JoinPointInfo,Throwable,SubInterface,SubInterface") ||
+            "JoinPointBean,Throwable,SubInterface,SubInterface") ||
             OverloadedThrowingAspect.throwing2.equals(
-            "JoinPointInfo,Throwable,SubInterface,Object"));
+            "JoinPointBean,Throwable,SubInterface,Object"));
       
       assertTrue(OverloadedThrowingAspect.throwing3.startsWith(
-            "JoinPointInfo,Throwable,"));
+            "JoinPointBean,Throwable,"));
       assertTrue(OverloadedThrowingAspect.throwing3.equals(  
-            "JoinPointInfo,Throwable,SuperInterface,Implementor") ||
+            "JoinPointBean,Throwable,SuperInterface,Implementor") ||
             OverloadedThrowingAspect.throwing3.equals(
-            "JoinPointInfo,Throwable,SubInterface,Interface") ||
+            "JoinPointBean,Throwable,SubInterface,Interface") ||
             OverloadedThrowingAspect.throwing3.equals(
-            "JoinPointInfo,Throwable,Interface,SubInterface"));
+            "JoinPointBean,Throwable,Interface,SubInterface"));
       
       assertTrue(OverloadedThrowingAspect.throwing4.startsWith(
-            "JoinPointInfo,Throwable,"));
+            "JoinPointBean,Throwable,"));
       assertTrue(OverloadedThrowingAspect.throwing4.equals(
-            "JoinPointInfo,Throwable,SuperInterface,SubInterface") ||
+            "JoinPointBean,Throwable,SuperInterface,SubInterface") ||
             OverloadedThrowingAspect.throwing4.equals(
-            "JoinPointInfo,Throwable,SuperInterface,Object") ||
+            "JoinPointBean,Throwable,SuperInterface,Object") ||
             OverloadedThrowingAspect.throwing4.equals(
-            "JoinPointInfo,Throwable,Interface,Interface") ||
+            "JoinPointBean,Throwable,Interface,Interface") ||
             OverloadedThrowingAspect.throwing4.equals(
-            "JoinPointInfo,Throwable,SubInterface,SuperInterface"));
+            "JoinPointBean,Throwable,SubInterface,SuperInterface"));
       
       assertTrue(OverloadedThrowingAspect.throwing5.startsWith(
-            "JoinPointInfo,Throwable,"));
+            "JoinPointBean,Throwable,"));
       assertTrue(OverloadedThrowingAspect.throwing5.equals(
-            "JoinPointInfo,Throwable,SuperInterface,Interface") ||
+            "JoinPointBean,Throwable,SuperInterface,Interface") ||
             OverloadedThrowingAspect.throwing5.equals(
-            "JoinPointInfo,Throwable,Interface,SuperInterface"));
+            "JoinPointBean,Throwable,Interface,SuperInterface"));
       
-      assertEquals("JoinPointInfo,Throwable,SuperInterface,SuperInterface",
+      assertEquals("JoinPointBean,Throwable,SuperInterface,SuperInterface",
             OverloadedThrowingAspect.throwing6);
       
-      assertEquals("JoinPointInfo,Object,SubInterface,Implementor",
+      assertEquals("JoinPointBean,Object,SubInterface,Implementor",
             OverloadedThrowingAspect.throwing7);
       
       assertTrue(OverloadedThrowingAspect.throwing8.startsWith(
-            "JoinPointInfo,Object,"));
+            "JoinPointBean,Object,"));
       assertTrue(OverloadedThrowingAspect.throwing8.equals(
-            "JoinPointInfo,Object,Interface,Implementor") ||
+            "JoinPointBean,Object,Interface,Implementor") ||
             OverloadedThrowingAspect.throwing8.equals(
-            "JoinPointInfo,Object,SubInterface,SubInterface") ||
+            "JoinPointBean,Object,SubInterface,SubInterface") ||
             OverloadedThrowingAspect.throwing8.equals(
-            "JoinPointInfo,Object,SubInterface,Object"));
+            "JoinPointBean,Object,SubInterface,Object"));
 
       assertTrue(OverloadedThrowingAspect.throwing9.startsWith(
-            "JoinPointInfo,Object,"));
+            "JoinPointBean,Object,"));
       assertTrue(OverloadedThrowingAspect.throwing9.equals(  
-            "JoinPointInfo,Object,SuperInterface,Implementor") ||
+            "JoinPointBean,Object,SuperInterface,Implementor") ||
             OverloadedThrowingAspect.throwing9.equals(
-            "JoinPointInfo,Object,SubInterface,Interface") ||
+            "JoinPointBean,Object,SubInterface,Interface") ||
             OverloadedThrowingAspect.throwing9.equals(
-            "JoinPointInfo,Object,Interface,SubInterface"));
+            "JoinPointBean,Object,Interface,SubInterface"));
 
       assertTrue(OverloadedThrowingAspect.throwing10.startsWith(
-            "JoinPointInfo,Object,"));
+            "JoinPointBean,Object,"));
       assertTrue(OverloadedThrowingAspect.throwing10.equals(
-            "JoinPointInfo,Object,SuperInterface,SubInterface") ||
+            "JoinPointBean,Object,SuperInterface,SubInterface") ||
             OverloadedThrowingAspect.throwing10.equals(
-            "JoinPointInfo,Object,SuperInterface,Object") ||
+            "JoinPointBean,Object,SuperInterface,Object") ||
             OverloadedThrowingAspect.throwing10.equals(
-            "JoinPointInfo,Object,Interface,Interface") ||
+            "JoinPointBean,Object,Interface,Interface") ||
             OverloadedThrowingAspect.throwing10.equals(
-            "JoinPointInfo,Object,SubInterface,SuperInterface"));
+            "JoinPointBean,Object,SubInterface,SuperInterface"));
       
       assertTrue(OverloadedThrowingAspect.throwing11.startsWith(
-            "JoinPointInfo,Object,"));
+            "JoinPointBean,Object,"));
       assertTrue(OverloadedThrowingAspect.throwing11.equals(
-            "JoinPointInfo,Object,SuperInterface,Interface") ||
+            "JoinPointBean,Object,SuperInterface,Interface") ||
             OverloadedThrowingAspect.throwing11.equals(
-            "JoinPointInfo,Object,Interface,SuperInterface"));
+            "JoinPointBean,Object,Interface,SuperInterface"));
 
-      assertEquals("JoinPointInfo,Object,SuperInterface,SuperInterface",
+      assertEquals("JoinPointBean,Object,SuperInterface,SuperInterface",
                OverloadedThrowingAspect.throwing12);
       
       assertTrue(OverloadedThrowingAspect.throwing13.startsWith(
-            "JoinPointInfo,Throwable,"));
+            "JoinPointBean,Throwable,"));
       assertTrue(OverloadedThrowingAspect.throwing13.equals(
-            "JoinPointInfo,Throwable,SubInterface") ||
+            "JoinPointBean,Throwable,SubInterface") ||
             OverloadedThrowingAspect.throwing13.equals(
-            "JoinPointInfo,Throwable,Implementor"));
+            "JoinPointBean,Throwable,Implementor"));
       
       assertTrue(OverloadedThrowingAspect.throwing14.startsWith(
-            "JoinPointInfo,Throwable,"));
+            "JoinPointBean,Throwable,"));
       assertTrue(OverloadedThrowingAspect.throwing14.equals(
-            "JoinPointInfo,Throwable,Interface") ||
+            "JoinPointBean,Throwable,Interface") ||
             OverloadedThrowingAspect.throwing14.equals(
-            "JoinPointInfo,Throwable,Object"));
+            "JoinPointBean,Throwable,Object"));
       
-      assertEquals("JoinPointInfo,Throwable,SuperInterface",
+      assertEquals("JoinPointBean,Throwable,SuperInterface",
             OverloadedThrowingAspect.throwing15);
       
-      assertEquals("JoinPointInfo,Throwable,Object[]",
+      assertEquals("JoinPointBean,Throwable,Object[]",
             OverloadedThrowingAspect.throwing16);
       
-      assertEquals("JoinPointInfo,Object,Object[]",
+      assertEquals("JoinPointBean,Object,Object[]",
             OverloadedThrowingAspect.throwing17);
       
       assertEquals("Throwable,SubInterface,Implementor",
@@ -445,71 +445,71 @@
       assertEquals("finally69", pojo.method5(0, 1));
       
       // check aspect fields
-      assertEquals("void,MethodInfo,String,Throwable,int,long",
+      assertEquals("void,MethodExecution,String,Throwable,int,long",
             OverloadedFinallyAspect.finally1);
-      assertEquals("void,MethodInfo,String,Serializable,int,long",
+      assertEquals("void,MethodExecution,String,Serializable,int,long",
             OverloadedFinallyAspect.finally2);
-      assertEquals("void,MethodInfo,CharSequence,Throwable,int,long",
+      assertEquals("void,MethodExecution,CharSequence,Throwable,int,long",
             OverloadedFinallyAspect.finally3);
-      assertEquals("String,MethodInfo,String,Throwable,int",
+      assertEquals("String,MethodExecution,String,Throwable,int",
             OverloadedFinallyAspect.finally4);
-      assertEquals("void,MethodInfo,String,Throwable,long",
+      assertEquals("void,MethodExecution,String,Throwable,long",
             OverloadedFinallyAspect.finally5);
-      assertEquals("String,MethodInfo,String,Serializable,long",
+      assertEquals("String,MethodExecution,String,Serializable,long",
             OverloadedFinallyAspect.finally6);
-      assertEquals("void,MethodInfo,String,Serializable,int",
+      assertEquals("void,MethodExecution,String,Serializable,int",
             OverloadedFinallyAspect.finally7);
-      assertEquals("Object,MethodInfo,CharSequence,Throwable,int",
+      assertEquals("Object,MethodExecution,CharSequence,Throwable,int",
             OverloadedFinallyAspect.finally8);
-      assertEquals("void,MethodInfo,CharSequence,Throwable,long",
+      assertEquals("void,MethodExecution,CharSequence,Throwable,long",
             OverloadedFinallyAspect.finally9);
-      assertEquals("void,MethodInfo,String,Throwable,Object[]",
+      assertEquals("void,MethodExecution,String,Throwable,Object[]",
             OverloadedFinallyAspect.finally10);
-      assertEquals("void,MethodInfo,String,Throwable,Object",
+      assertEquals("void,MethodExecution,String,Throwable,Object",
             OverloadedFinallyAspect.finally11);
-      assertEquals("void,MethodInfo,String,Serializable,Object[]",
+      assertEquals("void,MethodExecution,String,Serializable,Object[]",
             OverloadedFinallyAspect.finally12);
-      assertEquals("void,MethodInfo,String,Serializable,Object",
+      assertEquals("void,MethodExecution,String,Serializable,Object",
             OverloadedFinallyAspect.finally13);
-      assertEquals("void,MethodInfo,CharSequence,Throwable,Object[]",
+      assertEquals("void,MethodExecution,CharSequence,Throwable,Object[]",
             OverloadedFinallyAspect.finally14);
-      assertEquals("void,MethodInfo,CharSequence,Throwable,Object",
+      assertEquals("void,MethodExecution,CharSequence,Throwable,Object",
             OverloadedFinallyAspect.finally15);
-      assertEquals("void,MethodInfo,String,Throwable",
+      assertEquals("void,MethodExecution,String,Throwable",
             OverloadedFinallyAspect.finally16);
-      assertEquals("void,MethodInfo,String,Serializable",
+      assertEquals("void,MethodExecution,String,Serializable",
             OverloadedFinallyAspect.finally17);
-      assertEquals("void,MethodInfo,CharSequence,Throwable",
+      assertEquals("void,MethodExecution,CharSequence,Throwable",
             OverloadedFinallyAspect.finally18);
-      assertEquals("void,MethodInfo,Throwable,int,long",
+      assertEquals("void,MethodExecution,Throwable,int,long",
             OverloadedFinallyAspect.finally19);
-      assertEquals("void,MethodInfo,Serializable,int,long",
+      assertEquals("void,MethodExecution,Serializable,int,long",
             OverloadedFinallyAspect.finally20);
-      assertEquals("Object,MethodInfo,Throwable,long",
+      assertEquals("Object,MethodExecution,Throwable,long",
             OverloadedFinallyAspect.finally21);
-      assertEquals("void,MethodInfo,Throwable,int",
+      assertEquals("void,MethodExecution,Throwable,int",
             OverloadedFinallyAspect.finally22);
-      assertEquals("String,MethodInfo,Serializable,int",
+      assertEquals("String,MethodExecution,Serializable,int",
             OverloadedFinallyAspect.finally23);
-      assertEquals("Object,MethodInfo,Serializable,long",
+      assertEquals("Object,MethodExecution,Serializable,long",
             OverloadedFinallyAspect.finally24);
-      assertEquals("void,MethodInfo,Throwable,Object[]",
+      assertEquals("void,MethodExecution,Throwable,Object[]",
             OverloadedFinallyAspect.finally25);
-      assertEquals("void,MethodInfo,Throwable,Object",
+      assertEquals("void,MethodExecution,Throwable,Object",
             OverloadedFinallyAspect.finally26);
-      assertEquals("void,MethodInfo,Serializable,Object[]",
+      assertEquals("void,MethodExecution,Serializable,Object[]",
             OverloadedFinallyAspect.finally27);
-      assertEquals("void,MethodInfo,Serializable,Object",
+      assertEquals("void,MethodExecution,Serializable,Object",
             OverloadedFinallyAspect.finally28);
-      assertEquals("void,MethodInfo,Throwable", OverloadedFinallyAspect.finally29);
-      assertEquals("void,MethodInfo,Serializable",
+      assertEquals("void,MethodExecution,Throwable", OverloadedFinallyAspect.finally29);
+      assertEquals("void,MethodExecution,Serializable",
             OverloadedFinallyAspect.finally30);
-      assertEquals("void,MethodInfo,int,long", OverloadedFinallyAspect.finally31);
-      assertEquals("String,MethodInfo,long", OverloadedFinallyAspect.finally32);
-      assertEquals("Object,MethodInfo,int", OverloadedFinallyAspect.finally33);
-      assertEquals("void,MethodInfo,Object[]", OverloadedFinallyAspect.finally34);
-      assertEquals("void,MethodInfo,Object", OverloadedFinallyAspect.finally35);
-      assertEquals("void,MethodInfo", OverloadedFinallyAspect.finally36);
+      assertEquals("void,MethodExecution,int,long", OverloadedFinallyAspect.finally31);
+      assertEquals("String,MethodExecution,long", OverloadedFinallyAspect.finally32);
+      assertEquals("Object,MethodExecution,int", OverloadedFinallyAspect.finally33);
+      assertEquals("void,MethodExecution,Object[]", OverloadedFinallyAspect.finally34);
+      assertEquals("void,MethodExecution,Object", OverloadedFinallyAspect.finally35);
+      assertEquals("void,MethodExecution", OverloadedFinallyAspect.finally36);
       assertEquals("void,String,Throwable,int,long",
             OverloadedFinallyAspect.finally37);
       assertEquals("void,String,Serializable,int,long",
@@ -569,52 +569,52 @@
       (new OverloadedAdvicePOJOCaller()).callMethod3(pojo);
       // check aspect fields
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int",
             OverloadedBeforeCallAspect.before1);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,int",
             OverloadedBeforeCallAspect.before2);
-      assertEquals("MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,int",
+      assertEquals("MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,int",
             OverloadedBeforeCallAspect.before3);
-      assertEquals("MethodByMethodInfo,Object,SuperClass,int",
+      assertEquals("MethodCallByMethod,Object,SuperClass,int",
             OverloadedBeforeCallAspect.before4);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]",
             OverloadedBeforeCallAspect.before5);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,Object[]",
             OverloadedBeforeCallAspect.before6);
-      assertEquals("MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,Object[]",
+      assertEquals("MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,Object[]",
             OverloadedBeforeCallAspect.before7);
-      assertEquals("MethodByMethodInfo,Object,SuperClass,Object[]",
+      assertEquals("MethodCallByMethod,Object,SuperClass,Object[]",
             OverloadedBeforeCallAspect.before8);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller",
             OverloadedBeforeCallAspect.before9);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,SuperClass",
             OverloadedBeforeCallAspect.before10);
-      assertEquals("MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller",
+      assertEquals("MethodCallByMethod,Object,OverloadedAdvicePOJOCaller",
             OverloadedBeforeCallAspect.before11);
-      assertEquals("MethodByMethodInfo,Object,SuperClass",
+      assertEquals("MethodCallByMethod,Object,SuperClass",
             OverloadedBeforeCallAspect.before12);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,int",
             OverloadedBeforeCallAspect.before13);
-      assertEquals("MethodByMethodInfo,Object,int",
+      assertEquals("MethodCallByMethod,Object,int",
             OverloadedBeforeCallAspect.before14);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,Object[]",
             OverloadedBeforeCallAspect.before15);
-      assertEquals("MethodByMethodInfo,Object,Object[]",
+      assertEquals("MethodCallByMethod,Object,Object[]",
             OverloadedBeforeCallAspect.before16);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,int",
             OverloadedBeforeCallAspect.before17);
-      assertEquals("MethodByMethodInfo,SuperClass,int",
+      assertEquals("MethodCallByMethod,SuperClass,int",
             OverloadedBeforeCallAspect.before18);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]",
             OverloadedBeforeCallAspect.before19);
-      assertEquals("MethodByMethodInfo,SuperClass,Object[]",
+      assertEquals("MethodCallByMethod,SuperClass,Object[]",
             OverloadedBeforeCallAspect.before20);
-      assertEquals("MethodByMethodInfo,int", OverloadedBeforeCallAspect.before21);
-      assertEquals("MethodByMethodInfo,Object[]",
+      assertEquals("MethodCallByMethod,int", OverloadedBeforeCallAspect.before21);
+      assertEquals("MethodCallByMethod,Object[]",
             OverloadedBeforeCallAspect.before22);
-      assertEquals("MethodByMethodInfo", OverloadedBeforeCallAspect.before23);
+      assertEquals("MethodCallByMethod", OverloadedBeforeCallAspect.before23);
       assertEquals("OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int",
             OverloadedBeforeCallAspect.before24);
       assertEquals("OverloadedAdvicePOJO,SuperClass,int",
@@ -756,46 +756,46 @@
       (new OverloadedAdvicePOJOCaller()).callMethod3(pojo);
       // check aspect fields
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,int",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,int",
             OverloadedAfterCallAspect.after1);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Object[]",
             OverloadedAfterCallAspect.after2);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long",
             OverloadedAfterCallAspect.after3);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int",
             OverloadedAfterCallAspect.after4);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller",
             OverloadedAfterCallAspect.after5);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,long,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,long,int",
             OverloadedAfterCallAspect.after6);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,long,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,long,Object[]",
             OverloadedAfterCallAspect.after7);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,long",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,long",
             OverloadedAfterCallAspect.after8);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,int",
             OverloadedAfterCallAspect.after9);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO",
             OverloadedAfterCallAspect.after10);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int",
             OverloadedAfterCallAspect.after11);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]",
             OverloadedAfterCallAspect.after12);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,long",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,long",
             OverloadedAfterCallAspect.after13);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,int",
             OverloadedAfterCallAspect.after14);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller",
             OverloadedAfterCallAspect.after15);
-      assertEquals("MethodByMethodInfo,long,int", OverloadedAfterCallAspect.after16);
-      assertEquals("MethodByMethodInfo,long,Object[]",
+      assertEquals("MethodCallByMethod,long,int", OverloadedAfterCallAspect.after16);
+      assertEquals("MethodCallByMethod,long,Object[]",
             OverloadedAfterCallAspect.after17);
-      assertEquals("MethodByMethodInfo,long", OverloadedAfterCallAspect.after18);
-      assertEquals("MethodByMethodInfo,int", OverloadedAfterCallAspect.after19);
-      assertEquals("MethodByMethodInfo", OverloadedAfterCallAspect.after20);
+      assertEquals("MethodCallByMethod,long", OverloadedAfterCallAspect.after18);
+      assertEquals("MethodCallByMethod,int", OverloadedAfterCallAspect.after19);
+      assertEquals("MethodCallByMethod", OverloadedAfterCallAspect.after20);
       assertEquals("OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,int",
             OverloadedAfterCallAspect.after21);
       assertEquals("OverloadedAdvicePOJO,SuperClass,long,int",
@@ -854,36 +854,36 @@
       (new OverloadedAdvicePOJOCaller()).callMethod4(pojo);
       // check aspect fields
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,boolean",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,boolean",
             OverloadedThrowingCallAspect.throwing1);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]",
             OverloadedThrowingCallAspect.throwing2);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable",
             OverloadedThrowingCallAspect.throwing3);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,boolean",
+            "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,boolean",
             OverloadedThrowingCallAspect.throwing4);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]",
             OverloadedThrowingCallAspect.throwing5);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable",
+            "MethodCallByMethod,OverloadedAdvicePOJO,Throwable",
             OverloadedThrowingCallAspect.throwing6);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,boolean",
+            "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,boolean",
             OverloadedThrowingCallAspect.throwing7);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]",
             OverloadedThrowingCallAspect.throwing8);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable",
             OverloadedThrowingCallAspect.throwing9);
-      assertEquals("MethodByMethodInfo,Throwable,boolean",
+      assertEquals("MethodCallByMethod,Throwable,boolean",
             OverloadedThrowingCallAspect.throwing10);
-      assertEquals("MethodByMethodInfo,Throwable,Object[]",
+      assertEquals("MethodCallByMethod,Throwable,Object[]",
             OverloadedThrowingCallAspect.throwing11);
-      assertEquals("MethodByMethodInfo,Throwable",
+      assertEquals("MethodCallByMethod,Throwable",
             OverloadedThrowingCallAspect.throwing12);
       assertEquals(
             "OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,boolean",
@@ -946,92 +946,92 @@
       
       // check aspect fields
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,int",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,int",
             OverloadedFinallyCallAspect.finally1);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,int",
+            "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,int",
             OverloadedFinallyCallAspect.finally2);
       assertEquals(
-            "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,int",
+            "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,int",
             OverloadedFinallyCallAspect.finally3);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]",
             OverloadedFinallyCallAspect.finally4);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]",
             OverloadedFinallyCallAspect.finally5);
       assertEquals(
-            "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]",
+            "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]",
             OverloadedFinallyCallAspect.finally6);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable",
             OverloadedFinallyCallAspect.finally7);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable",
+            "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable",
             OverloadedFinallyCallAspect.finally8);
       assertEquals(
-            "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable",
+            "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable",
             OverloadedFinallyCallAspect.finally9);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int",
             OverloadedFinallyCallAspect.finally10);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]",
             OverloadedFinallyCallAspect.finally11);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable",
             OverloadedFinallyCallAspect.finally12);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int",
             OverloadedFinallyCallAspect.finally13);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]",
             OverloadedFinallyCallAspect.finally14);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller",
+            "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller",
             OverloadedFinallyCallAspect.finally15);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int",
             OverloadedFinallyCallAspect.finally16);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]",
             OverloadedFinallyCallAspect.finally17);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable",
             OverloadedFinallyCallAspect.finally18);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int",
             OverloadedFinallyCallAspect.finally19);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]",
             OverloadedFinallyCallAspect.finally20);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,Throwable",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,Throwable",
             OverloadedFinallyCallAspect.finally21);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,int",
             OverloadedFinallyCallAspect.finally22);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO,Object[]",
             OverloadedFinallyCallAspect.finally23);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJO",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJO",
             OverloadedFinallyCallAspect.finally24);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int",
+            "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int",
             OverloadedFinallyCallAspect.finally25);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]",
             OverloadedFinallyCallAspect.finally26);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable",
             OverloadedFinallyCallAspect.finally27);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int",
             OverloadedFinallyCallAspect.finally28);
       assertEquals(
-            "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]",
+            "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]",
             OverloadedFinallyCallAspect.finally29);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable",
             OverloadedFinallyCallAspect.finally30);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,int",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,int",
             OverloadedFinallyCallAspect.finally31);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]",
             OverloadedFinallyCallAspect.finally32);
-      assertEquals("MethodByMethodInfo,OverloadedAdvicePOJOCaller",
+      assertEquals("MethodCallByMethod,OverloadedAdvicePOJOCaller",
             OverloadedFinallyCallAspect.finally33);
-      assertEquals("MethodByMethodInfo,long,Throwable,int",
+      assertEquals("MethodCallByMethod,long,Throwable,int",
             OverloadedFinallyCallAspect.finally34);
-      assertEquals("MethodByMethodInfo", OverloadedFinallyCallAspect.finally35);
+      assertEquals("MethodCallByMethod", OverloadedFinallyCallAspect.finally35);
       assertEquals(
             "OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,int",
             OverloadedFinallyCallAspect.finally36);

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,12 +23,12 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.JoinPointInfo;
-import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Return;
+import org.jboss.aop.joinpoint.JoinPointBean;
+import org.jboss.aop.joinpoint.MethodExecution;
 
 /**
  * Aspect used on overloaded around advice tests (for JoinPoint, Return, Arg and
@@ -179,332 +179,332 @@
    
    /* AFTER2 ADVICE */
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo,
+   public Object after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SubValue arg2)
    {
-      after1 = "Object,MethodInfo,SuperClass,float,SubValue";
+      after1 = "Object,MethodExecution,SuperClass,float,SubValue";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo,
+   public Object after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SuperValue arg2)
    {
-      after1 = "Object,MethodInfo,SuperClass,float,SuperValue";
+      after1 = "Object,MethodExecution,SuperClass,float,SuperValue";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo,
+   public Object after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg Object arg2)
    {
-      after1 = "Object,MethodInfo,SuperClass,float,Object";
+      after1 = "Object,MethodExecution,SuperClass,float,Object";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SubValue arg2)
    {
-      after1 = "Object,MethodInfo,Object,float,SubValue";
+      after1 = "Object,MethodExecution,Object,float,SubValue";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SuperValue arg2)
    {
-      after1 = "Object,MethodInfo,Object,float,SuperValue";
+      after1 = "Object,MethodExecution,Object,float,SuperValue";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg Object arg2)
    {
-      after1 = "Object,MethodInfo,Object,float,Object";
+      after1 = "Object,MethodExecution,Object,float,Object";
       return null;
    }
    
-   public Object after1(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after1(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SubValue arg2)
    {
-      after1 = "Object,JoinPointInfo,SuperClass,float,SubValue";
+      after1 = "Object,JoinPointBean,SuperClass,float,SubValue";
       return null;
    }
 
-   public SuperClass after1(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after1 = "SuperClass,MethodInfo,SuperClass,SubValue";
+      after1 = "SuperClass,MethodExecution,SuperClass,SubValue";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo,
+   public Object after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after1 = "Object,MethodInfo,SuperClass,float";
+      after1 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo,
+   public Object after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after1 = "Object,MethodInfo,SuperClass,SuperValue";
+      after1 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after1(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after1 = "SuperClass,MethodInfo,SuperClass,Object";
+      after1 = "SuperClass,MethodExecution,SuperClass,Object";
       return null;
    }
 
-   public SuperClass after1(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after1(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SubValue arg2)
    {
-      after1 = "SuperClass,MethodInfo,Object,SubValue";
+      after1 = "SuperClass,MethodExecution,Object,SubValue";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1)
    {
-      after1 = "Object,MethodInfo,Object,float";
+      after1 = "Object,MethodExecution,Object,float";
       return null;
    }
 
-   public SubClass after1(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after1(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after1 = "SubClass,MethodInfo,Object,SuperValue";
+      after1 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after1(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after1(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after1 = "SubClass,MethodInfo,Object,Object";
+      after1 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after1(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after1(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after1 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after1 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after1(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after1(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after1 = "SubClass,JoinPointInfo,SuperClass,float";
+      after1 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after1(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after1(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after1 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after1 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after1(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after1(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after1 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after1 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after1(@JoinPoint Object joinPointInfo,
+   public SubClass after1(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after1 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after1(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after1(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after1 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after1(@JoinPoint Object joinPointInfo,
+   public SubClass after1(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after1 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after1(@JoinPoint Object joinPointInfo,
+   public Object after1(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after1 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo,
+   public Object after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after1 = "Object,MethodInfo,SuperClass,Object[]";
+      after1 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo,
+   public Object after1(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after1 = "Object,MethodInfo,Object,Object[]";
+      after1 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after1(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after1(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after1 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after1 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after1(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after1(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after1 = "Object,JoinPointInfo,Object,Object[]";
+      after1 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after1(@JoinPoint Object joinPointInfo,
+   public Object after1(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after1 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after1(@JoinPoint Object joinPointInfo,
+   public Object after1(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after1 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo,
+   public Object after1(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after1 = "Object,MethodInfo,SuperClass";
+      after1 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned)
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned)
    {
-      after1 = "Object,MethodInfo,Object";
+      after1 = "Object,MethodExecution,Object";
       return null;
    }
 
-   public Object after1(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after1(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned)
    {
-      after1 = "Object,JoinPointInfo,SuperClass";
+      after1 = "Object,JoinPointBean,SuperClass";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after1 = "Object,MethodInfo,float,SubValue";
+      after1 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after1 = "Object,MethodInfo,float,SuperValue";
+      after1 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after1 = "Object,MethodInfo,float,Object";
+      after1 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after1(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after1(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after1 = "Object,JoinPointInfo,float,SubValue";
+      after1 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after1(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after1(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after1 = "SuperClass,MethodInfo,SubValue";
+      after1 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after1 = "Object,MethodInfo,float";
+      after1 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after1(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after1(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after1 = "Object,MethodInfo,SuperValue";
+      after1 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SuperClass after1(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after1(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after1 = "SuperClass,JoinPointInfo,SuperValue,SubValue";
+      after1 = "SuperClass,JoinPointBean,SuperValue,SubValue";
       return null;
    }
    
-   public SubClass after1(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after1(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after1 = "SubClass,JoinPointInfo,float";
+      after1 = "SubClass,JoinPointBean,float";
       return null;
    }
 
-   public SuperClass after1(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after1(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after1 = "SubClass,JoinPointInfo,SuperValue";
+      after1 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after1(@JoinPoint Object joinPointInfo, @Arg SubValue arg2)
+   public SubClass after1(@JoinPoint Object joinPoint, @Arg SubValue arg2)
    {
       after1 = "SubClass,Object,SubValue";
       return null;
    }
    
-   public Object after1(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after1(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after1 = "Object,Object,float";
       return null;
    }
 
-   public SubClass after1(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after1(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after1 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after1(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after1(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after1 = "SubClass,MethodInfo,Object[]";
+      after1 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after1(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after1(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after1 = "SubClass,JoinPointInfo,Object[]";
+      after1 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after1(@JoinPoint MethodInfo joinPointInfo)
+   public Object after1(@JoinPoint MethodExecution joinPoint)
    {
-      after1 = "Object,MethodInfo";
+      after1 = "Object,MethodExecution";
       return null;
    }
         
-   public Object after1(@JoinPoint JoinPointInfo joinPointInfo)
+   public Object after1(@JoinPoint JoinPointBean joinPoint)
    {
-      after1 = "Object,JoinPointInfo";
+      after1 = "Object,JoinPointBean";
       return null;
    }
    
@@ -531,7 +531,7 @@
 
    public SuperClass after1(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after1 = "SuperClass,MethodInfo,SuperClass,float";
+      after1 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -615,118 +615,118 @@
    
    /* AFTER2 ADVICE */
    
-   public Object after2(@JoinPoint MethodInfo joinPointInfo,
+   public Object after2(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SuperValue arg2)
    {
-      after2 = "Object,MethodInfo,SuperClass,float,SuperValue";
+      after2 = "Object,MethodExecution,SuperClass,float,SuperValue";
       return null;
    }
    
-   public Object after2(@JoinPoint MethodInfo joinPointInfo,
+   public Object after2(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg Object arg2)
    {
-      after2 = "Object,MethodInfo,SuperClass,float,Object";
+      after2 = "Object,MethodExecution,SuperClass,float,Object";
       return null;
    }
 
-   public Object after2(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after2(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SubValue arg2)
    {
-      after2 = "Object,MethodInfo,Object,float,SubValue";
+      after2 = "Object,MethodExecution,Object,float,SubValue";
       return null;
    }
 
-   public Object after2(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after2(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SuperValue arg2)
    {
-      after2 = "Object,MethodInfo,Object,float,SuperValue";
+      after2 = "Object,MethodExecution,Object,float,SuperValue";
       return null;
    }
    
-   public Object after2(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after2(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg Object arg2)
    {
-      after2 = "Object,MethodInfo,Object,float,Object";
+      after2 = "Object,MethodExecution,Object,float,Object";
       return null;
    }
    
-   public Object after2(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after2(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SubValue arg2)
    {
-      after2 = "Object,JoinPointInfo,SuperClass,float,SubValue";
+      after2 = "Object,JoinPointBean,SuperClass,float,SubValue";
       return null;
    }
 
-   public SuperClass after2(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after2(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after2 = "SuperClass,MethodInfo,SuperClass,SubValue";
+      after2 = "SuperClass,MethodExecution,SuperClass,SubValue";
       return null;
    }
    
-   public Object after2(@JoinPoint MethodInfo joinPointInfo,
+   public Object after2(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after2 = "Object,MethodInfo,SuperClass,float";
+      after2 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after2(@JoinPoint MethodInfo joinPointInfo,
+   public Object after2(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after2 = "Object,MethodInfo,SuperClass,SuperValue";
+      after2 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after2(@JoinPoint MethodInfo joinPointInfo,
+   public Object after2(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after2 = "Object,MethodInfo,SuperClass,Object[]";
+      after2 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after2(@JoinPoint MethodInfo joinPointInfo,
+   public Object after2(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after2 = "Object,MethodInfo,SuperClass";
+      after2 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after2(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after2(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after2 = "Object,MethodInfo,float,SubValue";
+      after2 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after2(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after2(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after2 = "Object,MethodInfo,float,SuperValue";
+      after2 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after2(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after2(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after2 = "Object,MethodInfo,float";
+      after2 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after2(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after2(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after2 = "Object,MethodInfo,SuperValue";
+      after2 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after2(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after2(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after2 = "SubClass,MethodInfo,Object[]";
+      after2 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after2(@JoinPoint MethodInfo joinPointInfo)
+   public Object after2(@JoinPoint MethodExecution joinPoint)
    {
-      after2 = "Object,MethodInfo";
+      after2 = "Object,MethodExecution";
       return null;
    }
         
@@ -740,13 +740,13 @@
    public Object after2(@Return SuperClass valueReturned, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after2 = "Object,MethodInfo,SuperClass,float,SuperValue";
+      after2 = "Object,MethodExecution,SuperClass,float,SuperValue";
       return null;
    }
    
    public SuperClass after2(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after2 = "SuperClass,MethodInfo,SuperClass,float";
+      after2 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -812,117 +812,117 @@
    
    /* AFTER3 ADVICE */
    
-   public Object after3(@JoinPoint MethodInfo joinPointInfo,
+   public Object after3(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg Object arg2)
    {
-      after3 = "Object,MethodInfo,SuperClass,float,Object";
+      after3 = "Object,MethodExecution,SuperClass,float,Object";
       return null;
    }
 
-   public Object after3(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after3(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SubValue arg2)
    {
-      after3 = "Object,MethodInfo,Object,float,SubValue";
+      after3 = "Object,MethodExecution,Object,float,SubValue";
       return null;
    }
 
-   public Object after3(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after3(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SuperValue arg2)
    {
-      after3 = "Object,MethodInfo,Object,float,SuperValue";
+      after3 = "Object,MethodExecution,Object,float,SuperValue";
       return null;
    }
    
-   public Object after3(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after3(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg Object arg2)
    {
-      after3 = "Object,MethodInfo,Object,float,Object";
+      after3 = "Object,MethodExecution,Object,float,Object";
       return null;
    }
    
-   public Object after3(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after3(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SubValue arg2)
    {
-      after3 = "Object,JoinPointInfo,SuperClass,float,SubValue";
+      after3 = "Object,JoinPointBean,SuperClass,float,SubValue";
       return null;
    }
 
-   public SuperClass after3(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after3(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after3 = "SuperClass,MethodInfo,SuperClass,SubValue";
+      after3 = "SuperClass,MethodExecution,SuperClass,SubValue";
       return null;
    }
    
-   public Object after3(@JoinPoint MethodInfo joinPointInfo,
+   public Object after3(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after3 = "Object,MethodInfo,SuperClass,float";
+      after3 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after3(@JoinPoint MethodInfo joinPointInfo,
+   public Object after3(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after3 = "Object,MethodInfo,SuperClass,SuperValue";
+      after3 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after3(@JoinPoint MethodInfo joinPointInfo,
+   public Object after3(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after3 = "Object,MethodInfo,SuperClass,Object[]";
+      after3 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after3(@JoinPoint MethodInfo joinPointInfo,
+   public Object after3(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after3 = "Object,MethodInfo,SuperClass";
+      after3 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after3(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after3(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after3 = "Object,MethodInfo,float,SubValue";
+      after3 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after3(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after3(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after3 = "Object,MethodInfo,float,SuperValue";
+      after3 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public SuperClass after3(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after3(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after3 = "SuperClass,MethodInfo,SubValue";
+      after3 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after3(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after3(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after3 = "Object,MethodInfo,float";
+      after3 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after3(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after3(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after3 = "Object,MethodInfo,SuperValue";
+      after3 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after3(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after3(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after3 = "SubClass,MethodInfo,Object[]";
+      after3 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after3(@JoinPoint MethodInfo joinPointInfo)
+   public Object after3(@JoinPoint MethodExecution joinPoint)
    {
-      after3 = "Object,MethodInfo";
+      after3 = "Object,MethodExecution";
       return null;
    }
         
@@ -949,7 +949,7 @@
 
    public SuperClass after3(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after3 = "SuperClass,MethodInfo,SuperClass,float";
+      after3 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -1015,117 +1015,117 @@
    
    /* AFTER4 ADVICE */
    
-   public Object after4(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after4(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SubValue arg2)
    {
-      after4 = "Object,MethodInfo,Object,float,SubValue";
+      after4 = "Object,MethodExecution,Object,float,SubValue";
       return null;
    }
 
-   public Object after4(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after4(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SuperValue arg2)
    {
-      after4 = "Object,MethodInfo,Object,float,SuperValue";
+      after4 = "Object,MethodExecution,Object,float,SuperValue";
       return null;
    }
    
-   public Object after4(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after4(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg Object arg2)
    {
-      after4 = "Object,MethodInfo,Object,float,Object";
+      after4 = "Object,MethodExecution,Object,float,Object";
       return null;
    }
    
-   public Object after4(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after4(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SubValue arg2)
    {
-      after4 = "Object,JoinPointInfo,SuperClass,float,SubValue";
+      after4 = "Object,JoinPointBean,SuperClass,float,SubValue";
       return null;
    }
 
-   public SuperClass after4(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after4(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after4 = "SuperClass,MethodInfo,SuperClass,SubValue";
+      after4 = "SuperClass,MethodExecution,SuperClass,SubValue";
       return null;
    }
    
-   public Object after4(@JoinPoint MethodInfo joinPointInfo,
+   public Object after4(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after4 = "Object,MethodInfo,SuperClass,float";
+      after4 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after4(@JoinPoint MethodInfo joinPointInfo,
+   public Object after4(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after4 = "Object,MethodInfo,SuperClass,SuperValue";
+      after4 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after4(@JoinPoint MethodInfo joinPointInfo,
+   public Object after4(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after4 = "Object,MethodInfo,SuperClass,Object[]";
+      after4 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after4(@JoinPoint Object joinPointInfo,
+   public Object after4(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after4 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after4(@JoinPoint MethodInfo joinPointInfo,
+   public Object after4(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after4 = "Object,MethodInfo,SuperClass";
+      after4 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after4(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after4(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after4 = "Object,MethodInfo,float,SubValue";
+      after4 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after4(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after4(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after4 = "Object,MethodInfo,float,SuperValue";
+      after4 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public SuperClass after4(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after4(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after4 = "SuperClass,MethodInfo,SubValue";
+      after4 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after4(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after4(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after4 = "Object,MethodInfo,float";
+      after4 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after4(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after4(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after4 = "Object,MethodInfo,SuperValue";
+      after4 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after4(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after4(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after4 = "SubClass,MethodInfo,Object[]";
+      after4 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after4(@JoinPoint MethodInfo joinPointInfo)
+   public Object after4(@JoinPoint MethodExecution joinPoint)
    {
-      after4 = "Object,MethodInfo";
+      after4 = "Object,MethodExecution";
       return null;
    }
         
@@ -1145,7 +1145,7 @@
    
    public SuperClass after4(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after4 = "SuperClass,MethodInfo,SuperClass,float";
+      after4 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -1211,110 +1211,110 @@
    
    /* AFTER5 ADVICE */
    
-   public Object after5(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after5(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg SuperValue arg2)
    {
-      after5 = "Object,MethodInfo,Object,float,SuperValue";
+      after5 = "Object,MethodExecution,Object,float,SuperValue";
       return null;
    }
    
-   public Object after5(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after5(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg Object arg2)
    {
-      after5 = "Object,MethodInfo,Object,float,Object";
+      after5 = "Object,MethodExecution,Object,float,Object";
       return null;
    }
    
-   public Object after5(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after5(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SubValue arg2)
    {
-      after5 = "Object,JoinPointInfo,SuperClass,float,SubValue";
+      after5 = "Object,JoinPointBean,SuperClass,float,SubValue";
       return null;
    }
 
-   public SuperClass after5(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after5(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after5 = "SuperClass,MethodInfo,SuperClass,SubValue";
+      after5 = "SuperClass,MethodExecution,SuperClass,SubValue";
       return null;
    }
    
-   public Object after5(@JoinPoint MethodInfo joinPointInfo,
+   public Object after5(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after5 = "Object,MethodInfo,SuperClass,float";
+      after5 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after5(@JoinPoint MethodInfo joinPointInfo,
+   public Object after5(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after5 = "Object,MethodInfo,SuperClass,SuperValue";
+      after5 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after5(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after5(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after5 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after5 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public Object after5(@JoinPoint MethodInfo joinPointInfo,
+   public Object after5(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after5 = "Object,MethodInfo,SuperClass,Object[]";
+      after5 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after5(@JoinPoint MethodInfo joinPointInfo,
+   public Object after5(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after5 = "Object,MethodInfo,SuperClass";
+      after5 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after5(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after5(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after5 = "Object,MethodInfo,float,SubValue";
+      after5 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after5(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after5(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after5 = "Object,MethodInfo,float,SuperClass";
+      after5 = "Object,MethodExecution,float,SuperClass";
       return null;
    }
    
-   public SuperClass after5(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after5(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after5 = "SuperClass,MethodInfo,SubValue";
+      after5 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after5(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after5(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after5 = "Object,MethodInfo,float";
+      after5 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after5(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after5(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after5 = "Object,MethodInfo,SuperValue";
+      after5 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after5(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after5(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after5 = "SubClass,MethodInfo,Object[]";
+      after5 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after5(@JoinPoint MethodInfo joinPointInfo)
+   public Object after5(@JoinPoint MethodExecution joinPoint)
    {
-      after5 = "Object,MethodInfo";
+      after5 = "Object,MethodExecution";
       return null;
    }
         
@@ -1341,7 +1341,7 @@
 
    public SuperClass after5(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after5 = "SuperClass,MethodInfo,SuperClass,float";
+      after5 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -1407,96 +1407,96 @@
    
    /* AFTER6 ADVICE */
    
-   public Object after6(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after6(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1, @Arg Object arg2)
    {
-      after6 = "Object,MethodInfo,Object,float,Object";
+      after6 = "Object,MethodExecution,Object,float,Object";
       return null;
    }
    
-   public Object after6(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after6(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SubValue arg2)
    {
-      after6 = "Object,JoinPointInfo,SuperClass,float,SubValue";
+      after6 = "Object,JoinPointBean,SuperClass,float,SubValue";
       return null;
    }
 
-   public SuperClass after6(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after6(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after6 = "SuperClass,MethodInfo,SuperClass,SubValue";
+      after6 = "SuperClass,MethodExecution,SuperClass,SubValue";
       return null;
    }
    
-   public Object after6(@JoinPoint MethodInfo joinPointInfo,
+   public Object after6(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after6 = "Object,MethodInfo,SuperClass,float";
+      after6 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after6(@JoinPoint MethodInfo joinPointInfo,
+   public Object after6(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after6 = "Object,MethodInfo,SuperClass,SuperValue";
+      after6 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after6(@JoinPoint MethodInfo joinPointInfo,
+   public Object after6(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after6 = "Object,MethodInfo,SuperClass,Object[]";
+      after6 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after6(@JoinPoint MethodInfo joinPointInfo,
+   public Object after6(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after6 = "Object,MethodInfo,SuperClass";
+      after6 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after6(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after6(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after6 = "Object,MethodInfo,float,SubValue";
+      after6 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after6(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after6(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after6 = "Object,MethodInfo,float,SuperValue";
+      after6 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public SuperClass after6(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after6(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after6 = "SuperClass,MethodInfo,SubValue";
+      after6 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after6(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after6(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after6 = "Object,MethodInfo,float";
+      after6 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after6(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after6(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after6 = "Object,MethodInfo,SuperValue";
+      after6 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after6(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after6(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after6 = "SubClass,MethodInfo,Object[]";
+      after6 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after6(@JoinPoint MethodInfo joinPointInfo)
+   public Object after6(@JoinPoint MethodExecution joinPoint)
    {
-      after6 = "Object,MethodInfo";
+      after6 = "Object,MethodExecution";
       return null;
    }
         
@@ -1516,7 +1516,7 @@
    
    public SuperClass after6(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after6 = "SuperClass,MethodInfo,SuperClass,float";
+      after6 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -1582,180 +1582,180 @@
    
    /* AFTER7 ADVICE */
    
-   public Object after7(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after7(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1, @Arg SubValue arg2)
    {
-      after7 = "Object,JoinPointInfo,SuperClass,float,SubValue";
+      after7 = "Object,JoinPointBean,SuperClass,float,SubValue";
       return null;
    }
 
-   public SuperClass after7(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after7(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after7 = "SuperClass,MethodInfo,SuperClass,SubValue";
+      after7 = "SuperClass,MethodExecution,SuperClass,SubValue";
       return null;
    }
    
-   public Object after7(@JoinPoint MethodInfo joinPointInfo,
+   public Object after7(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after7 = "Object,MethodInfo,SuperClass,float";
+      after7 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after7(@JoinPoint MethodInfo joinPointInfo,
+   public Object after7(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after7 = "Object,MethodInfo,SuperClass,SuperValue";
+      after7 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after7(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after7(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after7 = "SuperClass,MethodInfo,SuperClass,Object";
+      after7 = "SuperClass,MethodExecution,SuperClass,Object";
       return null;
    }
 
-   public SuperClass after7(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after7(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SubValue arg2)
    {
-      after7 = "SuperClass,MethodInfo,Object,SubValue";
+      after7 = "SuperClass,MethodExecution,Object,SubValue";
       return null;
    }
    
-   public Object after7(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after7(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1)
    {
-      after7 = "Object,MethodInfo,Object,float";
+      after7 = "Object,MethodExecution,Object,float";
       return null;
    }
 
-   public SubClass after7(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after7(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after7 = "SubClass,MethodInfo,Object,SuperValue";
+      after7 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after7(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after7(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after7 = "SubClass,MethodInfo,Object,Object";
+      after7 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SubClass after7(@JoinPoint Object joinPointInfo,
+   public SubClass after7(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after7 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after7(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after7(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after7 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after7(@JoinPoint Object joinPointInfo,
+   public SubClass after7(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after7 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after7(@JoinPoint Object joinPointInfo,
+   public Object after7(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after7 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after7(@JoinPoint MethodInfo joinPointInfo,
+   public Object after7(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after7 = "Object,MethodInfo,SuperClass,Object[]";
+      after7 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after7(@JoinPoint MethodInfo joinPointInfo,
+   public Object after7(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after7 = "Object,MethodInfo,Object,Object[]";
+      after7 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after7(@JoinPoint Object joinPointInfo,
+   public Object after7(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after7 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after7(@JoinPoint Object joinPointInfo,
+   public Object after7(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after7 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after7(@JoinPoint MethodInfo joinPointInfo,
+   public Object after7(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after7 = "Object,MethodInfo,SuperClass";
+      after7 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after7(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after7(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after7 = "Object,MethodInfo,float,SubValue";
+      after7 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after7(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after7(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after7 = "Object,MethodInfo,float,SuperValue";
+      after7 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after7(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after7(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after7 = "Object,MethodInfo,float,Object";
+      after7 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public SuperClass after7(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after7(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after7 = "SuperClass,MethodInfo,SubValue";
+      after7 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after7(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after7(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after7 = "Object,MethodInfo,float";
+      after7 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after7(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after7(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after7 = "Object,MethodInfo,SuperValue";
+      after7 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after7(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after7(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after7 = "SubClass,MethodInfo,Object[]";
+      after7 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after7(@JoinPoint MethodInfo joinPointInfo)
+   public Object after7(@JoinPoint MethodExecution joinPoint)
    {
-      after7 = "Object,MethodInfo";
+      after7 = "Object,MethodExecution";
       return null;
    }
         
@@ -1782,7 +1782,7 @@
 
    public SuperClass after7(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after7 = "SuperClass,MethodInfo,SuperClass,float";
+      after7 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -1848,222 +1848,222 @@
    
    /* AFTER8 ADVICE */
    
-   public SuperClass after8(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after8(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after8 = "SuperClass,MethodInfo,SuperClass,SubValue";
+      after8 = "SuperClass,MethodExecution,SuperClass,SubValue";
       return null;
    }
    
-   public Object after8(@JoinPoint MethodInfo joinPointInfo,
+   public Object after8(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after8 = "Object,MethodInfo,SuperClass,float";
+      after8 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after8(@JoinPoint MethodInfo joinPointInfo,
+   public Object after8(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after8 = "Object,MethodInfo,SuperClass,SuperValue";
+      after8 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after8(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after8(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after8 = "SuperClass,MethodInfo,SuperClass,Object";
+      after8 = "SuperClass,MethodExecution,SuperClass,Object";
       return null;
    }
 
-   public SuperClass after8(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after8(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SubValue arg2)
    {
-      after8 = "SuperClass,MethodInfo,Object,SubValue";
+      after8 = "SuperClass,MethodExecution,Object,SubValue";
       return null;
    }
    
-   public Object after8(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after8(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1)
    {
-      after8 = "Object,MethodInfo,Object,float";
+      after8 = "Object,MethodExecution,Object,float";
       return null;
    }
 
-   public SubClass after8(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after8(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after8 = "SubClass,MethodInfo,Object,SuperValue";
+      after8 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after8(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after8(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after8 = "SubClass,MethodInfo,Object,Object";
+      after8 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after8(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after8(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after8 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after8 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after8(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after8(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after8 = "SubClass,JoinPointInfo,SuperClass,float";
+      after8 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after8(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after8(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after8 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after8 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after8(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after8(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after8 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after8 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after8(@JoinPoint Object joinPointInfo,
+   public SubClass after8(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after8 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after8(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after8(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after8 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after8(@JoinPoint Object joinPointInfo,
+   public SubClass after8(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after8 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after8(@JoinPoint Object joinPointInfo,
+   public Object after8(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after8 = "Object,Object,SuperClass,Object";
       return null;
    }
    
-   public Object after8(@JoinPoint MethodInfo joinPointInfo,
+   public Object after8(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after8 = "Object,MethodInfo,SuperClass,Object[]";
+      after8 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after8(@JoinPoint MethodInfo joinPointInfo,
+   public Object after8(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after8 = "Object,MethodInfo,Object,Object[]";
+      after8 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after8(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after8(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after8 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after8 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after8(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after8(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after8 = "Object,JoinPointInfo,Object,Object[]";
+      after8 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after8(@JoinPoint Object joinPointInfo,
+   public Object after8(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after8 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after8(@JoinPoint Object joinPointInfo,
+   public Object after8(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after8 = "Object,Object,Object,Object[]";
       return null;
    }
 
-   public Object after8(@JoinPoint MethodInfo joinPointInfo,
+   public Object after8(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after8 = "Object,MethodInfo,SuperClass";
+      after8 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after8(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after8(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after8 = "Object,MethodInfo,float,SubValue";
+      after8 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after8(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after8(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after8 = "Object,MethodInfo,float,SuperValue";
+      after8 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after8(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after8(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after8 = "Object,MethodInfo,float,Object";
+      after8 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after8(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after8(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after8 = "Object,JoinPointInfo,float,SubValue";
+      after8 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after8(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after8(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after8 = "SuperClass,MethodInfo,SubValue";
+      after8 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after8(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after8(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after8 = "Object,MethodInfo,float";
+      after8 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after8(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after8(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after8 = "Object,MethodInfo,SuperValue";
+      after8 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after8(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after8(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after8 = "SubClass,MethodInfo,Object[]";
+      after8 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after8(@JoinPoint MethodInfo joinPointInfo)
+   public Object after8(@JoinPoint MethodExecution joinPoint)
    {
-      after8 = "Object,MethodInfo";
+      after8 = "Object,MethodExecution";
       return null;
    }
         
@@ -2090,7 +2090,7 @@
 
    public SuperClass after8(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after8 = "SuperClass,MethodInfo,SuperClass,float";
+      after8 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -2156,222 +2156,222 @@
    
    /* AFTER9 ADVICE */
    
-   public Object after9(@JoinPoint MethodInfo joinPointInfo,
+   public Object after9(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after9 = "Object,MethodInfo,SuperClass,float";
+      after9 = "Object,MethodExecution,SuperClass,float";
       return null;
    }
 
-   public Object after9(@JoinPoint MethodInfo joinPointInfo,
+   public Object after9(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after9 = "Object,MethodInfo,SuperClass,SuperValue";
+      after9 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after9(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after9(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after9 = "SuperClass,MethodInfo,SuperClass,Object";
+      after9 = "SuperClass,MethodExecution,SuperClass,Object";
       return null;
    }
 
-   public SuperClass after9(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after9(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SubValue arg2)
    {
-      after9 = "SuperClass,MethodInfo,Object,SubValue";
+      after9 = "SuperClass,MethodExecution,Object,SubValue";
       return null;
    }
    
-   public Object after9(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after9(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1)
    {
-      after9 = "Object,MethodInfo,Object,float";
+      after9 = "Object,MethodExecution,Object,float";
       return null;
    }
 
-   public SubClass after9(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after9(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after9 = "SubClass,MethodInfo,Object,SuperValue";
+      after9 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after9(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after9(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after9 = "SubClass,MethodInfo,Object,Object";
+      after9 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after9(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after9(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after9 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after9 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after9(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after9(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after9 = "SubClass,JoinPointInfo,SuperClass,float";
+      after9 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after9(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after9(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after9 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after9 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after9(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after9(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after9 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after9 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after9(@JoinPoint Object joinPointInfo,
+   public SubClass after9(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after9 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after9(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after9(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after9 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after9(@JoinPoint Object joinPointInfo,
+   public SubClass after9(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after9 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after9(@JoinPoint Object joinPointInfo,
+   public Object after9(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after9 = "Object,Object,SuperClass,Object";
       return null;
    }
    
-   public Object after9(@JoinPoint MethodInfo joinPointInfo,
+   public Object after9(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after9 = "Object,MethodInfo,SuperClass,Object[]";
+      after9 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after9(@JoinPoint MethodInfo joinPointInfo,
+   public Object after9(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after9 = "Object,MethodInfo,Object,Object[]";
+      after9 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after9(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after9(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after9 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after9 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after9(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after9(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after9 = "Object,JoinPointInfo,Object,Object[]";
+      after9 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after9(@JoinPoint Object joinPointInfo,
+   public Object after9(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after9 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after9(@JoinPoint Object joinPointInfo,
+   public Object after9(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after9 = "Object,Object,Object,Object[]";
       return null;
    }
 
-   public Object after9(@JoinPoint MethodInfo joinPointInfo,
+   public Object after9(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after9 = "Object,MethodInfo,SuperClass";
+      after9 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after9(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after9(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned)
    {
-      after9 = "Object,JoinPointInfo,SuperClass";
+      after9 = "Object,JoinPointBean,SuperClass";
       return null;
    }
 
-   public Object after9(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after9(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after9 = "Object,MethodInfo,float,SubValue";
+      after9 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after9(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after9(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after9 = "Object,MethodInfo,float,SuperValue";
+      after9 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after9(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after9(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after9 = "Object,MethodInfo,float,Object";
+      after9 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after9(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after9(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after9 = "Object,JoinPointInfo,float,SubValue";
+      after9 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after9(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after9(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after9 = "SuperClass,MethodInfo,SubValue";
+      after9 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after9(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after9(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after9 = "Object,MethodInfo,float";
+      after9 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after9(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after9(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after9 = "Object,MethodInfo,SuperValue";
+      after9 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after9(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after9(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after1 = "SubClass,MethodInfo,Object[]";
+      after1 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after9(@JoinPoint MethodInfo joinPointInfo)
+   public Object after9(@JoinPoint MethodExecution joinPoint)
    {
-      after9 = "Object,MethodInfo";
+      after9 = "Object,MethodExecution";
       return null;
    }
         
@@ -2398,7 +2398,7 @@
 
    public SuperClass after9(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after9 = "SuperClass,MethodInfo,SuperClass,float";
+      after9 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -2470,208 +2470,208 @@
    
    /* AFTER10 ADVICE */
    
-   public Object after10(@JoinPoint MethodInfo joinPointInfo,
+   public Object after10(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after10 = "Object,MethodInfo,SuperClass,SuperValue";
+      after10 = "Object,MethodExecution,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after10(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after10(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after10 = "SuperClass,MethodInfo,SuperClass,Object";
+      after10 = "SuperClass,MethodExecution,SuperClass,Object";
       return null;
    }
 
-   public SuperClass after10(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after10(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SubValue arg2)
    {
-      after10 = "SuperClass,MethodInfo,Object,SubValue";
+      after10 = "SuperClass,MethodExecution,Object,SubValue";
       return null;
    }
    
-   public Object after10(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after10(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1)
    {
-      after10 = "Object,MethodInfo,Object,float";
+      after10 = "Object,MethodExecution,Object,float";
       return null;
    }
 
-   public SubClass after10(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after10(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after10 = "SubClass,MethodInfo,Object,SuperValue";
+      after10 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after10(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after10(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after10 = "SubClass,MethodInfo,Object,Object";
+      after10 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after10(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after10(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after10 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after10 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after10(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after10(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after10 = "SubClass,JoinPointInfo,SuperClass,float";
+      after10 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after10(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after10(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after10 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after10 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after10(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after10(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after10 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after10 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after10(@JoinPoint Object joinPointInfo,
+   public SubClass after10(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after10 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after10(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after10(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after10 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after10(@JoinPoint Object joinPointInfo,
+   public SubClass after10(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after10 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after10(@JoinPoint Object joinPointInfo,
+   public Object after10(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after10 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after10(@JoinPoint MethodInfo joinPointInfo,
+   public Object after10(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after10 = "Object,MethodInfo,SuperClass,Object[]";
+      after10 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after10(@JoinPoint MethodInfo joinPointInfo,
+   public Object after10(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after10 = "Object,MethodInfo,Object,Object[]";
+      after10 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after10(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after10(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after10 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after10 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after10(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after10(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after10 = "Object,JoinPointInfo,Object,Object[]";
+      after10 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after10(@JoinPoint Object joinPointInfo,
+   public Object after10(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after10 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after10(@JoinPoint Object joinPointInfo,
+   public Object after10(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after10 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after10(@JoinPoint MethodInfo joinPointInfo,
+   public Object after10(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after10 = "Object,MethodInfo,SuperClass";
+      after10 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after10(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after10(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after10 = "Object,MethodInfo,float,SubValue";
+      after10 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after10(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after10(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after10 = "Object,MethodInfo,float,SuperValue";
+      after10 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after10(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after10(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after10 = "Object,MethodInfo,float,Object";
+      after10 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after10(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after10(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after10 = "Object,JoinPointInfo,float,SubValue";
+      after10 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after10(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after10(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after10 = "SuperClass,MethodInfo,SubValue";
+      after10 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after10(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after10(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after10 = "Object,MethodInfo,float";
+      after10 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after10(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after10(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after10 = "Object,MethodInfo,SuperValue";
+      after10 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after10(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after10(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after10 = "SubClass,MethodInfo,Object[]";
+      after10 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after10(@JoinPoint MethodInfo joinPointInfo)
+   public Object after10(@JoinPoint MethodExecution joinPoint)
    {
-      after10 = "Object,MethodInfo";
+      after10 = "Object,MethodExecution";
       return null;
    }
         
@@ -2698,7 +2698,7 @@
 
    public SuperClass after10(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after10 = "SuperClass,MethodInfo,SuperClass,float";
+      after10 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -2770,201 +2770,201 @@
    
    /* AFTER11 ADVICE */
    
-   public SuperClass after11(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after11(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after11 = "SuperClass,MethodInfo,SuperClass,Object";
+      after11 = "SuperClass,MethodExecution,SuperClass,Object";
       return null;
    }
 
-   public SuperClass after11(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after11(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SubValue arg2)
    {
-      after11 = "SuperClass,MethodInfo,Object,SubValue";
+      after11 = "SuperClass,MethodExecution,Object,SubValue";
       return null;
    }
    
-   public Object after11(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after11(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1)
    {
-      after11 = "Object,MethodInfo,Object,float";
+      after11 = "Object,MethodExecution,Object,float";
       return null;
    }
 
-   public SubClass after11(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after11(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after11 = "SubClass,MethodInfo,Object,SuperValue";
+      after11 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after11(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after11(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after11 = "SubClass,MethodInfo,Object,Object";
+      after11 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after11(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after11(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after11 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after11 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after11(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after11(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after11 = "SubClass,JoinPointInfo,SuperClass,float";
+      after11 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after11(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after11(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after11 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after11 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after11(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after11(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after11 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after11 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after11(@JoinPoint Object joinPointInfo,
+   public SubClass after11(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after11 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after11(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after11(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after11 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after11(@JoinPoint Object joinPointInfo,
+   public SubClass after11(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after11 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after11(@JoinPoint Object joinPointInfo,
+   public Object after11(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after11 = "Object,Object,SuperClass,Object";
       return null;
    }
    
-   public Object after11(@JoinPoint MethodInfo joinPointInfo,
+   public Object after11(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after11 = "Object,MethodInfo,SuperClass,Object[]";
+      after11 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after11(@JoinPoint MethodInfo joinPointInfo,
+   public Object after11(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after11 = "Object,MethodInfo,Object,Object[]";
+      after11 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after11(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after11(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after11 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after11 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after11(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after11(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after11 = "Object,JoinPointInfo,Object,Object[]";
+      after11 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after11(@JoinPoint Object joinPointInfo,
+   public Object after11(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after11 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after11(@JoinPoint Object joinPointInfo,
+   public Object after11(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after11 = "Object,Object,Object,Object[]";
       return null;
    }
 
-   public Object after11(@JoinPoint MethodInfo joinPointInfo,
+   public Object after11(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after11 = "Object,MethodInfo,SuperClass";
+      after11 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after11(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after11(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after11 = "Object,MethodInfo,float,SubValue";
+      after11 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after11(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after11(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after11 = "Object,MethodInfo,float,SuperValue";
+      after11 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after11(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after11(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after11 = "Object,MethodInfo,float,Object";
+      after11 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after11(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after11(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after11 = "Object,JoinPointInfo,float,SubValue";
+      after11 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after11(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after11(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after11 = "SuperClass,MethodInfo,SubValue";
+      after11 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after11(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after11(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after11 = "Object,MethodInfo,float";
+      after11 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after11(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after11(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after11 = "Object,MethodInfo,SuperValue";
+      after11 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after11(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after11(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after11 = "SubClass,MethodInfo,Object[]";
+      after11 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after11(@JoinPoint MethodInfo joinPointInfo)
+   public Object after11(@JoinPoint MethodExecution joinPoint)
    {
-      after11 = "Object,MethodInfo";
+      after11 = "Object,MethodExecution";
       return null;
    }
         
@@ -2991,7 +2991,7 @@
 
    public SuperClass after11(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after11 = "SuperClass,MethodInfo,SuperClass,float";
+      after11 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -3063,194 +3063,194 @@
    
    /* AFTER12 ADVICE */
  
-   public SuperClass after12(@JoinPoint MethodInfo joinPointInfo,
+   public SuperClass after12(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SubValue arg2)
    {
-      after12 = "SuperClass,MethodInfo,Object,SubValue";
+      after12 = "SuperClass,MethodExecution,Object,SubValue";
       return null;
    }
    
-   public Object after12(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after12(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1)
    {
-      after12 = "Object,MethodInfo,Object,float";
+      after12 = "Object,MethodExecution,Object,float";
       return null;
    }
 
-   public SubClass after12(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after12(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after12 = "SubClass,MethodInfo,Object,SuperValue";
+      after12 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after12(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after12(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after12 = "SubClass,MethodInfo,Object,Object";
+      after12 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after12(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after12(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after12 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after12 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after12(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after12(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after12 = "SubClass,JoinPointInfo,SuperClass,float";
+      after12 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after12(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after12(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after12 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after12 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after12(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after12(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after12 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after12 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
    
-   public SubClass after12(@JoinPoint Object joinPointInfo,
+   public SubClass after12(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after12 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after12(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after12(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after12 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after12(@JoinPoint Object joinPointInfo,
+   public SubClass after12(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after12 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after12(@JoinPoint Object joinPointInfo,
+   public Object after12(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after12 = "Object,Object,SuperClass,Object";
       return null;
    }
    
-   public Object after12(@JoinPoint MethodInfo joinPointInfo,
+   public Object after12(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after12 = "Object,MethodInfo,SuperClass,Object[]";
+      after12 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after12(@JoinPoint MethodInfo joinPointInfo,
+   public Object after12(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after12 = "Object,MethodInfo,Object,Object[]";
+      after12 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after12(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after12(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after12 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after12 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after12(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after12(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after12 = "Object,JoinPointInfo,Object,Object[]";
+      after12 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after12(@JoinPoint Object joinPointInfo,
+   public Object after12(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after12 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after12(@JoinPoint Object joinPointInfo,
+   public Object after12(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after12 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after12(@JoinPoint MethodInfo joinPointInfo,
+   public Object after12(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after12 = "Object,MethodInfo,SuperClass";
+      after12 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after12(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after12(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after12 = "Object,MethodInfo,float,SubValue";
+      after12 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after12(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after12(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after12 = "Object,MethodInfo,float,SuperValue";
+      after12 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after12(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after12(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after12 = "Object,MethodInfo,float,Object";
+      after12 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after12(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after12(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after12 = "Object,JoinPointInfo,float,SubValue";
+      after12 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after12(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after12(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after12 = "SuperClass,MethodInfo,SubValue";
+      after12 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after12(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after12(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after12 = "Object,MethodInfo,float";
+      after12 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after12(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after12(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after12 = "Object,MethodInfo,SuperValue";
+      after12 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after12(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after12(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after12 = "SubClass,MethodInfo,Object[]";
+      after12 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after12(@JoinPoint MethodInfo joinPointInfo)
+   public Object after12(@JoinPoint MethodExecution joinPoint)
    {
-      after12 = "Object,MethodInfo";
+      after12 = "Object,MethodExecution";
       return null;
    }
         
@@ -3277,7 +3277,7 @@
 
    public SuperClass after12(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after12 = "SuperClass,MethodInfo,SuperClass,float";
+      after12 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -3343,187 +3343,187 @@
    
    /* AFTER13 ADVICE */
    
-   public Object after13(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned,
+   public Object after13(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned,
          @Arg float arg1)
    {
-      after13 = "Object,MethodInfo,Object,float";
+      after13 = "Object,MethodExecution,Object,float";
       return null;
    }
 
-   public SubClass after13(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after13(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after13 = "SubClass,MethodInfo,Object,SuperValue";
+      after13 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after13(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after13(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after13 = "SubClass,MethodInfo,Object,Object";
+      after13 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after13(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after13(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after13 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after13 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after13(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after13(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after13 = "SubClass,JoinPointInfo,SuperClass,float";
+      after13 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after13(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after13(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after13 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after13 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after13(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after13(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after13 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after13 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after13(@JoinPoint Object joinPointInfo,
+   public SubClass after13(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after13 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after13(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after13(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after13 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after13(@JoinPoint Object joinPointInfo,
+   public SubClass after13(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after13 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after13(@JoinPoint Object joinPointInfo,
+   public Object after13(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after13 = "Object,Object,SuperClass,Object";
       return null;
    }
    
-   public Object after13(@JoinPoint MethodInfo joinPointInfo,
+   public Object after13(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after13 = "Object,MethodInfo,SuperClass,Object[]";
+      after13 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after13(@JoinPoint MethodInfo joinPointInfo,
+   public Object after13(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after13 = "Object,MethodInfo,Object,Object[]";
+      after13 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after13(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after13(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after13 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after13 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after13(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after13(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after13 = "Object,JoinPointInfo,Object,Object[]";
+      after13 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after13(@JoinPoint Object joinPointInfo,
+   public Object after13(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after13 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after13(@JoinPoint Object joinPointInfo,
+   public Object after13(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after13 = "Object,Object,Object,Object[]";
       return null;
    }
 
-   public Object after13(@JoinPoint MethodInfo joinPointInfo,
+   public Object after13(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after13 = "Object,MethodInfo,SuperClass";
+      after13 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after13(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after13(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after13 = "Object,MethodInfo,float,SubValue";
+      after13 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after13(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after13(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after13 = "Object,MethodInfo,float,SuperValue";
+      after13 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after13(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after13(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after13 = "Object,MethodInfo,float,Object";
+      after13 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after13(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after13(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after13 = "Object,JoinPointInfo,float,SubValue";
+      after13 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after13(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after13(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after13 = "SuperClass,MethodInfo,SubValue";
+      after13 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after13(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after13(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after13 = "Object,MethodInfo,float";
+      after13 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after13(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after13(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after13 = "Object,MethodInfo,SuperValue";
+      after13 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after13(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after13(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after13 = "SubClass,MethodInfo,Object[]";
+      after13 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after13(@JoinPoint MethodInfo joinPointInfo)
+   public Object after13(@JoinPoint MethodExecution joinPoint)
    {
-      after13 = "Object,MethodInfo";
+      after13 = "Object,MethodExecution";
       return null;
    }
         
@@ -3550,7 +3550,7 @@
 
    public SuperClass after13(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after13 = "SuperClass,MethodInfo,SuperClass,float";
+      after13 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -3616,180 +3616,180 @@
    
    /* AFTER14 ADVICE */
    
-   public SubClass after14(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after14(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg SuperValue arg2)
    {
-      after14 = "SubClass,MethodInfo,Object,SuperValue";
+      after14 = "SubClass,MethodExecution,Object,SuperValue";
       return null;
    }
    
-   public SubClass after14(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after14(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after14 = "SubClass,MethodInfo,Object,Object";
+      after14 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after14(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after14(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after14 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after14 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after14(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after14(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after14 = "SubClass,JoinPointInfo,SuperClass,float";
+      after14 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after14(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after14(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after14 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after14 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after14(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after14(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after14 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after14 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after14(@JoinPoint Object joinPointInfo,
+   public SubClass after14(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after14 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after14(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after14(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after14 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after14(@JoinPoint Object joinPointInfo,
+   public SubClass after14(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after14 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after14(@JoinPoint Object joinPointInfo,
+   public Object after14(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after14 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after14(@JoinPoint MethodInfo joinPointInfo,
+   public Object after14(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after14 = "Object,MethodInfo,SuperClass,Object[]";
+      after14 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after14(@JoinPoint MethodInfo joinPointInfo,
+   public Object after14(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after14 = "Object,MethodInfo,Object,Object[]";
+      after14 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after14(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after14(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after14 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after14 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after14(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after14(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after14 = "Object,JoinPointInfo,Object,Object[]";
+      after14 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after14(@JoinPoint Object joinPointInfo,
+   public Object after14(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after14 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after14(@JoinPoint Object joinPointInfo,
+   public Object after14(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after14 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after14(@JoinPoint MethodInfo joinPointInfo,
+   public Object after14(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after14 = "Object,MethodInfo,SuperClass";
+      after14 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after14(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after14(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after14 = "Object,MethodInfo,float,SubValue";
+      after14 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after14(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after14(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after14 = "Object,MethodInfo,float,SuperValue";
+      after14 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after14(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after14(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after14 = "Object,MethodInfo,float,Object";
+      after14 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after14(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after14(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after14 = "Object,JoinPointInfo,float,SubValue";
+      after14 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after14(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after14(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after14 = "SuperClass,MethodInfo,SubValue";
+      after14 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after14(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after14(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after14 = "Object,MethodInfo,float";
+      after14 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after14(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after14(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after14 = "Object,MethodInfo,SuperValue";
+      after14 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after14(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after14(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after14 = "SubClass,MethodInfo,Object[]";
+      after14 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after14(@JoinPoint MethodInfo joinPointInfo)
+   public Object after14(@JoinPoint MethodExecution joinPoint)
    {
-      after14 = "Object,MethodInfo";
+      after14 = "Object,MethodExecution";
       return null;
    }
         
@@ -3816,7 +3816,7 @@
 
    public SuperClass after14(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after14 = "SuperClass,MethodInfo,SuperClass,float";
+      after14 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -3882,173 +3882,173 @@
    
    /* AFTER15 ADVICE */
    
-   public SubClass after15(@JoinPoint MethodInfo joinPointInfo,
+   public SubClass after15(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Arg Object arg2)
    {
-      after15 = "SubClass,MethodInfo,Object,Object";
+      after15 = "SubClass,MethodExecution,Object,Object";
       return null;
    }
    
-   public SuperClass after15(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after15(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after15 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after15 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after15(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after15(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after15 = "SubClass,JoinPointInfo,SuperClass,float";
+      after15 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after15(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after15(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after15 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after15 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after15(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after15(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after15 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after15 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after15(@JoinPoint Object joinPointInfo,
+   public SubClass after15(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after15 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after15(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after15(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after15 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after15(@JoinPoint Object joinPointInfo,
+   public SubClass after15(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after15 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after15(@JoinPoint Object joinPointInfo,
+   public Object after15(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after15 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after15(@JoinPoint MethodInfo joinPointInfo,
+   public Object after15(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after15 = "Object,MethodInfo,SuperClass,Object[]";
+      after15 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after15(@JoinPoint MethodInfo joinPointInfo,
+   public Object after15(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after15 = "Object,MethodInfo,Object,Object[]";
+      after15 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after15(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after15(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after15 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after15 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after15(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after15(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after15 = "Object,JoinPointInfo,Object,Object[]";
+      after15 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after15(@JoinPoint Object joinPointInfo,
+   public Object after15(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after15 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after15(@JoinPoint Object joinPointInfo,
+   public Object after15(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after15 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after15(@JoinPoint MethodInfo joinPointInfo,
+   public Object after15(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after15 = "Object,MethodInfo,SuperClass";
+      after15 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after15(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after15(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after15 = "Object,MethodInfo,float,SubValue";
+      after15 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after15(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after15(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after15 = "Object,MethodInfo,float,SuperValue";
+      after15 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after15(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after15(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after15 = "Object,MethodInfo,float,Object";
+      after15 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after15(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after15(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after15 = "Object,JoinPointInfo,float,SubValue";
+      after15 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after15(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after15(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after15 = "SuperClass,MethodInfo,SubValue";
+      after15 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after15(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after15(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after15 = "Object,MethodInfo,float";
+      after15 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after15(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after15(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after15 = "Object,MethodInfo,SuperValue";
+      after15 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after15(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after15(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after15 = "SubClass,MethodInfo,Object[]";
+      after15 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after15(@JoinPoint MethodInfo joinPointInfo)
+   public Object after15(@JoinPoint MethodExecution joinPoint)
    {
-      after15 = "Object,MethodInfo";
+      after15 = "Object,MethodExecution";
       return null;
    }
         
@@ -4075,7 +4075,7 @@
 
    public SuperClass after15(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after15 = "SuperClass,MethodInfo,SuperClass,float";
+      after15 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -4159,172 +4159,172 @@
    
    /* AFTER16 ADVICE */
 
-   public SuperClass after16(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after16(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
-      after16 = "SuperClass,JoinPointInfo,SuperClass,SubValue";
+      after16 = "SuperClass,JoinPointBean,SuperClass,SubValue";
       return null;
    }
    
-   public SubClass after16(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after16(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after16 = "SubClass,JoinPointInfo,SuperClass,float";
+      after16 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after16(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after16(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after16 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after16 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after16(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after16(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after16 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after16 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after16(@JoinPoint Object joinPointInfo,
+   public SubClass after16(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after16 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after16(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after16(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after16 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after16(@JoinPoint Object joinPointInfo,
+   public SubClass after16(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after16 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after16(@JoinPoint Object joinPointInfo,
+   public Object after16(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after16 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after16(@JoinPoint MethodInfo joinPointInfo,
+   public Object after16(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after16 = "Object,MethodInfo,SuperClass,Object[]";
+      after16 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after16(@JoinPoint MethodInfo joinPointInfo,
+   public Object after16(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after16 = "Object,MethodInfo,Object,Object[]";
+      after16 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after16(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after16(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after16 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after16 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after16(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after16(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after16 = "Object,JoinPointInfo,Object,Object[]";
+      after16 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after16(@JoinPoint Object joinPointInfo,
+   public Object after16(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after16 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after16(@JoinPoint Object joinPointInfo,
+   public Object after16(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after16 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after16(@JoinPoint MethodInfo joinPointInfo,
+   public Object after16(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after16 = "Object,MethodInfo,SuperClass";
+      after16 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after16(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned)
+   public Object after16(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned)
    {
-      after16 = "Object,MethodInfo,Object";
+      after16 = "Object,MethodExecution,Object";
       return null;
    }
 
-   public Object after16(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after16(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after16 = "Object,MethodInfo,float,SubValue";
+      after16 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after16(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after16(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after16 = "Object,MethodInfo,float,SuperValue";
+      after16 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after16(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after16(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after16 = "Object,MethodInfo,float,Object";
+      after16 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after16(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after16(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after16 = "Object,JoinPointInfo,float,SubValue";
+      after16 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after16(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after16(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after16 = "SuperClass,MethodInfo,SubValue";
+      after16 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after16(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after16(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after16 = "Object,MethodInfo,float";
+      after16 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after16(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after16(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after16 = "Object,MethodInfo,SuperValue";
+      after16 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after16(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after16(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after16 = "SubClass,MethodInfo,Object[]";
+      after16 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after16(@JoinPoint MethodInfo joinPointInfo)
+   public Object after16(@JoinPoint MethodExecution joinPoint)
    {
-      after16 = "Object,MethodInfo";
+      after16 = "Object,MethodExecution";
       return null;
    }
         
@@ -4351,7 +4351,7 @@
 
    public SuperClass after16(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after16 = "SuperClass,MethodInfo,SuperClass,float";
+      after16 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -4417,159 +4417,159 @@
    
    /* AFTER17 ADVICE */
 
-   public SubClass after17(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after17(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg float arg1)
    {
-      after17 = "SubClass,JoinPointInfo,SuperClass,float";
+      after17 = "SubClass,JoinPointBean,SuperClass,float";
       return null;
    }
 
-   public SubClass after17(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after17(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after17 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after17 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after17(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after17(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after17 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after17 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after17(@JoinPoint Object joinPointInfo,
+   public SubClass after17(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after17 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after17(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after17(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after17 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after17(@JoinPoint Object joinPointInfo,
+   public SubClass after17(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after17 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after17(@JoinPoint Object joinPointInfo,
+   public Object after17(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after17 = "Object,Object,SuperClass,Object";
       return null;
    }
    
-   public Object after17(@JoinPoint MethodInfo joinPointInfo,
+   public Object after17(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after17 = "Object,MethodInfo,SuperClass,Object[]";
+      after17 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after17(@JoinPoint MethodInfo joinPointInfo,
+   public Object after17(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after17 = "Object,MethodInfo,Object,Object[]";
+      after17 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after17(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after17(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after17 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after17 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after17(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after17(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after17 = "Object,JoinPointInfo,Object,Object[]";
+      after17 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after17(@JoinPoint Object joinPointInfo,
+   public Object after17(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after17 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after17(@JoinPoint Object joinPointInfo,
+   public Object after17(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after17 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after17(@JoinPoint MethodInfo joinPointInfo,
+   public Object after17(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after17 = "Object,MethodInfo,SuperClass";
+      after17 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after17(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after17(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after17 = "Object,MethodInfo,float,SubValue";
+      after17 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after17(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after17(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after17 = "Object,MethodInfo,float,SuperValue";
+      after17 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after17(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after17(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after17 = "Object,MethodInfo,float,Object";
+      after17 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after17(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after17(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after17 = "Object,JoinPointInfo,float,SubValue";
+      after17 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after17(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after17(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after17 = "SuperClass,MethodInfo,SubValue";
+      after17 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after17(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after17(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after17 = "Object,MethodInfo,float";
+      after17 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after17(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after17(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after17 = "Object,MethodInfo,SuperValue";
+      after17 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after17(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after17(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after17 = "SubClass,MethodInfo,Object[]";
+      after17 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after17(@JoinPoint MethodInfo joinPointInfo)
+   public Object after17(@JoinPoint MethodExecution joinPoint)
    {
-      after17 = "Object,MethodInfo";
+      after17 = "Object,MethodExecution";
       return null;
    }
         
@@ -4596,7 +4596,7 @@
 
    public SuperClass after17(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after17 = "SuperClass,MethodInfo,SuperClass,float";
+      after17 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -4662,152 +4662,152 @@
    
    /* AFTER18 ADVICE */
    
-   public SubClass after18(@JoinPoint JoinPointInfo joinPointInfo,
+   public SubClass after18(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
-      after18 = "SubClass,JoinPointInfo,SuperClass,SuperValue";
+      after18 = "SubClass,JoinPointBean,SuperClass,SuperValue";
       return null;
    }
    
-   public SuperClass after18(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after18(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after18 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after18 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after18(@JoinPoint Object joinPointInfo,
+   public SubClass after18(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after18 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after18(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after18(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after18 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after18(@JoinPoint Object joinPointInfo,
+   public SubClass after18(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after18 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after18(@JoinPoint Object joinPointInfo,
+   public Object after18(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after18 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after18(@JoinPoint MethodInfo joinPointInfo,
+   public Object after18(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after18 = "Object,MethodInfo,SuperClass,Object[]";
+      after18 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after18(@JoinPoint MethodInfo joinPointInfo,
+   public Object after18(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after18 = "Object,MethodInfo,Object,Object[]";
+      after18 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after18(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after18(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after18 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after18 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after18(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after18(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after18 = "Object,JoinPointInfo,Object,Object[]";
+      after18 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after18(@JoinPoint Object joinPointInfo,
+   public Object after18(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after18 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after18(@JoinPoint Object joinPointInfo,
+   public Object after18(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after18 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after18(@JoinPoint MethodInfo joinPointInfo,
+   public Object after18(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after18 = "Object,MethodInfo,SuperClass";
+      after18 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after18(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after18(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after18 = "Object,MethodInfo,float,SubValue";
+      after18 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after18(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after18(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after18 = "Object,MethodInfo,float,SuperValue";
+      after18 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after18(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after18(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after18 = "Object,MethodInfo,float,Object";
+      after18 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after18(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after18(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after18 = "Object,JoinPointInfo,float,SubValue";
+      after18 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after18(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after18(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after18 = "SuperClass,MethodInfo,SubValue";
+      after18 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after18(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after18(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after18 = "Object,MethodInfo,float";
+      after18 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after18(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after18(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after18 = "Object,MethodInfo,SuperValue";
+      after18 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after18(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after18(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after18 = "SubClass,MethodInfo,Object[]";
+      after18 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after18(@JoinPoint MethodInfo joinPointInfo)
+   public Object after18(@JoinPoint MethodExecution joinPoint)
    {
-      after18 = "Object,MethodInfo";
+      after18 = "Object,MethodExecution";
       return null;
    }
         
@@ -4834,7 +4834,7 @@
 
    public SuperClass after18(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after18 = "SuperClass,MethodInfo,SuperClass,float";
+      after18 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -4900,145 +4900,145 @@
    
    /* AFTER19 ADVICE */
    
-   public SuperClass after19(@JoinPoint JoinPointInfo joinPointInfo,
+   public SuperClass after19(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
-      after19 = "SuperClass,JoinPointInfo,SuperClass,Object";
+      after19 = "SuperClass,JoinPointBean,SuperClass,Object";
       return null;
    }
 
-   public SubClass after19(@JoinPoint Object joinPointInfo,
+   public SubClass after19(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after19 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after19(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after19(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after19 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after19(@JoinPoint Object joinPointInfo,
+   public SubClass after19(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after19 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after19(@JoinPoint Object joinPointInfo,
+   public Object after19(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after19 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after19(@JoinPoint MethodInfo joinPointInfo,
+   public Object after19(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after19 = "Object,MethodInfo,SuperClass,Object[]";
+      after19 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after19(@JoinPoint MethodInfo joinPointInfo,
+   public Object after19(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after19 = "Object,MethodInfo,Object,Object[]";
+      after19 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after19(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after19(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after19 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after19 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after19(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after19(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after19 = "Object,JoinPointInfo,Object,Object[]";
+      after19 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after19(@JoinPoint Object joinPointInfo,
+   public Object after19(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after19 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after19(@JoinPoint Object joinPointInfo,
+   public Object after19(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after19 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after19(@JoinPoint MethodInfo joinPointInfo,
+   public Object after19(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after19 = "Object,MethodInfo,SuperClass";
+      after19 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after19(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after19(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after19 = "Object,MethodInfo,float,SubValue";
+      after19 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after19(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after19(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after19 = "Object,MethodInfo,float,SuperValue";
+      after19 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after19(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after19(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after19 = "Object,MethodInfo,float,Object";
+      after19 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after19(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after19(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after19 = "Object,JoinPointInfo,float,SubValue";
+      after19 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after19(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after19(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after19 = "SuperClass,MethodInfo,SubValue";
+      after19 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after19(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after19(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after19 = "Object,MethodInfo,float";
+      after19 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after19(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after19(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after19 = "Object,MethodInfo,SuperValue";
+      after19 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after19(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after19(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after19 = "SubClass,MethodInfo,Object[]";
+      after19 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after19(@JoinPoint MethodInfo joinPointInfo)
+   public Object after19(@JoinPoint MethodExecution joinPoint)
    {
-      after19 = "Object,MethodInfo";
+      after19 = "Object,MethodExecution";
       return null;
    }
         
@@ -5065,7 +5065,7 @@
 
    public SuperClass after19(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after19 = "SuperClass,MethodInfo,SuperClass,float";
+      after19 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -5131,145 +5131,145 @@
    
    /* AFTER20 ADVICE */
 
-   public SubClass after20(@JoinPoint Object joinPointInfo,
+   public SubClass after20(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SubValue arg2)
    {
       after20 = "SubClass,Object,SuperClass,SubValue";
       return null;
    }
    
-   public Object after20(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after20(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after20 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after20(@JoinPoint Object joinPointInfo,
+   public SubClass after20(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after20 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after20(@JoinPoint Object joinPointInfo,
+   public Object after20(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after20 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after20(@JoinPoint MethodInfo joinPointInfo,
+   public Object after20(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after20 = "Object,MethodInfo,SuperClass,Object[]";
+      after20 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after20(@JoinPoint MethodInfo joinPointInfo,
+   public Object after20(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after20 = "Object,MethodInfo,Object,Object[]";
+      after20 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after20(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after20(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after20 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after20 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after20(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after20(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after20 = "Object,JoinPointInfo,Object,Object[]";
+      after20 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after20(@JoinPoint Object joinPointInfo,
+   public Object after20(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after20 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after20(@JoinPoint Object joinPointInfo,
+   public Object after20(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after20 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after20(@JoinPoint MethodInfo joinPointInfo,
+   public Object after20(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after20 = "Object,MethodInfo,SuperClass";
+      after20 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after20(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after20(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned)
    {
-      after20 = "Object,JoinPointInfo,SuperClass";
+      after20 = "Object,JoinPointBean,SuperClass";
       return null;
    }
 
-   public Object after20(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after20(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after20 = "Object,MethodInfo,float,SubValue";
+      after20 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after20(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after20(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after20 = "Object,MethodInfo,float,SuperValue";
+      after20 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after20(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after20(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after20 = "Object,MethodInfo,float,Object";
+      after20 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after20(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after20(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after20 = "Object,JoinPointInfo,float,SubValue";
+      after20 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after20(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after20(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after20 = "SuperClass,MethodInfo,SubValue";
+      after20 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after20(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after20(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after20 = "Object,MethodInfo,float";
+      after20 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after20(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after20(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after20 = "Object,MethodInfo,SuperValue";
+      after20 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after20(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after20(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after20 = "SubClass,MethodInfo,Object[]";
+      after20 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after20(@JoinPoint MethodInfo joinPointInfo)
+   public Object after20(@JoinPoint MethodExecution joinPoint)
    {
-      after20 = "Object,MethodInfo";
+      after20 = "Object,MethodExecution";
       return null;
    }
         
@@ -5296,7 +5296,7 @@
 
    public SuperClass after20(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after20 = "SuperClass,MethodInfo,SuperClass,float";
+      after20 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -5362,131 +5362,131 @@
    
    /* AFTER21 ADVICE */
    
-   public Object after21(@JoinPoint Object joinPointInfo, @Return SuperClass valueReturned,
+   public Object after21(@JoinPoint Object joinPoint, @Return SuperClass valueReturned,
          @Arg float arg1)
    {
       after21 = "Object,Object,SuperClass,float";
       return null;
    }
 
-   public SubClass after21(@JoinPoint Object joinPointInfo,
+   public SubClass after21(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after21 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after21(@JoinPoint Object joinPointInfo,
+   public Object after21(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after21 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after21(@JoinPoint MethodInfo joinPointInfo,
+   public Object after21(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after21 = "Object,MethodInfo,SuperClass,Object[]";
+      after21 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after21(@JoinPoint MethodInfo joinPointInfo,
+   public Object after21(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after21 = "Object,MethodInfo,Object,Object[]";
+      after21 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after21(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after21(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after21 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after21 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after21(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after21(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after21 = "Object,JoinPointInfo,Object,Object[]";
+      after21 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after21(@JoinPoint Object joinPointInfo,
+   public Object after21(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after21 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after21(@JoinPoint Object joinPointInfo,
+   public Object after21(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after21 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after21(@JoinPoint MethodInfo joinPointInfo,
+   public Object after21(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after21 = "Object,MethodInfo,SuperClass";
+      after21 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after21(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after21(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after21 = "Object,MethodInfo,float,SubValue";
+      after21 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after21(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after21(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after21 = "Object,MethodInfo,float,SuperValue";
+      after21 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after21(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after21(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after21 = "Object,MethodInfo,float,Object";
+      after21 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after21(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after21(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after21 = "Object,JoinPointInfo,float,SubValue";
+      after21 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after21(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after21(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after21 = "SuperClass,MethodInfo,SubValue";
+      after21 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after21(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after21(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after21 = "Object,MethodInfo,float";
+      after21 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after21(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after21(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after21 = "Object,MethodInfo,SuperValue";
+      after21 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after21(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after21(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after21 = "SubClass,MethodInfo,Object[]";
+      after21 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after21(@JoinPoint MethodInfo joinPointInfo)
+   public Object after21(@JoinPoint MethodExecution joinPoint)
    {
-      after21 = "Object,MethodInfo";
+      after21 = "Object,MethodExecution";
       return null;
    }
         
@@ -5513,7 +5513,7 @@
 
    public SuperClass after21(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after21 = "SuperClass,MethodInfo,SuperClass,float";
+      after21 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -5579,124 +5579,124 @@
    
    /* AFTER22 ADVICE */
    
-   public SubClass after22(@JoinPoint Object joinPointInfo,
+   public SubClass after22(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg SuperValue arg2)
    {
       after22 = "SubClass,Object,SuperClass,SuperValue";
       return null;
    }
    
-   public Object after22(@JoinPoint Object joinPointInfo,
+   public Object after22(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after22 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after22(@JoinPoint MethodInfo joinPointInfo,
+   public Object after22(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after22 = "Object,MethodInfo,SuperClass,Object[]";
+      after22 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after22(@JoinPoint MethodInfo joinPointInfo,
+   public Object after22(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after22 = "Object,MethodInfo,Object,Object[]";
+      after22 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after22(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after22(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after22 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after22 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after22(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after22(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after22 = "Object,JoinPointInfo,Object,Object[]";
+      after22 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after22(@JoinPoint Object joinPointInfo,
+   public Object after22(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after22 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after22(@JoinPoint Object joinPointInfo,
+   public Object after22(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after22 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after22(@JoinPoint MethodInfo joinPointInfo,
+   public Object after22(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after22 = "Object,MethodInfo,SuperClass";
+      after22 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after22(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after22(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after22 = "Object,MethodInfo,float,SubValue";
+      after22 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after22(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after22(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after22 = "Object,MethodInfo,float,SuperValue";
+      after22 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after22(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after22(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after22 = "Object,MethodInfo,float,Object";
+      after22 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after22(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after22(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after22 = "Object,JoinPointInfo,float,SubValue";
+      after22 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after22(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after22(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after22 = "SuperClass,MethodInfo,SubValue";
+      after22 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after22(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after22(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after22 = "Object,MethodInfo,float";
+      after22 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after22(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after22(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after22 = "Object,MethodInfo,SuperValue";
+      after22 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after22(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after22(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after22 = "SubClass,MethodInfo,Object[]";
+      after22 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after22(@JoinPoint MethodInfo joinPointInfo)
+   public Object after22(@JoinPoint MethodExecution joinPoint)
    {
-      after22 = "Object,MethodInfo";
+      after22 = "Object,MethodExecution";
       return null;
    }
         
@@ -5723,7 +5723,7 @@
 
    public SuperClass after22(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after22 = "SuperClass,MethodInfo,SuperClass,float";
+      after22 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -5783,117 +5783,117 @@
    
    /* AFTER23 ADVICE */
    
-   public Object after23(@JoinPoint Object joinPointInfo,
+   public Object after23(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Arg Object arg2)
    {
       after23 = "Object,Object,SuperClass,Object";
       return null;
    }
 
-   public Object after23(@JoinPoint MethodInfo joinPointInfo,
+   public Object after23(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after23 = "Object,MethodInfo,SuperClass,Object[]";
+      after23 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after23(@JoinPoint MethodInfo joinPointInfo,
+   public Object after23(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after23 = "Object,MethodInfo,Object,Object[]";
+      after23 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after23(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after23(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after23 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after23 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after23(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after23(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after23 = "Object,JoinPointInfo,Object,Object[]";
+      after23 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after23(@JoinPoint Object joinPointInfo,
+   public Object after23(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after23 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after23(@JoinPoint Object joinPointInfo,
+   public Object after23(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after23 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after23(@JoinPoint MethodInfo joinPointInfo,
+   public Object after23(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after23 = "Object,MethodInfo,SuperClass";
+      after23 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after23(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after23(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after23 = "Object,MethodInfo,float,SubValue";
+      after23 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after23(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after23(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after23 = "Object,MethodInfo,float,SuperValue";
+      after23 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after23(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after23(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after23 = "Object,MethodInfo,float,Object";
+      after23 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after23(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after23(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after23 = "Object,JoinPointInfo,float,SubValue";
+      after23 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after23(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after23(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after23 = "SuperClass,MethodInfo,SubValue";
+      after23 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after23(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after23(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after23 = "Object,MethodInfo,float";
+      after23 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after23(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after23(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after23 = "Object,MethodInfo,SuperValue";
+      after23 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after23(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after23(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after23 = "SubClass,MethodInfo,Object[]";
+      after23 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after23(@JoinPoint MethodInfo joinPointInfo)
+   public Object after23(@JoinPoint MethodExecution joinPoint)
    {
-      after23 = "Object,MethodInfo";
+      after23 = "Object,MethodExecution";
       return null;
    }
         
@@ -5920,7 +5920,7 @@
 
    public SuperClass after23(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after23 = "SuperClass,MethodInfo,SuperClass,float";
+      after23 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -5986,110 +5986,110 @@
    
    /* AFTER24 ADVICE */
    
-   public Object after24(@JoinPoint MethodInfo joinPointInfo,
+   public Object after24(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after24 = "Object,MethodInfo,SuperClass,Object[]";
+      after24 = "Object,MethodExecution,SuperClass,Object[]";
       return null;
    }
    
-   public Object after24(@JoinPoint MethodInfo joinPointInfo,
+   public Object after24(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after24 = "Object,MethodInfo,Object,Object[]";
+      after24 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after24(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after24(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after24 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after24 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after24(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after24(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after24 = "Object,JoinPointInfo,Object,Object[]";
+      after24 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after24(@JoinPoint Object joinPointInfo,
+   public Object after24(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after24 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after24(@JoinPoint Object joinPointInfo,
+   public Object after24(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after24 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after24(@JoinPoint MethodInfo joinPointInfo,
+   public Object after24(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after24 = "Object,MethodInfo,SuperClass";
+      after24 = "Object,MethodExecution,SuperClass";
       return null;
    }
 
-   public Object after24(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after24(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after24 = "Object,MethodInfo,float,SubValue";
+      after24 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after24(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after24(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after24 = "Object,MethodInfo,float,SuperValue";
+      after24 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after24(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after24(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after24 = "Object,MethodInfo,float,Object";
+      after24 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after24(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after24(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after24 = "Object,JoinPointInfo,float,SubValue";
+      after24 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after24(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after24(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after24 = "SuperClass,MethodInfo,SubValue";
+      after24 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after24(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after24(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after24 = "Object,MethodInfo,float";
+      after24 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after24(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after24(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after24 = "Object,MethodInfo,SuperValue";
+      after24 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after24(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after24(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after24 = "SubClass,MethodInfo,Object[]";
+      after24 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after24(@JoinPoint MethodInfo joinPointInfo)
+   public Object after24(@JoinPoint MethodExecution joinPoint)
    {
-      after24 = "Object,MethodInfo";
+      after24 = "Object,MethodExecution";
       return null;
    }
         
@@ -6116,7 +6116,7 @@
 
    public SuperClass after24(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after24 = "SuperClass,MethodInfo,SuperClass,float";
+      after24 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -6182,103 +6182,103 @@
    
    /* AFTER25 ADVICE */
 
-   public Object after25(@JoinPoint MethodInfo joinPointInfo,
+   public Object after25(@JoinPoint MethodExecution joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after25 = "Object,MethodInfo,Object,Object[]";
+      after25 = "Object,MethodExecution,Object,Object[]";
       return null;
    }
    
-   public Object after25(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after25(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after25 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after25 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after25(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after25(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after25 = "Object,JoinPointInfo,Object,Object[]";
+      after25 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after25(@JoinPoint Object joinPointInfo,
+   public Object after25(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after25 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after25(@JoinPoint Object joinPointInfo,
+   public Object after25(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after25 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after25(@JoinPoint MethodInfo joinPointInfo,
+   public Object after25(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after25 = "Object,MethodInfo,SuperClass";
+      after25 = "Object,MethodExecution,SuperClass";
       return null;
    }
    
-   public Object after25(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after25(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after25 = "Object,MethodInfo,float,SubValue";
+      after25 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after25(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after25(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after25 = "Object,MethodInfo,float,SuperValue";
+      after25 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after25(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after25(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after25 = "Object,MethodInfo,float,Object";
+      after25 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after25(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after25(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after25 = "Object,JoinPointInfo,float,SubValue";
+      after25 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after25(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after25(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after25 = "SuperClass,MethodInfo,SubValue";
+      after25 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after25(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after25(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after25 = "Object,MethodInfo,float";
+      after25 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after25(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after25(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after25 = "Object,MethodInfo,SuperValue";
+      after25 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after25(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after25(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after25 = "SubClass,MethodInfo,Object[]";
+      after25 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after25(@JoinPoint MethodInfo joinPointInfo)
+   public Object after25(@JoinPoint MethodExecution joinPoint)
    {
-      after25 = "Object,MethodInfo";
+      after25 = "Object,MethodExecution";
       return null;
    }
         
@@ -6305,7 +6305,7 @@
 
    public SuperClass after25(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after25 = "SuperClass,MethodInfo,SuperClass,float";
+      after25 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -6371,96 +6371,96 @@
    
    /* AFTER26 ADVICE */
    
-   public Object after26(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after26(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
-      after26 = "Object,JoinPointInfo,SuperClass,Object[]";
+      after26 = "Object,JoinPointBean,SuperClass,Object[]";
       return null;
    }
    
-   public Object after26(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after26(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after26 = "Object,JoinPointInfo,Object,Object[]";
+      after26 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after26(@JoinPoint Object joinPointInfo,
+   public Object after26(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after26 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after26(@JoinPoint Object joinPointInfo,
+   public Object after26(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after26 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after26(@JoinPoint MethodInfo joinPointInfo,
+   public Object after26(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after26 = "Object,MethodInfo,SuperClass";
+      after26 = "Object,MethodExecution,SuperClass";
       return null;
    }
    
-   public Object after26(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after26(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after26 = "Object,MethodInfo,float,SubValue";
+      after26 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after26(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after26(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after26 = "Object,MethodInfo,float,SuperValue";
+      after26 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after26(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after26(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after26 = "Object,MethodInfo,float,Object";
+      after26 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after26(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after26(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after26 = "Object,JoinPointInfo,float,SubValue";
+      after26 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after26(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after26(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after26 = "SuperClass,MethodInfo,SubValue";
+      after26 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after26(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after26(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after26 = "Object,MethodInfo,float";
+      after26 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after26(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after26(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after26 = "Object,MethodInfo,SuperValue";
+      after26 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after26(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after26(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after26 = "SubClass,MethodInfo,Object[]";
+      after26 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after26(@JoinPoint MethodInfo joinPointInfo)
+   public Object after26(@JoinPoint MethodExecution joinPoint)
    {
-      after26 = "Object,MethodInfo";
+      after26 = "Object,MethodExecution";
       return null;
    }
         
@@ -6487,7 +6487,7 @@
 
    public SuperClass after26(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after26 = "SuperClass,MethodInfo,SuperClass,float";
+      after26 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -6553,89 +6553,89 @@
    
    /* AFTER27 ADVICE */
    
-   public Object after27(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after27(@JoinPoint JoinPointBean joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
-      after27 = "Object,JoinPointInfo,Object,Object[]";
+      after27 = "Object,JoinPointBean,Object,Object[]";
       return null;
    }
    
-   public Object after27(@JoinPoint Object joinPointInfo,
+   public Object after27(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after27 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after27(@JoinPoint Object joinPointInfo,
+   public Object after27(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after27 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after27(@JoinPoint MethodInfo joinPointInfo,
+   public Object after27(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after27 = "Object,MethodInfo,SuperClass";
+      after27 = "Object,MethodExecution,SuperClass";
       return null;
    }
    
-   public Object after27(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after27(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after27 = "Object,MethodInfo,float,SubValue";
+      after27 = "Object,MethodExecution,float,SubValue";
       return null;
    }
 
-   public Object after27(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after27(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after27 = "Object,MethodInfo,float,SuperValue";
+      after27 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after27(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after27(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after27 = "Object,MethodInfo,float,Object";
+      after27 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after27(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after27(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after27 = "Object,JoinPointInfo,float,SubValue";
+      after27 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after27(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after27(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after27 = "SuperClass,MethodInfo,SubValue";
+      after27 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after27(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after27(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after27 = "Object,MethodInfo,float";
+      after27 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after27(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after27(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after27 = "Object,MethodInfo,SuperValue";
+      after27 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after27(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after27(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after27 = "SubClass,MethodInfo,Object[]";
+      after27 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after27(@JoinPoint MethodInfo joinPointInfo)
+   public Object after27(@JoinPoint MethodExecution joinPoint)
    {
-      after27 = "Object,MethodInfo";
+      after27 = "Object,MethodExecution";
       return null;
    }
         
@@ -6662,7 +6662,7 @@
 
    public SuperClass after27(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after27 = "SuperClass,MethodInfo,SuperClass,float";
+      after27 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -6728,82 +6728,82 @@
    
    /* AFTER28 ADVICE */
    
-   public Object after28(@JoinPoint Object joinPointInfo,
+   public Object after28(@JoinPoint Object joinPoint,
          @Return SuperClass valueReturned, @Args Object[] args)
    {
       after28 = "Object,Object,SuperClass,Object[]";
       return null;
    }
    
-   public Object after28(@JoinPoint Object joinPointInfo,
+   public Object after28(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after28 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after28(@JoinPoint MethodInfo joinPointInfo,
+   public Object after28(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after28 = "Object,MethodInfo,SuperClass";
+      after28 = "Object,MethodExecution,SuperClass";
       return null;
    }
    
-   public Object after28(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after28(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after28 = "Object,MethodInfo,float,SubValue";
+      after28 = "Object,MethodExecution,float,SubValue";
       return null;
    }
    
-   public Object after28(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after28(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after28 = "Object,MethodInfo,float,SuperValue";
+      after28 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after28(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after28(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after28 = "Object,MethodInfo,float,Object";
+      after28 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after28(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after28(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after28 = "Object,JoinPointInfo,float,SubValue";
+      after28 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
    
-   public SuperClass after28(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after28(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after28 = "SuperClass,MethodInfo,SubValue";
+      after28 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after28(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after28(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after28 = "Object,MethodInfo,float";
+      after28 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after28(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after28(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after28 = "Object,MethodInfo,SuperValue";
+      after28 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after28(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after28(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after28 = "SubClass,MethodInfo,Object[]";
+      after28 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after28(@JoinPoint MethodInfo joinPointInfo)
+   public Object after28(@JoinPoint MethodExecution joinPoint)
    {
-      after28 = "Object,MethodInfo";
+      after28 = "Object,MethodExecution";
       return null;
    }
         
@@ -6830,7 +6830,7 @@
 
    public SuperClass after28(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after28 = "SuperClass,MethodInfo,SuperClass,float";
+      after28 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -6896,75 +6896,75 @@
    
    /* AFTER29 ADVICE */
    
-   public Object after29(@JoinPoint Object joinPointInfo,
+   public Object after29(@JoinPoint Object joinPoint,
          @Return Object valueReturned, @Args Object[] args)
    {
       after29 = "Object,Object,Object,Object[]";
       return null;
    }
    
-   public Object after29(@JoinPoint MethodInfo joinPointInfo,
+   public Object after29(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after29 = "Object,MethodInfo,SuperClass";
+      after29 = "Object,MethodExecution,SuperClass";
       return null;
    }
    
-   public Object after29(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after29(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after29 = "Object,MethodInfo,float,SubValue";
+      after29 = "Object,MethodExecution,float,SubValue";
       return null;
    }
    
-   public Object after29(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after29(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after29 = "Object,MethodInfo,float,SuperValue";
+      after29 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after29(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after29(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after29 = "Object,MethodInfo,float,Object";
+      after29 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after29(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after29(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after29 = "Object,JoinPointInfo,float,SubValue";
+      after29 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after29(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after29(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after29 = "SuperClass,MethodInfo,SubValue";
+      after29 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after29(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after29(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after29 = "Object,MethodInfo,float";
+      after29 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after29(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after29(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after29 = "Object,MethodInfo,SuperValue";
+      after29 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SubClass after29(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after29(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after29 = "SubClass,MethodInfo,Object[]";
+      after29 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public Object after29(@JoinPoint MethodInfo joinPointInfo)
+   public Object after29(@JoinPoint MethodExecution joinPoint)
    {
-      after29 = "Object,MethodInfo";
+      after29 = "Object,MethodExecution";
       return null;
    }
         
@@ -6991,7 +6991,7 @@
 
    public SuperClass after29(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after29 = "SuperClass,MethodInfo,SuperClass,float";
+      after29 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -7057,105 +7057,105 @@
    
    /* AFTER30 ADVICE */
    
-   public Object after30(@JoinPoint MethodInfo joinPointInfo,
+   public Object after30(@JoinPoint MethodExecution joinPoint,
          @Return SuperClass valueReturned)
    {
-      after30 = "Object,MethodInfo,SuperClass";
+      after30 = "Object,MethodExecution,SuperClass";
       return null;
    }
    
-   public Object after30(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned)
+   public Object after30(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned)
    {
-      after30 = "Object,MethodInfo,Object";
+      after30 = "Object,MethodExecution,Object";
       return null;
    }
    
-   public Object after30(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after30(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned)
    {
-      after30 = "Object,JoinPointInfo,SuperClass";
+      after30 = "Object,JoinPointBean,SuperClass";
       return null;
    }
    
-   public Object after30(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after30(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after30 = "Object,MethodInfo,float,SubValue";
+      after30 = "Object,MethodExecution,float,SubValue";
       return null;
    }
    
-   public Object after30(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after30(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after30 = "Object,MethodInfo,float,SuperValue";
+      after30 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after30(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after30(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after30 = "Object,MethodInfo,float,Object";
+      after30 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after30(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after30(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after30 = "Object,JoinPointInfo,float,SubValue";
+      after30 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
 
-   public SuperClass after30(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after30(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after30 = "SuperClass,MethodInfo,SubValue";
+      after30 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after30(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after30(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after30 = "Object,MethodInfo,float";
+      after30 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after30(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after30(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after30 = "Object,MethodInfo,SuperValue";
+      after30 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SuperClass after30(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after30(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after30 = "SuperClass,JoinPointInfo,SubValue";
+      after30 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after30(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after30(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after30 = "SubClass,JoinPointInfo,float";
+      after30 = "SubClass,JoinPointBean,float";
       return null;
    }
 
-   public SuperClass after30(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after30(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after30 = "SubClass,JoinPointInfo,SuperValue";
+      after30 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after30(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after30(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after30 = "SubClass,MethodInfo,Object[]";
+      after30 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after30(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after30(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after30 = "SubClass,JoinPointInfo,Object[]";
+      after30 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after30(@JoinPoint MethodInfo joinPointInfo)
+   public Object after30(@JoinPoint MethodExecution joinPoint)
    {
-      after30 = "Object,MethodInfo";
+      after30 = "Object,MethodExecution";
       return null;
    }
    
@@ -7182,7 +7182,7 @@
 
    public SuperClass after30(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after30 = "SuperClass,MethodInfo,SuperClass,float";
+      after30 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -7248,98 +7248,98 @@
    
    /* AFTER31 ADVICE */
    
-   public Object after31(@JoinPoint MethodInfo joinPointInfo, @Return Object valueReturned)
+   public Object after31(@JoinPoint MethodExecution joinPoint, @Return Object valueReturned)
    {
-      after31 = "Object,MethodInfo,Object";
+      after31 = "Object,MethodExecution,Object";
       return null;
    }
    
-   public Object after31(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after31(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned)
    {
-      after31 = "Object,JoinPointInfo,SuperClass";
+      after31 = "Object,JoinPointBean,SuperClass";
       return null;
    }
    
-   public Object after31(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after31(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after31 = "Object,MethodInfo,float,SubValue";
+      after31 = "Object,MethodExecution,float,SubValue";
       return null;
    }
    
-   public Object after31(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after31(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after31 = "Object,MethodInfo,float,SuperValue";
+      after31 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after31(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after31(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after31 = "Object,MethodInfo,float,Object";
+      after31 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after31(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after31(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after31 = "Object,JoinPointInfo,float,SubValue";
+      after31 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
    
-   public SuperClass after31(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after31(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after31 = "SuperClass,MethodInfo,SubValue";
+      after31 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after31(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after31(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after31 = "Object,MethodInfo,float";
+      after31 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after31(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after31(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after31 = "Object,MethodInfo,SuperValue";
+      after31 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SuperClass after31(@JoinPoint JoinPointInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after31(@JoinPoint JoinPointBean joinPoint, @Arg SubValue arg2)
    {
-      after31 = "SuperClass,JoinPointInfo,SubValue";
+      after31 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after31(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after31(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after31 = "SubClass,JoinPointInfo,float";
+      after31 = "SubClass,JoinPointBean,float";
       return null;
    }
 
-   public SuperClass after31(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after31(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after31 = "SubClass,JoinPointInfo,SuperValue";
+      after31 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after31(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after31(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after31 = "SubClass,MethodInfo,Object[]";
+      after31 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after31(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after31(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after31 = "SubClass,JoinPointInfo,Object[]";
+      after31 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after31(@JoinPoint MethodInfo joinPointInfo)
+   public Object after31(@JoinPoint MethodExecution joinPoint)
    {
-      after31 = "Object,MethodInfo";
+      after31 = "Object,MethodExecution";
       return null;
    }
         
@@ -7366,7 +7366,7 @@
 
    public SuperClass after31(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after31 = "SuperClass,MethodInfo,SuperClass,float";
+      after31 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -7432,92 +7432,92 @@
    
    /* AFTER32 ADVICE */
 
-   public Object after32(@JoinPoint JoinPointInfo joinPointInfo,
+   public Object after32(@JoinPoint JoinPointBean joinPoint,
          @Return SuperClass valueReturned)
    {
-      after32 = "Object,JoinPointInfo,SuperClass";
+      after32 = "Object,JoinPointBean,SuperClass";
       return null;
    }
    
-   public Object after32(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after32(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after32 = "Object,MethodInfo,float,SubValue";
+      after32 = "Object,MethodExecution,float,SubValue";
       return null;
    }
    
-   public Object after32(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after32(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after32 = "Object,MethodInfo,float,SuperValue";
+      after32 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after32(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after32(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after32 = "Object,MethodInfo,float,Object";
+      after32 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after32(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after32(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after32 = "Object,JoinPointInfo,float,SubValue";
+      after32 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
    
-   public SuperClass after32(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after32(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after32 = "SuperClass,MethodInfo,SubValue";
+      after32 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after32(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after32(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after32 = "Object,MethodInfo,float";
+      after32 = "Object,MethodExecution,float";
       return null;
    }
 
-   public Object after32(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after32(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after32 = "Object,MethodInfo,SuperValue";
+      after32 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SuperClass after32(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after32(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after32 = "SuperClass,JoinPointInfo,SubValue";
+      after32 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after32(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after32(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after32 = "SubClass,JoinPointInfo,float";
+      after32 = "SubClass,JoinPointBean,float";
       return null;
    }
 
-   public SuperClass after32(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after32(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after32 = "SubClass,JoinPointInfo,SuperValue";
+      after32 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after32(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after32(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after32 = "SubClass,MethodInfo,Object[]";
+      after32 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after32(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after32(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after32 = "SubClass,JoinPointInfo,Object[]";
+      after32 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after32(@JoinPoint MethodInfo joinPointInfo)
+   public Object after32(@JoinPoint MethodExecution joinPoint)
    {
-      after32 = "Object,MethodInfo";
+      after32 = "Object,MethodExecution";
       return null;
    }
         
@@ -7544,7 +7544,7 @@
 
    public SuperClass after32(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after32 = "SuperClass,MethodInfo,SuperClass,float";
+      after32 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -7610,85 +7610,85 @@
    
    /* AFTER33 ADVICE */
 
-   public Object after33(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after33(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after33 = "Object,MethodInfo,float,SubValue";
+      after33 = "Object,MethodExecution,float,SubValue";
       return null;
    }
    
-   public Object after33(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after33(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after33 = "Object,MethodInfo,float,SuperValue";
+      after33 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after33(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after33(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after33 = "Object,MethodInfo,float,Object";
+      after33 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after33(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after33(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after33 = "Object,JoinPointInfo,float,SubValue";
+      after33 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
    
-   public SuperClass after33(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after33(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after33 = "SuperClass,MethodInfo,SubValue";
+      after33 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after33(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after33(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after33 = "Object,MethodInfo,float";
+      after33 = "Object,MethodExecution,float";
       return null;
    }
    
-   public Object after33(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after33(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after33 = "Object,MethodInfo,SuperValue";
+      after33 = "Object,MethodExecution,SuperValue";
       return null;
    }
       
-   public SuperClass after33(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after33(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after33 = "SuperClass,JoinPointInfo,SubValue";
+      after33 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after33(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after33(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after33 = "SubClass,JoinPointInfo,float";
+      after33 = "SubClass,JoinPointBean,float";
       return null;
    }
 
-   public SuperClass after33(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after33(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after33 = "SubClass,JoinPointInfo,SuperValue";
+      after33 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after33(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after33(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after33 = "SubClass,MethodInfo,Object[]";
+      after33 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after33(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after33(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after33 = "SubClass,JoinPointInfo,Object[]";
+      after33 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after33(@JoinPoint MethodInfo joinPointInfo)
+   public Object after33(@JoinPoint MethodExecution joinPoint)
    {
-      after33 = "Object,MethodInfo";
+      after33 = "Object,MethodExecution";
       return null;
    }
         
@@ -7715,7 +7715,7 @@
 
    public SuperClass after33(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after33 = "SuperClass,MethodInfo,SuperClass,float";
+      after33 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -7781,78 +7781,78 @@
    
    /* AFTER34 ADVICE */
    
-   public Object after34(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after34(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg SuperValue arg2)
    {
-      after34 = "Object,MethodInfo,float,SuperValue";
+      after34 = "Object,MethodExecution,float,SuperValue";
       return null;
    }
    
-   public Object after34(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after34(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after34 = "Object,MethodInfo,float,Object";
+      after34 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after34(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after34(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after34 = "Object,JoinPointInfo,float,SubValue";
+      after34 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
    
-   public SuperClass after34(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after34(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after34 = "SuperClass,MethodInfo,SubValue";
+      after34 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after34(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after34(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after34 = "Object,MethodInfo,float";
+      after34 = "Object,MethodExecution,float";
       return null;
    }
    
-   public Object after34(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after34(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after34 = "Object,MethodInfo,SuperValue";
+      after34 = "Object,MethodExecution,SuperValue";
       return null;
    }
    
-   public SuperClass after34(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after34(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after34 = "SuperClass,JoinPointInfo,SubValue";
+      after34 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after34(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after34(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after34 = "SubClass,JoinPointInfo,float";
+      after34 = "SubClass,JoinPointBean,float";
       return null;
    }
 
-   public SuperClass after34(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after34(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after34 = "SubClass,JoinPointInfo,SuperValue";
+      after34 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after34(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after34(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after34 = "SubClass,MethodInfo,Object[]";
+      after34 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after34(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after34(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after34 = "SubClass,JoinPointInfo,Object[]";
+      after34 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after34(@JoinPoint MethodInfo joinPointInfo)
+   public Object after34(@JoinPoint MethodExecution joinPoint)
    {
-      after34 = "Object,MethodInfo";
+      after34 = "Object,MethodExecution";
       return null;
    }
         
@@ -7879,7 +7879,7 @@
 
    public SuperClass after34(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after34 = "SuperClass,MethodInfo,SuperClass,float";
+      after34 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -7951,71 +7951,71 @@
    
    /* AFTER35 ADVICE */
    
-   public Object after35(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1,
+   public Object after35(@JoinPoint MethodExecution joinPoint, @Arg float arg1,
          @Arg Object arg2)
    {
-      after35 = "Object,MethodInfo,float,Object";
+      after35 = "Object,MethodExecution,float,Object";
       return null;
    }
    
-   public Object after35(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after35(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after35 = "Object,JoinPointInfo,float,SubValue";
+      after35 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
    
-   public SuperClass after35(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after35(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after35 = "SuperClass,MethodInfo,SubValue";
+      after35 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after35(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after35(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after35 = "Object,MethodInfo,float";
+      after35 = "Object,MethodExecution,float";
       return null;
    }
    
-   public Object after35(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after35(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after35 = "Object,MethodInfo,SuperValue";
+      after35 = "Object,MethodExecution,SuperValue";
       return null;
    }
    
-   public SuperClass after35(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after35(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after35 = "SuperClass,JoinPointInfo,SubValue";
+      after35 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after35(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after35(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after35 = "SubClass,JoinPointInfo,float";
+      after35 = "SubClass,JoinPointBean,float";
       return null;
    }
 
-   public SuperClass after35(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after35(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after35 = "SubClass,JoinPointInfo,SuperValue";
+      after35 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after35(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after35(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after35 = "SubClass,MethodInfo,Object[]";
+      after35 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after35(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after35(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after35 = "SubClass,JoinPointInfo,Object[]";
+      after35 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after35(@JoinPoint MethodInfo joinPointInfo)
+   public Object after35(@JoinPoint MethodExecution joinPoint)
    {
-      after35 = "Object,MethodInfo";
+      after35 = "Object,MethodExecution";
       return null;
    }
         
@@ -8042,7 +8042,7 @@
 
    public SuperClass after35(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after35 = "SuperClass,MethodInfo,SuperClass,float";
+      after35 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -8108,70 +8108,70 @@
    
    /* AFTER36 ADVICE */
    
-   public Object after36(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1,
+   public Object after36(@JoinPoint JoinPointBean joinPoint, @Arg float arg1,
          @Arg SubValue arg2)
    {
-      after36 = "Object,JoinPointInfo,float,SubValue";
+      after36 = "Object,JoinPointBean,float,SubValue";
       return null;
    }
    
-   public SuperClass after36(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after36(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after36 = "SuperClass,MethodInfo,SubValue";
+      after36 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after36(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after36(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after36 = "Object,MethodInfo,float";
+      after36 = "Object,MethodExecution,float";
       return null;
    }
    
-   public Object after36(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after36(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after36 = "Object,MethodInfo,SuperValue";
+      after36 = "Object,MethodExecution,SuperValue";
       return null;
    }
    
-   public SuperClass after36(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after36(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after36 = "SuperClass,JoinPointInfo,SubValue";
+      after36 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after36(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after36(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after36 = "SubClass,JoinPointInfo,float";
+      after36 = "SubClass,JoinPointBean,float";
       return null;
    }
    
-   public SuperClass after36(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after36(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after36 = "SubClass,JoinPointInfo,SuperValue";
+      after36 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after36(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after36(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after36 = "SubClass,MethodInfo,Object[]";
+      after36 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after36(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after36(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after36 = "SubClass,JoinPointInfo,Object[]";
+      after36 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after36(@JoinPoint MethodInfo joinPointInfo)
+   public Object after36(@JoinPoint MethodExecution joinPoint)
    {
-      after36 = "Object,MethodInfo";
+      after36 = "Object,MethodExecution";
       return null;
    }
         
    public SuperClass after36(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after36 = "SuperClass,MethodInfo,SuperClass,float";
+      after36 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -8237,75 +8237,75 @@
    
    /* AFTER37 ADVICE */
    
-   public SuperClass after37(@JoinPoint MethodInfo joinPointInfo, @Arg SubValue arg2)
+   public SuperClass after37(@JoinPoint MethodExecution joinPoint, @Arg SubValue arg2)
    {
-      after37 = "SuperClass,MethodInfo,SubValue";
+      after37 = "SuperClass,MethodExecution,SubValue";
       return null;
    }
    
-   public Object after37(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after37(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after37 = "Object,MethodInfo,float";
+      after37 = "Object,MethodExecution,float";
       return null;
    }
    
-   public Object after37(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after37(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after37 = "Object,MethodInfo,SuperValue";
+      after37 = "Object,MethodExecution,SuperValue";
       return null;
    }
    
-   public SuperClass after37(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after37(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after37 = "SuperClass,JoinPointInfo,SubValue";
+      after37 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after37(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after37(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after37 = "SubClass,JoinPointInfo,float";
+      after37 = "SubClass,JoinPointBean,float";
       return null;
    }
    
-   public SuperClass after37(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after37(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after37 = "SubClass,JoinPointInfo,SuperValue";
+      after37 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after37(@JoinPoint Object joinPointInfo, @Arg SubValue arg2)
+   public SubClass after37(@JoinPoint Object joinPoint, @Arg SubValue arg2)
    {
       after37 = "SubClass,Object,SubValue";
       return null;
    }
    
-   public Object after37(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after37(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after37 = "Object,Object,float";
       return null;
    }
 
-   public SubClass after37(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after37(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after37 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after37(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after37(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after37 = "SubClass,MethodInfo,Object[]";
+      after37 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after37(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after37(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after37 = "SubClass,JoinPointInfo,Object[]";
+      after37 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after37(@JoinPoint MethodInfo joinPointInfo)
+   public Object after37(@JoinPoint MethodExecution joinPoint)
    {
-      after37 = "Object,MethodInfo";
+      after37 = "Object,MethodExecution";
       return null;
    }
         
@@ -8332,7 +8332,7 @@
 
    public SuperClass after37(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after37 = "SuperClass,MethodInfo,SuperClass,float";
+      after37 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -8410,69 +8410,69 @@
    
    /* AFTER38 ADVICE */
    
-   public Object after38(@JoinPoint MethodInfo joinPointInfo, @Arg float arg1)
+   public Object after38(@JoinPoint MethodExecution joinPoint, @Arg float arg1)
    {
-      after38 = "Object,MethodInfo,float";
+      after38 = "Object,MethodExecution,float";
       return null;
    }
    
-   public Object after38(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after38(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after38 = "Object,MethodInfo,SuperValue";
+      after38 = "Object,MethodExecution,SuperValue";
       return null;
    }
    
-   public SuperClass after38(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after38(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after38 = "SuperClass,JoinPointInfo,SubValue";
+      after38 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after38(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after38(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after38 = "SubClass,JoinPointInfo,float";
+      after38 = "SubClass,JoinPointBean,float";
       return null;
    }
    
-   public SuperClass after38(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after38(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after38 = "SubClass,JoinPointInfo,SuperValue";
+      after38 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after38(@JoinPoint Object joinPointInfo, @Arg SubValue arg2)
+   public SubClass after38(@JoinPoint Object joinPoint, @Arg SubValue arg2)
    {
       after38 = "SubClass,Object,SubValue";
       return null;
    }
    
-   public Object after38(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after38(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after38 = "Object,Object,float";
       return null;
    }
    
-   public SubClass after38(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after38(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after38 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after38(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after38(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after38 = "SubClass,MethodInfo,Object[]";
+      after38 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after38(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after38(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after38 = "SubClass,JoinPointInfo,Object[]";
+      after38 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after38(@JoinPoint MethodInfo joinPointInfo)
+   public Object after38(@JoinPoint MethodExecution joinPoint)
    {
-      after38 = "Object,MethodInfo";
+      after38 = "Object,MethodExecution";
       return null;
    }
         
@@ -8499,7 +8499,7 @@
 
    public SuperClass after38(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after38 = "SuperClass,MethodInfo,SuperClass,float";
+      after38 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -8577,63 +8577,63 @@
    
    /* AFTER39 ADVICE */
    
-   public Object after39(@JoinPoint MethodInfo joinPointInfo, @Arg SuperValue arg2)
+   public Object after39(@JoinPoint MethodExecution joinPoint, @Arg SuperValue arg2)
    {
-      after39 = "Object,MethodInfo,SuperValue";
+      after39 = "Object,MethodExecution,SuperValue";
       return null;
    }
    
-   public SuperClass after39(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after39(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after39 = "SuperClass,JoinPointInfo,SubValue";
+      after39 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after39(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after39(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after39 = "SubClass,JoinPointInfo,float";
+      after39 = "SubClass,JoinPointBean,float";
       return null;
    }
    
-   public SuperClass after39(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after39(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after39 = "SubClass,JoinPointInfo,SuperValue";
+      after39 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after39(@JoinPoint Object joinPointInfo, @Arg SubValue arg2)
+   public SubClass after39(@JoinPoint Object joinPoint, @Arg SubValue arg2)
    {
       after39 = "SubClass,Object,SubValue";
       return null;
    }
    
-   public Object after39(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after39(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after39 = "Object,Object,float";
       return null;
    }
    
-   public SubClass after39(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after39(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after39 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after39(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after39(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after39 = "SubClass,MethodInfo,Object[]";
+      after39 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after39(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after39(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after39 = "SubClass,JoinPointInfo,Object[]";
+      after39 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after39(@JoinPoint MethodInfo joinPointInfo)
+   public Object after39(@JoinPoint MethodExecution joinPoint)
    {
-      after39 = "Object,MethodInfo";
+      after39 = "Object,MethodExecution";
       return null;
    }
    
@@ -8660,7 +8660,7 @@
 
    public SuperClass after39(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after39 = "SuperClass,MethodInfo,SuperClass,float";
+      after39 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -8738,57 +8738,57 @@
    
    /* AFTER40 ADVICE */
 
-   public SuperClass after40(@JoinPoint JoinPointInfo joinPointInfo, at Arg SubValue arg2)
+   public SuperClass after40(@JoinPoint JoinPointBean joinPoint, at Arg SubValue arg2)
    {
-      after40 = "SuperClass,JoinPointInfo,SubValue";
+      after40 = "SuperClass,JoinPointBean,SubValue";
       return null;
    }
    
-   public SubClass after40(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after40(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after40 = "SubClass,JoinPointInfo,float";
+      after40 = "SubClass,JoinPointBean,float";
       return null;
    }
    
-   public SuperClass after40(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after40(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after40 = "SubClass,JoinPointInfo,SuperValue";
+      after40 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after40(@JoinPoint Object joinPointInfo, @Arg SubValue arg2)
+   public SubClass after40(@JoinPoint Object joinPoint, @Arg SubValue arg2)
    {
       after40 = "SubClass,Object,SubValue";
       return null;
    }
    
-   public Object after40(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after40(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after40 = "Object,Object,float";
       return null;
    }
    
-   public SubClass after40(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after40(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after40 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after40(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after40(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after40 = "SubClass,MethodInfo,Object[]";
+      after40 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after40(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after40(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after40 = "SubClass,JoinPointInfo,Object[]";
+      after40 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after40(@JoinPoint MethodInfo joinPointInfo)
+   public Object after40(@JoinPoint MethodExecution joinPoint)
    {
-      after40 = "Object,MethodInfo";
+      after40 = "Object,MethodExecution";
       return null;
    }
         
@@ -8815,7 +8815,7 @@
 
    public SuperClass after40(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after40 = "SuperClass,MethodInfo,SuperClass,float";
+      after40 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -8893,51 +8893,51 @@
    
    /* AFTER41 ADVICE */
 
-   public SubClass after41(@JoinPoint JoinPointInfo joinPointInfo, @Arg float arg1)
+   public SubClass after41(@JoinPoint JoinPointBean joinPoint, @Arg float arg1)
    {
-      after41 = "SubClass,JoinPointInfo,float";
+      after41 = "SubClass,JoinPointBean,float";
       return null;
    }
    
-   public SuperClass after41(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after41(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after41 = "SubClass,JoinPointInfo,SuperValue";
+      after41 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after41(@JoinPoint Object joinPointInfo, @Arg SubValue arg2)
+   public SubClass after41(@JoinPoint Object joinPoint, @Arg SubValue arg2)
    {
       after41 = "SubClass,Object,SubValue";
       return null;
    }
    
-   public Object after41(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after41(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after41 = "Object,Object,float";
       return null;
    }
    
-   public SubClass after41(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after41(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after41 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after41(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after41(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after41 = "SubClass,MethodInfo,Object[]";
+      after41 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after41(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after41(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after41 = "SubClass,JoinPointInfo,Object[]";
+      after41 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after41(@JoinPoint MethodInfo joinPointInfo)
+   public Object after41(@JoinPoint MethodExecution joinPoint)
    {
-      after41 = "Object,MethodInfo";
+      after41 = "Object,MethodExecution";
       return null;
    }
    
@@ -8964,7 +8964,7 @@
 
    public SuperClass after41(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after41 = "SuperClass,MethodInfo,SuperClass,float";
+      after41 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -9042,45 +9042,45 @@
    
    /* AFTER42 ADVICE */
    
-   public SuperClass after42(@JoinPoint JoinPointInfo joinPointInfo, @Arg SuperValue arg2)
+   public SuperClass after42(@JoinPoint JoinPointBean joinPoint, @Arg SuperValue arg2)
    {
-      after42 = "SubClass,JoinPointInfo,SuperValue";
+      after42 = "SubClass,JoinPointBean,SuperValue";
       return null;
    }
    
-   public SubClass after42(@JoinPoint Object joinPointInfo, @Arg SubValue arg2)
+   public SubClass after42(@JoinPoint Object joinPoint, @Arg SubValue arg2)
    {
       after42 = "SubClass,Object,SubValue";
       return null;
    }
    
-   public Object after42(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after42(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after42 = "Object,Object,float";
       return null;
    }
    
-   public SubClass after42(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after42(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after42 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after42(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after42(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after42 = "SubClass,MethodInfo,Object[]";
+      after42 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after42(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after42(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after42 = "SubClass,JoinPointInfo,Object[]";
+      after42 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after42(@JoinPoint MethodInfo joinPointInfo)
+   public Object after42(@JoinPoint MethodExecution joinPoint)
    {
-      after42 = "Object,MethodInfo";
+      after42 = "Object,MethodExecution";
       return null;
    }
    
@@ -9107,7 +9107,7 @@
 
    public SuperClass after42(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after42 = "SuperClass,MethodInfo,SuperClass,float";
+      after42 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -9185,39 +9185,39 @@
    
    /* AFTER43 ADVICE */
    
-   public SubClass after43(@JoinPoint Object joinPointInfo, @Arg SubValue arg2)
+   public SubClass after43(@JoinPoint Object joinPoint, @Arg SubValue arg2)
    {
       after43 = "SubClass,Object,SubValue";
       return null;
    }
    
-   public Object after43(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after43(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after43 = "Object,Object,float";
       return null;
    }
    
-   public SubClass after43(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after43(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after43 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after43(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after43(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after43 = "SubClass,MethodInfo,Object[]";
+      after43 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after43(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after43(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after43 = "SubClass,JoinPointInfo,Object[]";
+      after43 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after43(@JoinPoint MethodInfo joinPointInfo)
+   public Object after43(@JoinPoint MethodExecution joinPoint)
    {
-      after43 = "Object,MethodInfo";
+      after43 = "Object,MethodExecution";
       return null;
    }
    
@@ -9244,7 +9244,7 @@
 
    public SuperClass after43(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after43 = "SuperClass,MethodInfo,SuperClass,float";
+      after43 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -9322,33 +9322,33 @@
    
    /* AFTER44 ADVICE */
    
-   public Object after44(@JoinPoint Object joinPointInfo, @Arg float arg1)
+   public Object after44(@JoinPoint Object joinPoint, @Arg float arg1)
    {
       after44 = "Object,Object,float";
       return null;
    }
    
-   public SubClass after44(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after44(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after44 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after44(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after44(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after44 = "SubClass,MethodInfo,Object[]";
+      after44 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after44(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after44(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after44 = "SubClass,JoinPointInfo,Object[]";
+      after44 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after44(@JoinPoint MethodInfo joinPointInfo)
+   public Object after44(@JoinPoint MethodExecution joinPoint)
    {
-      after44 = "Object,MethodInfo";
+      after44 = "Object,MethodExecution";
       return null;
    }
    
@@ -9375,7 +9375,7 @@
 
    public SuperClass after44(@Return SuperClass valueReturned, @Arg float arg1)
    {
-      after44 = "SuperClass,MethodInfo,SuperClass,float";
+      after44 = "SuperClass,MethodExecution,SuperClass,float";
       return null;
    }
    
@@ -9453,27 +9453,27 @@
    
    /* AFTER45 ADVICE */
    
-   public SubClass after45(@JoinPoint Object joinPointInfo, @Arg SuperValue arg2)
+   public SubClass after45(@JoinPoint Object joinPoint, @Arg SuperValue arg2)
    {
       after45 = "SubClass,Object,SuperValue";
       return null;
    }
    
-   public SubClass after45(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after45(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after45 = "SubClass,MethodInfo,Object[]";
+      after45 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after45(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after45(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after45 = "SubClass,JoinPointInfo,Object[]";
+      after45 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after45(@JoinPoint MethodInfo joinPointInfo)
+   public Object after45(@JoinPoint MethodExecution joinPoint)
    {
-      after45 = "Object,MethodInfo";
+      after45 = "Object,MethodExecution";
       return null;
    }
    
@@ -9578,21 +9578,21 @@
    
    /* AFTER46 ADVICE */
    
-   public SubClass after46(@JoinPoint MethodInfo joinPointInfo, @Args Object[] args)
+   public SubClass after46(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      after46 = "SubClass,MethodInfo,Object[]";
+      after46 = "SubClass,MethodExecution,Object[]";
       return null;
    }
    
-   public SubClass after46(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after46(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after46 = "SubClass,JoinPointInfo,Object[]";
+      after46 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after46(@JoinPoint MethodInfo joinPointInfo)
+   public Object after46(@JoinPoint MethodExecution joinPoint)
    {
-      after46 = "Object,MethodInfo";
+      after46 = "Object,MethodExecution";
       return null;
    }
    
@@ -9697,15 +9697,15 @@
    
    /* AFTER47 ADVICE */
    
-   public SubClass after47(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public SubClass after47(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      after47 = "SubClass,JoinPointInfo,Object[]";
+      after47 = "SubClass,JoinPointBean,Object[]";
       return null;
    }
    
-   public Object after47(@JoinPoint MethodInfo joinPointInfo)
+   public Object after47(@JoinPoint MethodExecution joinPoint)
    {
-      after47 = "Object,MethodInfo";
+      after47 = "Object,MethodExecution";
       return null;
    }
    
@@ -9810,15 +9810,15 @@
    
    /* AFTER48 ADVICE */
    
-   public Object after48(@JoinPoint MethodInfo joinPointInfo)
+   public Object after48(@JoinPoint MethodExecution joinPoint)
    {
-      after48 = "Object,MethodInfo";
+      after48 = "Object,MethodExecution";
       return null;
    }
    
-   public Object after48(@JoinPoint JoinPointInfo joinPointInfo)
+   public Object after48(@JoinPoint JoinPointBean joinPoint)
    {
-      after48 = "Object,JoinPointInfo";
+      after48 = "Object,JoinPointBean";
       return null;
    }
    
@@ -9929,9 +9929,9 @@
    
    /* AFTER49 ADVICE */
    
-   public Object after49(@JoinPoint JoinPointInfo joinPointInfo)
+   public Object after49(@JoinPoint JoinPointBean joinPoint)
    {
-      after49 = "Object,JoinPointInfo";
+      after49 = "Object,JoinPointBean";
       return null;
    }
    

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterCallAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedAfterCallAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -21,13 +21,13 @@
  */
 package org.jboss.test.aop.beforeafterArgs;
 
-import org.jboss.aop.MethodByMethodInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;
 import org.jboss.aop.advice.annotation.Caller;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Return;
 import org.jboss.aop.advice.annotation.Target;
+import org.jboss.aop.joinpoint.MethodCallByMethod;
 
 /**
  * Aspect used on overloaded after advice tests (for Call and Target tests
@@ -144,158 +144,158 @@
 
    /* AFTER1 ADVICE */
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,int";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Object[]";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Arg int arg)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,int";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,long,int";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Args Object[] args)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Object[]";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Object[]";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,long";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,long";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after1 = "MethodByMethodInfo,long,int";
+      after1 = "MethodCallByMethod,long,int";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after1 = "MethodByMethodInfo,long,Object[]";
+      after1 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after1 = "MethodByMethodInfo,long";
+      after1 = "MethodCallByMethod,long";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after1(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after1 = "MethodByMethodInfo,int";
+      after1 = "MethodCallByMethod,int";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after1(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after1 = "MethodByMethodInfo,Object[]";
+      after1 = "MethodCallByMethod,Object[]";
    }
    
-   public void after1(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after1(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after1 = "MethodByMethodInfo";
+      after1 = "MethodCallByMethod";
    }
    
    public void after1(@Target OverloadedAdvicePOJO target,
@@ -496,150 +496,150 @@
    
    /* AFTER2 ADVICE */
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Object[]";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Arg int arg)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,int";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,long,int";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Args Object[] args)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Object[]";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Object[]";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,long";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,long";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after2 = "MethodByMethodInfo,long,int";
+      after2 = "MethodCallByMethod,long,int";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after2 = "MethodByMethodInfo,long,Object[]";
+      after2 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after2 = "MethodByMethodInfo,long";
+      after2 = "MethodCallByMethod,long";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after2(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after2 = "MethodByMethodInfo,int";
+      after2 = "MethodCallByMethod,int";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after2(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after2 = "MethodByMethodInfo,Object[]";
+      after2 = "MethodCallByMethod,Object[]";
    }
    
-   public void after2(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after2(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after2 = "MethodByMethodInfo";
+      after2 = "MethodCallByMethod";
    }
    
    public void after2(@Target OverloadedAdvicePOJO target,
@@ -840,142 +840,142 @@
    
    /* AFTER3 ADVICE */
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Arg int arg)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,int";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,long,int";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Args Object[] args)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Object[]";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Object[]";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,long";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,long";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after3 = "MethodByMethodInfo,long,int";
+      after3 = "MethodCallByMethod,long,int";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after3 = "MethodByMethodInfo,long,Object[]";
+      after3 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after3 = "MethodByMethodInfo,long";
+      after3 = "MethodCallByMethod,long";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after3(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after3 = "MethodByMethodInfo,int";
+      after3 = "MethodCallByMethod,int";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after3(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after3 = "MethodByMethodInfo,Object[]";
+      after3 = "MethodCallByMethod,Object[]";
    }
    
-   public void after3(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after3(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after3 = "MethodByMethodInfo";
+      after3 = "MethodCallByMethod";
    }
    
    public void after3(@Target OverloadedAdvicePOJO target,
@@ -1176,135 +1176,135 @@
    
    /* AFTER4 ADVICE */
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Arg int arg)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,int";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO,long,int";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Args Object[] args)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Object[]";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Object[]";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO,long";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO,long";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after4 = "MethodByMethodInfo,long,int";
+      after4 = "MethodCallByMethod,long,int";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after4 = "MethodByMethodInfo,long,Object[]";
+      after4 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after4 = "MethodByMethodInfo,long";
+      after4 = "MethodCallByMethod,long";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after4(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after4 = "MethodByMethodInfo,int";
+      after4 = "MethodCallByMethod,int";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after4(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after4 = "MethodByMethodInfo,Object[]";
+      after4 = "MethodCallByMethod,Object[]";
    }
    
-   public void after4(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after4(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after4 = "MethodByMethodInfo";
+      after4 = "MethodCallByMethod";
    }
    
    public void after4(@Target OverloadedAdvicePOJO target,
@@ -1505,121 +1505,121 @@
    
    /* AFTER5 ADVICE */
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Arg int arg)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,int";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJO,long,int";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Args Object[] args)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Object[]";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Object[]";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJO,long";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJO,long";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after5 = "MethodByMethodInfo,long,int";
+      after5 = "MethodCallByMethod,long,int";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after5 = "MethodByMethodInfo,long,Object[]";
+      after5 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after5 = "MethodByMethodInfo,long";
+      after5 = "MethodCallByMethod,long";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after5(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after5 = "MethodByMethodInfo,int";
+      after5 = "MethodCallByMethod,int";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after5(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after5 = "MethodByMethodInfo,Object[]";
+      after5 = "MethodCallByMethod,Object[]";
    }
    
-   public void after5(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after5(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after5 = "MethodByMethodInfo";
+      after5 = "MethodCallByMethod";
    }
    
    public void after5(@Target OverloadedAdvicePOJO target,
@@ -1820,114 +1820,114 @@
    
    /* AFTER6 ADVICE */
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Arg int arg)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,int";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJO,long,int";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Args Object[] args)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Object[]";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Object[]";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJO,long";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJO,long";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after6 = "MethodByMethodInfo,long,int";
+      after6 = "MethodCallByMethod,long,int";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after6 = "MethodByMethodInfo,long,Object[]";
+      after6 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after6 = "MethodByMethodInfo,long";
+      after6 = "MethodCallByMethod,long";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after6(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after6 = "MethodByMethodInfo,int";
+      after6 = "MethodCallByMethod,int";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after6(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after6 = "MethodByMethodInfo,Object[]";
+      after6 = "MethodCallByMethod,Object[]";
    }
    
-   public void after6(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after6(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after6 = "MethodByMethodInfo";
+      after6 = "MethodCallByMethod";
    }
    
    public void after6(@Target OverloadedAdvicePOJO target,
@@ -2128,107 +2128,107 @@
    
    /* AFTER7 ADVICE */
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Args Object[] args)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Object[]";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Object[]";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJO,long";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJO,long";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after7 = "MethodByMethodInfo,long,int";
+      after7 = "MethodCallByMethod,long,int";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after7 = "MethodByMethodInfo,long,Object[]";
+      after7 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after7 = "MethodByMethodInfo,long";
+      after7 = "MethodCallByMethod,long";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after7(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after7 = "MethodByMethodInfo,int";
+      after7 = "MethodCallByMethod,int";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after7(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after7 = "MethodByMethodInfo,Object[]";
+      after7 = "MethodCallByMethod,Object[]";
    }
    
-   public void after7(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after7(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after7 = "MethodByMethodInfo";
+      after7 = "MethodCallByMethod";
    }
    
    public void after7(@Target OverloadedAdvicePOJO target,
@@ -2429,100 +2429,100 @@
    
    /* AFTER8 ADVICE */
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJO,long";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJO,long";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after8 = "MethodByMethodInfo,long,int";
+      after8 = "MethodCallByMethod,long,int";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after8 = "MethodByMethodInfo,long,Object[]";
+      after8 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after8 = "MethodByMethodInfo,long";
+      after8 = "MethodCallByMethod,long";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after8(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after8 = "MethodByMethodInfo,int";
+      after8 = "MethodCallByMethod,int";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after8(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after8 = "MethodByMethodInfo,Object[]";
+      after8 = "MethodCallByMethod,Object[]";
    }
    
-   public void after8(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after8(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after8 = "MethodByMethodInfo";
+      after8 = "MethodCallByMethod";
    }
    
    public void after8(@Target OverloadedAdvicePOJO target,
@@ -2723,94 +2723,94 @@
    
    /* AFTER9 ADVICE */
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after9 = "MethodByMethodInfo,long,int";
+      after9 = "MethodCallByMethod,long,int";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after9 = "MethodByMethodInfo,long,Object[]";
+      after9 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after9 = "MethodByMethodInfo,long";
+      after9 = "MethodCallByMethod,long";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after9(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after9 = "MethodByMethodInfo,int";
+      after9 = "MethodCallByMethod,int";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after9(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after9 = "MethodByMethodInfo,Object[]";
+      after9 = "MethodCallByMethod,Object[]";
    }
    
-   public void after9(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after9(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after9 = "MethodByMethodInfo";
+      after9 = "MethodCallByMethod";
    }
    
    public void after9(@Target OverloadedAdvicePOJO target,
@@ -3011,82 +3011,82 @@
    
    /* AFTER10 ADVICE */
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      after10 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      after10 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after10 = "MethodByMethodInfo,long,int";
+      after10 = "MethodCallByMethod,long,int";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after10 = "MethodByMethodInfo,long,Object[]";
+      after10 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after10 = "MethodByMethodInfo,long";
+      after10 = "MethodCallByMethod,long";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after10(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after10 = "MethodByMethodInfo,int";
+      after10 = "MethodCallByMethod,int";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after10(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after10 = "MethodByMethodInfo,Object[]";
+      after10 = "MethodCallByMethod,Object[]";
    }
    
-   public void after10(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after10(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after10 = "MethodByMethodInfo";
+      after10 = "MethodCallByMethod";
    }
    
    public void after10(@Target OverloadedAdvicePOJO target,
@@ -3287,76 +3287,76 @@
    
    /* AFTER11 ADVICE */
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Arg int arg)
    {
-      after11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,int";
+      after11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,int";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after11 = "MethodByMethodInfo,long,int";
+      after11 = "MethodCallByMethod,long,int";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after11 = "MethodByMethodInfo,long,Object[]";
+      after11 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after11 = "MethodByMethodInfo,long";
+      after11 = "MethodCallByMethod,long";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after11(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after11 = "MethodByMethodInfo,int";
+      after11 = "MethodCallByMethod,int";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after11(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after11 = "MethodByMethodInfo,Object[]";
+      after11 = "MethodCallByMethod,Object[]";
    }
    
-   public void after11(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after11(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after11 = "MethodByMethodInfo";
+      after11 = "MethodCallByMethod";
    }
    
    public void after11(@Target OverloadedAdvicePOJO target,
@@ -3557,69 +3557,69 @@
    
    /* AFTER12 ADVICE */
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Args Object[] args)
    {
-      after12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Object[]";
+      after12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Object[]";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after12 = "MethodByMethodInfo,long,int";
+      after12 = "MethodCallByMethod,long,int";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after12 = "MethodByMethodInfo,long,Object[]";
+      after12 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after12 = "MethodByMethodInfo,long";
+      after12 = "MethodCallByMethod,long";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after12(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after12 = "MethodByMethodInfo,int";
+      after12 = "MethodCallByMethod,int";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after12(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after12 = "MethodByMethodInfo,Object[]";
+      after12 = "MethodCallByMethod,Object[]";
    }
    
-   public void after12(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after12(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after12 = "MethodByMethodInfo";
+      after12 = "MethodCallByMethod";
    }
    
    public void after12(@Target OverloadedAdvicePOJO target,
@@ -3820,62 +3820,62 @@
    
    /* AFTER13 ADVICE */
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned)
    {
-      after13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long";
+      after13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after13(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after13 = "MethodByMethodInfo,long,int";
+      after13 = "MethodCallByMethod,long,int";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after13(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after13 = "MethodByMethodInfo,long,Object[]";
+      after13 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after13(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after13 = "MethodByMethodInfo,long";
+      after13 = "MethodCallByMethod,long";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after13(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after13 = "MethodByMethodInfo,int";
+      after13 = "MethodCallByMethod,int";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after13(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after13 = "MethodByMethodInfo,Object[]";
+      after13 = "MethodCallByMethod,Object[]";
    }
    
-   public void after13(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after13(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after13 = "MethodByMethodInfo";
+      after13 = "MethodCallByMethod";
    }
    
    public void after13(@Target OverloadedAdvicePOJO target,
@@ -4076,56 +4076,56 @@
    
    /* AFTER14 ADVICE */
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      after14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      after14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      after14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      after14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after14(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after14 = "MethodByMethodInfo,long,int";
+      after14 = "MethodCallByMethod,long,int";
    }
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after14(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after14 = "MethodByMethodInfo,long,Object[]";
+      after14 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after14(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after14 = "MethodByMethodInfo,long";
+      after14 = "MethodCallByMethod,long";
    }
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after14(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after14 = "MethodByMethodInfo,int";
+      after14 = "MethodCallByMethod,int";
    }
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after14(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after14 = "MethodByMethodInfo,Object[]";
+      after14 = "MethodCallByMethod,Object[]";
    }
    
-   public void after14(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after14(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after14 = "MethodByMethodInfo";
+      after14 = "MethodCallByMethod";
    }
    
    public void after14(@Target OverloadedAdvicePOJO target,
@@ -4326,44 +4326,44 @@
    
    /* AFTER15 ADVICE */
    
-   public void after15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      after15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      after15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void after15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after15(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after15 = "MethodByMethodInfo,long,int";
+      after15 = "MethodCallByMethod,long,int";
    }
    
-   public void after15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after15(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after15 = "MethodByMethodInfo,long,Object[]";
+      after15 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after15(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after15 = "MethodByMethodInfo,long";
+      after15 = "MethodCallByMethod,long";
    }
    
-   public void after15(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after15(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after15 = "MethodByMethodInfo,int";
+      after15 = "MethodCallByMethod,int";
    }
    
-   public void after15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after15(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after15 = "MethodByMethodInfo,Object[]";
+      after15 = "MethodCallByMethod,Object[]";
    }
    
-   public void after15(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after15(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after15 = "MethodByMethodInfo";
+      after15 = "MethodCallByMethod";
    }
    
    public void after15(@Target OverloadedAdvicePOJO target,
@@ -4564,38 +4564,38 @@
    
    /* AFTER16 ADVICE */
    
-   public void after16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after16(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Arg int arg)
    {
-      after16 = "MethodByMethodInfo,long,int";
+      after16 = "MethodCallByMethod,long,int";
    }
    
-   public void after16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after16(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after16 = "MethodByMethodInfo,long,Object[]";
+      after16 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after16(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after16 = "MethodByMethodInfo,long";
+      after16 = "MethodCallByMethod,long";
    }
    
-   public void after16(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after16(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after16 = "MethodByMethodInfo,int";
+      after16 = "MethodCallByMethod,int";
    }
    
-   public void after16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after16(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after16 = "MethodByMethodInfo,Object[]";
+      after16 = "MethodCallByMethod,Object[]";
    }
    
-   public void after16(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after16(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after16 = "MethodByMethodInfo";
+      after16 = "MethodCallByMethod";
    }
    
    public void after16(@Target OverloadedAdvicePOJO target,
@@ -4796,32 +4796,32 @@
    
    /* AFTER17 ADVICE */
    
-   public void after17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after17(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Args Object[] args)
    {
-      after17 = "MethodByMethodInfo,long,Object[]";
+      after17 = "MethodCallByMethod,long,Object[]";
    }
    
-   public void after17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after17(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after17 = "MethodByMethodInfo,long";
+      after17 = "MethodCallByMethod,long";
    }
    
-   public void after17(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after17(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after17 = "MethodByMethodInfo,int";
+      after17 = "MethodCallByMethod,int";
    }
    
-   public void after17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after17(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after17 = "MethodByMethodInfo,Object[]";
+      after17 = "MethodCallByMethod,Object[]";
    }
    
-   public void after17(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after17(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after17 = "MethodByMethodInfo";
+      after17 = "MethodCallByMethod";
    }
    
    public void after17(@Target OverloadedAdvicePOJO target,
@@ -5022,26 +5022,26 @@
    
    /* AFTER18 ADVICE */
    
-   public void after18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after18(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned)
    {
-      after18 = "MethodByMethodInfo,long";
+      after18 = "MethodCallByMethod,long";
    }
    
-   public void after18(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after18(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after18 = "MethodByMethodInfo,int";
+      after18 = "MethodCallByMethod,int";
    }
    
-   public void after18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after18(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after18 = "MethodByMethodInfo,Object[]";
+      after18 = "MethodCallByMethod,Object[]";
    }
    
-   public void after18(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after18(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after18 = "MethodByMethodInfo";
+      after18 = "MethodCallByMethod";
    }
    
    public void after18(@Target OverloadedAdvicePOJO target,
@@ -5242,20 +5242,20 @@
    
    /* AFTER19 ADVICE */
    
-   public void after19(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void after19(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      after19 = "MethodByMethodInfo,int";
+      after19 = "MethodCallByMethod,int";
    }
    
-   public void after19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void after19(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      after19 = "MethodByMethodInfo,Object[]";
+      after19 = "MethodCallByMethod,Object[]";
    }
    
-   public void after19(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after19(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after19 = "MethodByMethodInfo";
+      after19 = "MethodCallByMethod";
    }
    
    public void after19(@Target OverloadedAdvicePOJO target,
@@ -5456,9 +5456,9 @@
    
    /* AFTER20 ADVICE */
    
-   public void after20(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void after20(@JoinPoint MethodCallByMethod joinPoint)
    {
-      after20 = "MethodByMethodInfo";
+      after20 = "MethodCallByMethod";
    }
    
    public void after20(@Target OverloadedAdvicePOJO target,

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,12 +23,12 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.FieldInfo;
-import org.jboss.aop.JoinPointInfo;
-import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;
 import org.jboss.aop.advice.annotation.JoinPoint;
+import org.jboss.aop.joinpoint.FieldAccess;
+import org.jboss.aop.joinpoint.JoinPointBean;
+import org.jboss.aop.joinpoint.MethodExecution;
 
 /**
  * Aspect used on overloaded around advice tests (for JoinPoint, Arg and Args tests).
@@ -80,62 +80,62 @@
    
    /* BEFORE1 ADVICE */
    
-   public void before1(@JoinPoint FieldInfo joinPointInfo, @Arg String text)
+   public void before1(@JoinPoint FieldAccess joinPoint, @Arg String text)
    {
-      before1 = "FieldInfo,String";
+      before1 = "FieldAccess,String";
    }
 
-   public void before1(@JoinPoint FieldInfo joinPointInfo, @Arg Object text)
+   public void before1(@JoinPoint FieldAccess joinPoint, @Arg Object text)
    {
-      before1 = "FieldInfo,Object";
+      before1 = "FieldAccess,Object";
    }
    
-   public void before1(@JoinPoint JoinPointInfo joinPointInfo, @Arg String text)
+   public void before1(@JoinPoint JoinPointBean joinPoint, @Arg String text)
    {
-      before1 = "JoinPointInfo,String";
+      before1 = "JoinPointBean,String";
    }
 
-   public void before1(@JoinPoint JoinPointInfo joinPointInfo, @Arg Object text)
+   public void before1(@JoinPoint JoinPointBean joinPoint, @Arg Object text)
    {
-      before1 = "JoinPointInfo,Object";
+      before1 = "JoinPointBean,Object";
    }
    
-   public void before1(@JoinPoint Object joinPointInfo, @Arg String text)
+   public void before1(@JoinPoint Object joinPoint, @Arg String text)
    {
       before1 = "Object,String";
    }
 
-   public void before1(@JoinPoint Object joinPointInfo, @Arg Object text)
+   public void before1(@JoinPoint Object joinPoint, @Arg Object text)
    {
       before1 = "Object,Object";
    }
    
-   public void before1(@JoinPoint FieldInfo joinPointInfo, @Args Object[] args)
+   public void before1(@JoinPoint FieldAccess joinPoint, @Args Object[] args)
    {
-      before1 = "FieldInfo,Object[]";
+      before1 = "FieldAccess,Object[]";
    }
    
-   public void before1(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public void before1(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      before1 = "JoinPointInfo,Object[]";
+      before1 = "JoinPointBean,Object[]";
    }
    
-   public void before1(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before1(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before1 = "Object,Object[]";
    }
 
-   public void before1(@JoinPoint FieldInfo joinPointInfo)
+   public void before1(@JoinPoint FieldAccess joinPoint)
    {
-      before1 = "FieldInfo";
+      before1 = "FieldAccess";
    }
    
-   public void before1(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before1(@JoinPoint JoinPointBean joinPoint)
    {
-      before1 = "JoinPointInfo";
+      before1 = "JoinPointBean";
    }
 
-   public void before1(@JoinPoint Object joinPointInfo)
+   public void before1(@JoinPoint Object joinPoint)
    {
       before1 = "Object";
    }
@@ -155,7 +155,7 @@
       before1 = "";
    }
    
-   public void before1(@JoinPoint MethodInfo constructorInfo)
+   public void before1(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -167,57 +167,57 @@
  
    /* BEFORE2 ADVICE */
    
-   public void before2(@JoinPoint FieldInfo joinPointInfo, @Arg Object text)
+   public void before2(@JoinPoint FieldAccess joinPoint, @Arg Object text)
    {
-      before2 = "FieldInfo,Object";
+      before2 = "FieldAccess,Object";
    }
    
-   public void before2(@JoinPoint JoinPointInfo joinPointInfo, @Arg String text)
+   public void before2(@JoinPoint JoinPointBean joinPoint, @Arg String text)
    {
-      before2 = "JoinPointInfo,String";
+      before2 = "JoinPointBean,String";
    }
 
-   public void before2(@JoinPoint JoinPointInfo joinPointInfo, @Arg Object text)
+   public void before2(@JoinPoint JoinPointBean joinPoint, @Arg Object text)
    {
-      before2 = "JoinPointInfo,Object";
+      before2 = "JoinPointBean,Object";
    }
 
-   public void before2(@JoinPoint Object joinPointInfo, @Arg String text)
+   public void before2(@JoinPoint Object joinPoint, @Arg String text)
    {
       before2 = "Object,String";
    }
 
-   public void before2(@JoinPoint Object joinPointInfo, @Arg Object text)
+   public void before2(@JoinPoint Object joinPoint, @Arg Object text)
    {
       before2 = "Object,Object";
    }
 
-   public void before2(@JoinPoint FieldInfo joinPointInfo, @Args Object[] args)
+   public void before2(@JoinPoint FieldAccess joinPoint, @Args Object[] args)
    {
-      before2 = "FieldInfo,Object[]";
+      before2 = "FieldAccess,Object[]";
    }
    
-   public void before2(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public void before2(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      before2 = "FieldInfo,Object[]";
+      before2 = "FieldAccess,Object[]";
    }
    
-   public void before2(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before2(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before2 = "Object,Object[]";
    }
 
-   public void before2(@JoinPoint FieldInfo joinPointInfo)
+   public void before2(@JoinPoint FieldAccess joinPoint)
    {
-      before2 = "FieldInfo";
+      before2 = "FieldAccess";
    }
    
-   public void before2(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before2(@JoinPoint JoinPointBean joinPoint)
    {
-      before2 = "JoinPointInfo";
+      before2 = "JoinPointBean";
    }
 
-   public void before2(@JoinPoint Object joinPointInfo)
+   public void before2(@JoinPoint Object joinPoint)
    {
       before2 = "Object";
    }
@@ -237,7 +237,7 @@
       before2 = "";
    }
    
-   public void before2(@JoinPoint MethodInfo constructorInfo)
+   public void before2(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -249,52 +249,52 @@
    
    /* BEFORE3 ADVICE */
    
-   public void before3(@JoinPoint JoinPointInfo joinPointInfo, @Arg String text)
+   public void before3(@JoinPoint JoinPointBean joinPoint, @Arg String text)
    {
-      before3 = "JoinPointInfo,String";
+      before3 = "JoinPointBean,String";
    }
 
-   public void before3(@JoinPoint JoinPointInfo joinPointInfo, @Arg Object text)
+   public void before3(@JoinPoint JoinPointBean joinPoint, @Arg Object text)
    {
-      before3 = "JoinPointInfo,Object";
+      before3 = "JoinPointBean,Object";
    }
 
-   public void before3(@JoinPoint Object joinPointInfo, @Arg String text)
+   public void before3(@JoinPoint Object joinPoint, @Arg String text)
    {
       before3 = "Object,String";
    }
 
-   public void before3(@JoinPoint Object joinPointInfo, @Arg Object text)
+   public void before3(@JoinPoint Object joinPoint, @Arg Object text)
    {
       before3 = "Object,Object";
    }
 
-   public void before3(@JoinPoint FieldInfo joinPointInfo, @Args Object[] args)
+   public void before3(@JoinPoint FieldAccess joinPoint, @Args Object[] args)
    {
-      before3 = "FieldInfo,Object[]";
+      before3 = "FieldAccess,Object[]";
    }
 
-   public void before3(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public void before3(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      before3 = "JoinPointInfo,Object[]";
+      before3 = "JoinPointBean,Object[]";
    }
 
-   public void before3(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before3(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before3 = "Object,Object[]";
    }
    
-   public void before3(@JoinPoint FieldInfo joinPointInfo)
+   public void before3(@JoinPoint FieldAccess joinPoint)
    {
-      before3 = "FieldInfo";
+      before3 = "FieldAccess";
    }
    
-   public void before3(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before3(@JoinPoint JoinPointBean joinPoint)
    {
-      before3 = "JoinPointInfo";
+      before3 = "JoinPointBean";
    }
 
-   public void before3(@JoinPoint Object joinPointInfo)
+   public void before3(@JoinPoint Object joinPoint)
    {
       before3 = "Object";
    }
@@ -314,7 +314,7 @@
       before3 = "";
    }
    
-   public void before3(@JoinPoint MethodInfo constructorInfo)
+   public void before3(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -326,47 +326,47 @@
    
    /* BEFORE4 ADVICE */
    
-   public void before4(@JoinPoint JoinPointInfo joinPointInfo, @Arg Object text)
+   public void before4(@JoinPoint JoinPointBean joinPoint, @Arg Object text)
    {
-      before4 = "JoinPointInfo,Object";
+      before4 = "JoinPointBean,Object";
    }
 
-   public void before4(@JoinPoint Object joinPointInfo, @Arg String text)
+   public void before4(@JoinPoint Object joinPoint, @Arg String text)
    {
       before4 = "Object,String";
    }
 
-   public void before4(@JoinPoint Object joinPointInfo, @Arg Object text)
+   public void before4(@JoinPoint Object joinPoint, @Arg Object text)
    {
       before4 = "Object,Object";
    }
    
-   public void before4(@JoinPoint FieldInfo joinPointInfo, @Args Object[] args)
+   public void before4(@JoinPoint FieldAccess joinPoint, @Args Object[] args)
    {
-      before4 = "FieldInfo,Object[]";
+      before4 = "FieldAccess,Object[]";
    }
 
-   public void before4(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public void before4(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      before4 = "JoinPointInfo,Object[]";
+      before4 = "JoinPointBean,Object[]";
    }
 
-   public void before4(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before4(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before4 = "Object,Object[]";
    }
 
-   public void before4(@JoinPoint FieldInfo joinPointInfo)
+   public void before4(@JoinPoint FieldAccess joinPoint)
    {
-      before4 = "FieldInfo";
+      before4 = "FieldAccess";
    }
    
-   public void before4(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before4(@JoinPoint JoinPointBean joinPoint)
    {
-      before4 = "JoinPointInfo";
+      before4 = "JoinPointBean";
    }
 
-   public void before4(@JoinPoint Object joinPointInfo)
+   public void before4(@JoinPoint Object joinPoint)
    {
       before4 = "Object";
    }
@@ -386,7 +386,7 @@
       before4 = "";
    }
    
-   public void before4(@JoinPoint MethodInfo constructorInfo)
+   public void before4(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -398,42 +398,42 @@
    
    /* BEFORE5 ADVICE */
       
-   public void before5(@JoinPoint Object joinPointInfo, @Arg String text)
+   public void before5(@JoinPoint Object joinPoint, @Arg String text)
    {
       before5 = "Object,String";
    }
 
-   public void before5(@JoinPoint Object joinPointInfo, @Arg Object text)
+   public void before5(@JoinPoint Object joinPoint, @Arg Object text)
    {
       before5 = "Object,Object";
    }
    
-   public void before5(@JoinPoint FieldInfo joinPointInfo, @Args Object[] args)
+   public void before5(@JoinPoint FieldAccess joinPoint, @Args Object[] args)
    {
-      before5 = "FieldInfo,Object[]";
+      before5 = "FieldAccess,Object[]";
    }
 
-   public void before5(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public void before5(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      before5 = "JoinPointInfo,Object[]";
+      before5 = "JoinPointBean,Object[]";
    }
 
-   public void before5(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before5(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before5 = "Object,Object[]";
    }
    
-   public void before5(@JoinPoint FieldInfo joinPointInfo)
+   public void before5(@JoinPoint FieldAccess joinPoint)
    {
-      before5 = "FieldInfo";
+      before5 = "FieldAccess";
    }
    
-   public void before5(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before5(@JoinPoint JoinPointBean joinPoint)
    {
-      before5 = "JoinPointInfo";
+      before5 = "JoinPointBean";
    }
 
-   public void before5(@JoinPoint Object joinPointInfo)
+   public void before5(@JoinPoint Object joinPoint)
    {
       before5 = "Object";
    }
@@ -453,7 +453,7 @@
       before5 = "";
    }
    
-   public void before5(@JoinPoint MethodInfo constructorInfo)
+   public void before5(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -465,37 +465,37 @@
    
    /* BEFORE6 ADVICE */
    
-   public void before6(@JoinPoint Object joinPointInfo, @Arg Object text)
+   public void before6(@JoinPoint Object joinPoint, @Arg Object text)
    {
       before6 = "Object,Object";
    }
    
-   public void before6(@JoinPoint FieldInfo joinPointInfo, @Args Object[] args)
+   public void before6(@JoinPoint FieldAccess joinPoint, @Args Object[] args)
    {
-      before6 = "FieldInfo,Object[]";
+      before6 = "FieldAccess,Object[]";
    }
 
-   public void before6(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public void before6(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      before6 = "JoinPointInfo,Object[]";
+      before6 = "JoinPointBean,Object[]";
    }
 
-   public void before6(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before6(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before6 = "Object,Object[]";
    }
 
-   public void before6(@JoinPoint FieldInfo joinPointInfo)
+   public void before6(@JoinPoint FieldAccess joinPoint)
    {
-      before6 = "FieldInfo";
+      before6 = "FieldAccess";
    }
    
-   public void before6(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before6(@JoinPoint JoinPointBean joinPoint)
    {
-      before6 = "JoinPointInfo";
+      before6 = "JoinPointBean";
    }
 
-   public void before6(@JoinPoint Object joinPointInfo)
+   public void before6(@JoinPoint Object joinPoint)
    {
       before6 = "Object";
    }
@@ -515,7 +515,7 @@
       before6 = "";
    }
    
-   public void before6(@JoinPoint MethodInfo constructorInfo)
+   public void before6(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -527,32 +527,32 @@
    
    /* BEFORE7 ADVICE */
    
-   public void before7(@JoinPoint FieldInfo joinPointInfo, @Args Object[] args)
+   public void before7(@JoinPoint FieldAccess joinPoint, @Args Object[] args)
    {
-      before7 = "FieldInfo,Object[]";
+      before7 = "FieldAccess,Object[]";
    }
 
-   public void before7(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public void before7(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      before7 = "JoinPointInfo,Object[]";
+      before7 = "JoinPointBean,Object[]";
    }
 
-   public void before7(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before7(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before7 = "Object,Object[]";
    }
    
-   public void before7(@JoinPoint FieldInfo joinPointInfo)
+   public void before7(@JoinPoint FieldAccess joinPoint)
    {
-      before7 = "FieldInfo";
+      before7 = "FieldAccess";
    }
    
-   public void before7(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before7(@JoinPoint JoinPointBean joinPoint)
    {
-      before7 = "JoinPointInfo";
+      before7 = "JoinPointBean";
    }
 
-   public void before7(@JoinPoint Object joinPointInfo)
+   public void before7(@JoinPoint Object joinPoint)
    {
       before7 = "Object";
    }
@@ -572,7 +572,7 @@
       before7 = "";
    }
    
-   public void before7(@JoinPoint MethodInfo constructorInfo)
+   public void before7(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -584,27 +584,27 @@
    
    /* BEFORE8 ADVICE */
    
-   public void before8(@JoinPoint JoinPointInfo joinPointInfo, @Args Object[] args)
+   public void before8(@JoinPoint JoinPointBean joinPoint, @Args Object[] args)
    {
-      before8 = "JoinPointInfo,Object[]";
+      before8 = "JoinPointBean,Object[]";
    }
 
-   public void before8(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before8(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before8 = "Object,Object[]";
    }
    
-   public void before8(@JoinPoint FieldInfo joinPointInfo)
+   public void before8(@JoinPoint FieldAccess joinPoint)
    {
-      before8 = "FieldInfo";
+      before8 = "FieldAccess";
    }
    
-   public void before8(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before8(@JoinPoint JoinPointBean joinPoint)
    {
-      before8 = "JoinPointInfo";
+      before8 = "JoinPointBean";
    }
 
-   public void before8(@JoinPoint Object joinPointInfo)
+   public void before8(@JoinPoint Object joinPoint)
    {
       before8 = "Object";
    }
@@ -624,7 +624,7 @@
       before8 = "";
    }
    
-   public void before8(@JoinPoint MethodInfo constructorInfo)
+   public void before8(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -636,22 +636,22 @@
    
    /* BEFORE9 ADVICE */
    
-   public void before9(@JoinPoint Object joinPointInfo, @Args Object[] args)
+   public void before9(@JoinPoint Object joinPoint, @Args Object[] args)
    {
       before9 = "Object,Object[]";
    }
    
-   public void before9(@JoinPoint FieldInfo joinPointInfo)
+   public void before9(@JoinPoint FieldAccess joinPoint)
    {
-      before9 = "FieldInfo";
+      before9 = "FieldAccess";
    }
    
-   public void before9(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before9(@JoinPoint JoinPointBean joinPoint)
    {
-      before9 = "JoinPointInfo";
+      before9 = "JoinPointBean";
    }
 
-   public void before9(@JoinPoint Object joinPointInfo)
+   public void before9(@JoinPoint Object joinPoint)
    {
       before9 = "Object";
    }
@@ -671,7 +671,7 @@
       before9 = "";
    }
    
-   public void before9(@JoinPoint MethodInfo constructorInfo)
+   public void before9(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -683,17 +683,17 @@
    
    /* BEFORE10 ADVICE */
    
-   public void before10(@JoinPoint FieldInfo joinPointInfo)
+   public void before10(@JoinPoint FieldAccess joinPoint)
    {
-      before10 = "FieldInfo";
+      before10 = "FieldAccess";
    }
    
-   public void before10(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before10(@JoinPoint JoinPointBean joinPoint)
    {
-      before10 = "JoinPointInfo";
+      before10 = "JoinPointBean";
    }
    
-   public void before10(@JoinPoint Object joinPointInfo)
+   public void before10(@JoinPoint Object joinPoint)
    {
       before10 = "Object";
    }
@@ -713,7 +713,7 @@
       before10 = "";
    }
    
-   public void before10(@JoinPoint MethodInfo constructorInfo)
+   public void before10(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -725,12 +725,12 @@
    
    /* BEFORE11 ADVICE */
    
-   public void before11(@JoinPoint JoinPointInfo joinPointInfo)
+   public void before11(@JoinPoint JoinPointBean joinPoint)
    {
-      before11 = "JoinPointInfo";
+      before11 = "JoinPointBean";
    }
    
-   public void before11(@JoinPoint Object joinPointInfo)
+   public void before11(@JoinPoint Object joinPoint)
    {
       before11 = "Object";
    }
@@ -750,7 +750,7 @@
       before11 = "";
    }
    
-   public void before11(@JoinPoint MethodInfo constructorInfo)
+   public void before11(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -762,7 +762,7 @@
    
    /* BEFORE12 ADVICE */
    
-   public void before12(@JoinPoint Object joinPointInfo)
+   public void before12(@JoinPoint Object joinPoint)
    {
       before12 = "Object";
    }
@@ -782,7 +782,7 @@
       before12 = "";
    }
    
-   public void before12(@JoinPoint MethodInfo constructorInfo)
+   public void before12(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -814,7 +814,7 @@
       before13 = "";
    }
    
-   public void before13(@JoinPoint MethodInfo constructorInfo)
+   public void before13(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -841,7 +841,7 @@
       before14 = "";
    }
    
-   public void before14(@JoinPoint MethodInfo constructorInfo)
+   public void before14(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -863,7 +863,7 @@
       before15 = "";
    }
    
-   public void before15(@JoinPoint MethodInfo constructorInfo)
+   public void before15(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -880,7 +880,7 @@
       before16 = "";
    }
    
-   public void before16(@JoinPoint MethodInfo constructorInfo)
+   public void before16(@JoinPoint MethodExecution constructorInfo)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -892,13 +892,13 @@
    
    /* BEFORE17 ADVICE */
    
-   public void before17(@JoinPoint FieldInfo fieldInfo, @Arg String text)
+   public void before17(@JoinPoint FieldAccess fieldInfo, @Arg String text)
    {
-      before17 = "FieldInfo,String";
+      before17 = "FieldAccess,String";
    }
    
-   public void before17(@JoinPoint FieldInfo fieldInfo)
+   public void before17(@JoinPoint FieldAccess fieldInfo)
    {
-      before17 = "FieldInfo";
+      before17 = "FieldAccess";
    }
 }
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeCallAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedBeforeCallAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,12 +23,12 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.MethodByMethodInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;
 import org.jboss.aop.advice.annotation.Caller;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Target;
+import org.jboss.aop.joinpoint.MethodCallByMethod;
 
 /**
  * Aspect used on overloaded before advice tests (for Call and Target tests
@@ -137,149 +137,149 @@
    
    /* BEFORE1 ADVICE */
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,int";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,int";
+      before1 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,Object,SuperClass,int";
+      before1 = "MethodCallByMethod,Object,SuperClass,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,Object[]";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,Object[]";
+      before1 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,Object,SuperClass,Object[]";
+      before1 = "MethodCallByMethod,Object,SuperClass,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before1 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before1 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before1 = "MethodByMethodInfo,Object,SuperClass";
+      before1 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,Object,int";
+      before1 = "MethodCallByMethod,Object,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,Object,Object[]";
+      before1 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,SuperClass,int";
+      before1 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,SuperClass,Object[]";
+      before1 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before1(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before1 = "MethodByMethodInfo,int";
+      before1 = "MethodCallByMethod,int";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before1(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before1 = "MethodByMethodInfo,Object[]";
+      before1 = "MethodCallByMethod,Object[]";
    }
    
-   public void before1(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before1(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before1= "MethodByMethodInfo";
+      before1= "MethodCallByMethod";
    }
    
    public void before1(@Target OverloadedAdvicePOJO target,
@@ -408,142 +408,142 @@
    
    /* BEFORE2 ADVICE */
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Arg int arg)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,int";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,int";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Arg int arg)
    {
-      before2 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,int";
+      before2 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Arg int arg)
    {
-      before2 = "MethodByMethodInfo,Object,SuperClass,int";
+      before2 = "MethodCallByMethod,Object,SuperClass,int";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,Object[]";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,Object[]";
+      before2 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,Object,SuperClass,Object[]";
+      before2 = "MethodCallByMethod,Object,SuperClass,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before2 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before2 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before2 = "MethodByMethodInfo,Object,SuperClass";
+      before2 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before2 = "MethodByMethodInfo,Object,int";
+      before2 = "MethodCallByMethod,Object,int";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,Object,Object[]";
+      before2 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before2 = "MethodByMethodInfo,SuperClass,int";
+      before2 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,SuperClass,Object[]";
+      before2 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before2(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before2 = "MethodByMethodInfo,int";
+      before2 = "MethodCallByMethod,int";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before2(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before2 = "MethodByMethodInfo,Object[]";
+      before2 = "MethodCallByMethod,Object[]";
    }
    
-   public void before2(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before2(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before2= "MethodByMethodInfo";
+      before2= "MethodCallByMethod";
    }
    
    public void before2(@Target OverloadedAdvicePOJO target,
@@ -672,135 +672,135 @@
    
    /* BEFORE3 ADVICE */
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Arg int arg)
    {
-      before3 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,int";
+      before3 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Arg int arg)
    {
-      before3 = "MethodByMethodInfo,Object,SuperClass,int";
+      before3 = "MethodCallByMethod,Object,SuperClass,int";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      before3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,Object[]";
+      before3 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,Object[]";
+      before3 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,Object,SuperClass,Object[]";
+      before3 = "MethodCallByMethod,Object,SuperClass,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before3 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before3 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before3 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before3 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before3 = "MethodByMethodInfo,Object,SuperClass";
+      before3 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before3 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before3 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before3 = "MethodByMethodInfo,Object,int";
+      before3 = "MethodCallByMethod,Object,int";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before3 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,Object,Object[]";
+      before3 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before3 = "MethodByMethodInfo,SuperClass,int";
+      before3 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,SuperClass,Object[]";
+      before3 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before3(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before3 = "MethodByMethodInfo,int";
+      before3 = "MethodCallByMethod,int";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before3(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before3 = "MethodByMethodInfo,Object[]";
+      before3 = "MethodCallByMethod,Object[]";
    }
    
-   public void before3(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before3(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before3= "MethodByMethodInfo";
+      before3= "MethodCallByMethod";
    }
    
    public void before3(@Target OverloadedAdvicePOJO target,
@@ -929,128 +929,128 @@
    
    /* BEFORE4 ADVICE */
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Arg int arg)
    {
-      before4 = "MethodByMethodInfo,Object,SuperClass,int";
+      before4 = "MethodCallByMethod,Object,SuperClass,int";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      before4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,Object[]";
+      before4 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,Object[]";
+      before4 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,Object,SuperClass,Object[]";
+      before4 = "MethodCallByMethod,Object,SuperClass,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before4 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before4 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before4 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before4 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before4 = "MethodByMethodInfo,Object,SuperClass";
+      before4 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before4 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before4 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before4 = "MethodByMethodInfo,Object,int";
+      before4 = "MethodCallByMethod,Object,int";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before4 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,Object,Object[]";
+      before4 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before4 = "MethodByMethodInfo,SuperClass,int";
+      before4 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,SuperClass,Object[]";
+      before4 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before4(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before4 = "MethodByMethodInfo,int";
+      before4 = "MethodCallByMethod,int";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before4(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before4 = "MethodByMethodInfo,Object[]";
+      before4 = "MethodCallByMethod,Object[]";
    }
    
-   public void before4(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before4(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before4= "MethodByMethodInfo";
+      before4= "MethodCallByMethod";
    }
    
    public void before4(@Target OverloadedAdvicePOJO target,
@@ -1179,121 +1179,121 @@
    
    /* BEFORE5 ADVICE */
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      before5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,Object[]";
+      before5 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,Object[]";
+      before5 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,Object,SuperClass,Object[]";
+      before5 = "MethodCallByMethod,Object,SuperClass,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before5 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before5 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before5 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before5 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before5 = "MethodByMethodInfo,Object,SuperClass";
+      before5 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before5 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before5 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before5 = "MethodByMethodInfo,Object,int";
+      before5 = "MethodCallByMethod,Object,int";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before5 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,Object,Object[]";
+      before5 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before5 = "MethodByMethodInfo,SuperClass,int";
+      before5 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,SuperClass,Object[]";
+      before5 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before5(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before5 = "MethodByMethodInfo,int";
+      before5 = "MethodCallByMethod,int";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before5(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before5 = "MethodByMethodInfo,Object[]";
+      before5 = "MethodCallByMethod,Object[]";
    }
    
-   public void before5(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before5(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before5= "MethodByMethodInfo";
+      before5= "MethodCallByMethod";
    }
    
    public void before5(@Target OverloadedAdvicePOJO target,
@@ -1422,114 +1422,114 @@
    
    /* BEFORE6 ADVICE */
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before6 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,Object[]";
+      before6 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,Object[]";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      before6 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,Object[]";
+      before6 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before6 = "MethodByMethodInfo,Object,SuperClass,Object[]";
+      before6 = "MethodCallByMethod,Object,SuperClass,Object[]";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before6 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before6 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before6 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before6 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before6 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before6 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before6 = "MethodByMethodInfo,Object,SuperClass";
+      before6 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before6 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before6 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before6 = "MethodByMethodInfo,Object,int";
+      before6 = "MethodCallByMethod,Object,int";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before6 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before6 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before6 = "MethodByMethodInfo,Object,Object[]";
+      before6 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before6 = "MethodByMethodInfo,SuperClass,int";
+      before6 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before6 = "MethodByMethodInfo,SuperClass,Object[]";
+      before6 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before6(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before6 = "MethodByMethodInfo,int";
+      before6 = "MethodCallByMethod,int";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before6(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before6 = "MethodByMethodInfo,Object[]";
+      before6 = "MethodCallByMethod,Object[]";
    }
    
-   public void before6(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before6(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before6= "MethodByMethodInfo";
+      before6= "MethodCallByMethod";
    }
    
    public void before6(@Target OverloadedAdvicePOJO target,
@@ -1658,107 +1658,107 @@
    
    /* BEFORE7 ADVICE */
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      before7 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,Object[]";
+      before7 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before7 = "MethodByMethodInfo,Object,SuperClass,Object[]";
+      before7 = "MethodCallByMethod,Object,SuperClass,Object[]";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before7 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before7 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before7 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before7 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before7 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before7 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before7 = "MethodByMethodInfo,Object,SuperClass";
+      before7 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before7 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before7 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before7 = "MethodByMethodInfo,Object,int";
+      before7 = "MethodCallByMethod,Object,int";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before7 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before7 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before7 = "MethodByMethodInfo,Object,Object[]";
+      before7 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before7 = "MethodByMethodInfo,SuperClass,int";
+      before7 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before7 = "MethodByMethodInfo,SuperClass,Object[]";
+      before7 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before7(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before7 = "MethodByMethodInfo,int";
+      before7 = "MethodCallByMethod,int";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before7(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before7 = "MethodByMethodInfo,Object[]";
+      before7 = "MethodCallByMethod,Object[]";
    }
    
-   public void before7(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before7(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before7= "MethodByMethodInfo";
+      before7= "MethodCallByMethod";
    }
    
    public void before7(@Target OverloadedAdvicePOJO target,
@@ -1887,100 +1887,100 @@
    
    /* BEFORE8 ADVICE */
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller,
          @Args Object[] args)
    {
-      before8 = "MethodByMethodInfo,Object,SuperClass,Object[]";
+      before8 = "MethodCallByMethod,Object,SuperClass,Object[]";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before8 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before8 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before8 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before8 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before8 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before8 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before8 = "MethodByMethodInfo,Object,SuperClass";
+      before8 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before8 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before8 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before8 = "MethodByMethodInfo,Object,int";
+      before8 = "MethodCallByMethod,Object,int";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before8 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before8 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before8 = "MethodByMethodInfo,Object,Object[]";
+      before8 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before8 = "MethodByMethodInfo,SuperClass,int";
+      before8 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before8 = "MethodByMethodInfo,SuperClass,Object[]";
+      before8 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before8(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before8 = "MethodByMethodInfo,int";
+      before8 = "MethodCallByMethod,int";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before8(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before8 = "MethodByMethodInfo,Object[]";
+      before8 = "MethodCallByMethod,Object[]";
    }
    
-   public void before8(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before8(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before8= "MethodByMethodInfo";
+      before8= "MethodCallByMethod";
    }
    
    public void before8(@Target OverloadedAdvicePOJO target,
@@ -2109,93 +2109,93 @@
    
    /* BEFORE9 ADVICE */
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before9 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      before9 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before9 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before9 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before9 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before9 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before9 = "MethodByMethodInfo,Object,SuperClass";
+      before9 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before9 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before9 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before9 = "MethodByMethodInfo,Object,int";
+      before9 = "MethodCallByMethod,Object,int";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before9 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before9 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before9 = "MethodByMethodInfo,Object,Object[]";
+      before9 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before9 = "MethodByMethodInfo,SuperClass,int";
+      before9 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before9 = "MethodByMethodInfo,SuperClass,Object[]";
+      before9 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before9(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before9 = "MethodByMethodInfo,int";
+      before9 = "MethodCallByMethod,int";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before9(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before9 = "MethodByMethodInfo,Object[]";
+      before9 = "MethodCallByMethod,Object[]";
    }
    
-   public void before9(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before9(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before9= "MethodByMethodInfo";
+      before9= "MethodCallByMethod";
    }
    
    public void before9(@Target OverloadedAdvicePOJO target,
@@ -2324,86 +2324,86 @@
    
    /* BEFORE10 ADVICE */
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller)
    {
-      before10 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass";
+      before10 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before10 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before10 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before10 = "MethodByMethodInfo,Object,SuperClass";
+      before10 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before10 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before10 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before10 = "MethodByMethodInfo,Object,int";
+      before10 = "MethodCallByMethod,Object,int";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before10 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before10 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before10 = "MethodByMethodInfo,Object,Object[]";
+      before10 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before10 = "MethodByMethodInfo,SuperClass,int";
+      before10 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before10 = "MethodByMethodInfo,SuperClass,Object[]";
+      before10 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before10(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before10 = "MethodByMethodInfo,int";
+      before10 = "MethodCallByMethod,int";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before10(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before10 = "MethodByMethodInfo,Object[]";
+      before10 = "MethodCallByMethod,Object[]";
    }
    
-   public void before10(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before10(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before10= "MethodByMethodInfo";
+      before10= "MethodCallByMethod";
    }
    
    public void before10(@Target OverloadedAdvicePOJO target,
@@ -2532,80 +2532,80 @@
    
    /* BEFORE11 ADVICE */
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller)
    {
-      before11 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller";
+      before11 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before11 = "MethodByMethodInfo,Object,SuperClass";
+      before11 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before11 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before11 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before11 = "MethodByMethodInfo,Object,int";
+      before11 = "MethodCallByMethod,Object,int";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before11 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before11 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before11 = "MethodByMethodInfo,Object,Object[]";
+      before11 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before11 = "MethodByMethodInfo,SuperClass,int";
+      before11 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before11 = "MethodByMethodInfo,SuperClass,Object[]";
+      before11 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before11(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before11 = "MethodByMethodInfo,int";
+      before11 = "MethodCallByMethod,int";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before11(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before11 = "MethodByMethodInfo,Object[]";
+      before11 = "MethodCallByMethod,Object[]";
    }
    
-   public void before11(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before11(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before11= "MethodByMethodInfo";
+      before11= "MethodCallByMethod";
    }
    
    public void before11(@Target OverloadedAdvicePOJO target,
@@ -2734,74 +2734,74 @@
    
    /* BEFORE12 ADVICE */
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller SuperClass caller)
    {
-      before12 = "MethodByMethodInfo,Object,SuperClass";
+      before12 = "MethodCallByMethod,Object,SuperClass";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before12 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before12 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before12 = "MethodByMethodInfo,Object,int";
+      before12 = "MethodCallByMethod,Object,int";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before12 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before12 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before12 = "MethodByMethodInfo,Object,Object[]";
+      before12 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before12 = "MethodByMethodInfo,SuperClass,int";
+      before12 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before12 = "MethodByMethodInfo,SuperClass,Object[]";
+      before12 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before12(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before12 = "MethodByMethodInfo,int";
+      before12 = "MethodCallByMethod,int";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before12(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before12 = "MethodByMethodInfo,Object[]";
+      before12 = "MethodCallByMethod,Object[]";
    }
    
-   public void before12(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before12(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before12= "MethodByMethodInfo";
+      before12= "MethodCallByMethod";
    }
    
    public void before12(@Target OverloadedAdvicePOJO target,
@@ -2930,68 +2930,68 @@
    
    /* BEFORE13 ADVICE */
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      before13 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      before13 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before13 = "MethodByMethodInfo,Object,int";
+      before13 = "MethodCallByMethod,Object,int";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before13 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before13 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before13 = "MethodByMethodInfo,Object,Object[]";
+      before13 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before13 = "MethodByMethodInfo,SuperClass,int";
+      before13 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before13 = "MethodByMethodInfo,SuperClass,Object[]";
+      before13 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before13(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before13 = "MethodByMethodInfo,int";
+      before13 = "MethodCallByMethod,int";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before13(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before13 = "MethodByMethodInfo,Object[]";
+      before13 = "MethodCallByMethod,Object[]";
    }
    
-   public void before13(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before13(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before13= "MethodByMethodInfo";
+      before13= "MethodCallByMethod";
    }
    
    public void before13(@Target OverloadedAdvicePOJO target,
@@ -3120,62 +3120,62 @@
    
    /* BEFORE14 ADVICE */
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before14(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Arg int arg)
    {
-      before14 = "MethodByMethodInfo,Object,int";
+      before14 = "MethodCallByMethod,Object,int";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before14 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before14 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before14(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before14 = "MethodByMethodInfo,Object,Object[]";
+      before14 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before14 = "MethodByMethodInfo,SuperClass,int";
+      before14 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before14 = "MethodByMethodInfo,SuperClass,Object[]";
+      before14 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before14(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before14 = "MethodByMethodInfo,int";
+      before14 = "MethodCallByMethod,int";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before14(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before14 = "MethodByMethodInfo,Object[]";
+      before14 = "MethodCallByMethod,Object[]";
    }
    
-   public void before14(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before14(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before14= "MethodByMethodInfo";
+      before14= "MethodCallByMethod";
    }
    
    public void before14(@Target OverloadedAdvicePOJO target,
@@ -3304,56 +3304,56 @@
    
    /* BEFORE15 ADVICE */
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      before15 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      before15 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before15(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before15 = "MethodByMethodInfo,Object,Object[]";
+      before15 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before15 = "MethodByMethodInfo,SuperClass,int";
+      before15 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before15 = "MethodByMethodInfo,SuperClass,Object[]";
+      before15 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before15(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before15 = "MethodByMethodInfo,int";
+      before15 = "MethodCallByMethod,int";
    }
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before15(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before15 = "MethodByMethodInfo,Object[]";
+      before15 = "MethodCallByMethod,Object[]";
    }
    
-   public void before15(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before15(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before15= "MethodByMethodInfo";
+      before15= "MethodCallByMethod";
    }
    
    public void before15(@Target OverloadedAdvicePOJO target,
@@ -3482,50 +3482,50 @@
    
    /* BEFORE16 ADVICE */
    
-   public void before16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before16(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Args Object[] args)
    {
-      before16 = "MethodByMethodInfo,Object,Object[]";
+      before16 = "MethodCallByMethod,Object,Object[]";
    }
    
-   public void before16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before16 = "MethodByMethodInfo,SuperClass,int";
+      before16 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before16 = "MethodByMethodInfo,SuperClass,Object[]";
+      before16 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before16(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before16(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before16 = "MethodByMethodInfo,int";
+      before16 = "MethodCallByMethod,int";
    }
    
-   public void before16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before16(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before16 = "MethodByMethodInfo,Object[]";
+      before16 = "MethodCallByMethod,Object[]";
    }
    
-   public void before16(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before16(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before16= "MethodByMethodInfo";
+      before16= "MethodCallByMethod";
    }
    
    public void before16(@Target OverloadedAdvicePOJO target,
@@ -3654,44 +3654,44 @@
    
    /* BEFORE17 ADVICE */
    
-   public void before17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      before17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      before17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void before17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before17 = "MethodByMethodInfo,SuperClass,int";
+      before17 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before17 = "MethodByMethodInfo,SuperClass,Object[]";
+      before17 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before17(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before17(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before17 = "MethodByMethodInfo,int";
+      before17 = "MethodCallByMethod,int";
    }
    
-   public void before17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before17(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before17 = "MethodByMethodInfo,Object[]";
+      before17 = "MethodCallByMethod,Object[]";
    }
    
-   public void before17(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before17(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before17= "MethodByMethodInfo";
+      before17= "MethodCallByMethod";
    }
    
    public void before17(@Target OverloadedAdvicePOJO target,
@@ -3820,38 +3820,38 @@
    
    /* BEFORE18 ADVICE */
    
-   public void before18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Arg int arg)
    {
-      before18 = "MethodByMethodInfo,SuperClass,int";
+      before18 = "MethodCallByMethod,SuperClass,int";
    }
    
-   public void before18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before18 = "MethodByMethodInfo,SuperClass,Object[]";
+      before18 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before18(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before18(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before18 = "MethodByMethodInfo,int";
+      before18 = "MethodCallByMethod,int";
    }
    
-   public void before18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before18(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before18 = "MethodByMethodInfo,Object[]";
+      before18 = "MethodCallByMethod,Object[]";
    }
    
-   public void before18(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before18(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before18= "MethodByMethodInfo";
+      before18= "MethodCallByMethod";
    }
    
    public void before18(@Target OverloadedAdvicePOJO target,
@@ -3980,32 +3980,32 @@
    
    /* BEFORE19 ADVICE */
    
-   public void before19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      before19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      before19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void before19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before19 = "MethodByMethodInfo,SuperClass,Object[]";
+      before19 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before19(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before19(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before19 = "MethodByMethodInfo,int";
+      before19 = "MethodCallByMethod,int";
    }
    
-   public void before19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before19(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before19 = "MethodByMethodInfo,Object[]";
+      before19 = "MethodCallByMethod,Object[]";
    }
    
-   public void before19(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before19(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before19= "MethodByMethodInfo";
+      before19= "MethodCallByMethod";
    }
    
    public void before19(@Target OverloadedAdvicePOJO target,
@@ -4134,26 +4134,26 @@
    
    /* BEFORE20 ADVICE */
    
-   public void before20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller SuperClass caller, @Args Object[] args)
    {
-      before20 = "MethodByMethodInfo,SuperClass,Object[]";
+      before20 = "MethodCallByMethod,SuperClass,Object[]";
    }
    
-   public void before20(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before20(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before20 = "MethodByMethodInfo,int";
+      before20 = "MethodCallByMethod,int";
    }
    
-   public void before20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before20(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before20 = "MethodByMethodInfo,Object[]";
+      before20 = "MethodCallByMethod,Object[]";
    }
    
-   public void before20(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before20(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before20= "MethodByMethodInfo";
+      before20= "MethodCallByMethod";
    }
    
    public void before20(@Target OverloadedAdvicePOJO target,
@@ -4282,20 +4282,20 @@
 
    /* BEFORE21 ADVICE */
    
-   public void before21(@JoinPoint MethodByMethodInfo joinPointInfo, @Arg int arg)
+   public void before21(@JoinPoint MethodCallByMethod joinPoint, @Arg int arg)
    {
-      before21 = "MethodByMethodInfo,int";
+      before21 = "MethodCallByMethod,int";
    }
    
-   public void before21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before21(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before21 = "MethodByMethodInfo,Object[]";
+      before21 = "MethodCallByMethod,Object[]";
    }
    
-   public void before21(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before21(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before21= "MethodByMethodInfo";
+      before21= "MethodCallByMethod";
    }
    
    public void before21(@Target OverloadedAdvicePOJO target,
@@ -4424,15 +4424,15 @@
    
    /* BEFORE22 ADVICE */
    
-   public void before22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void before22(@JoinPoint MethodCallByMethod joinPoint,
          @Args Object[] args)
    {
-      before22 = "MethodByMethodInfo,Object[]";
+      before22 = "MethodCallByMethod,Object[]";
    }
    
-   public void before22(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before22(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before22= "MethodByMethodInfo";
+      before22= "MethodCallByMethod";
    }
    
    public void before22(@Target OverloadedAdvicePOJO target,
@@ -4561,9 +4561,9 @@
    
    /* BEFORE23 ADVICE */
    
-   public void before23(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void before23(@JoinPoint MethodCallByMethod joinPoint)
    {
-      before23= "MethodByMethodInfo";
+      before23= "MethodCallByMethod";
    }
    
    public void before23(@Target OverloadedAdvicePOJO target,

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -25,12 +25,12 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.MethodInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Return;
 import org.jboss.aop.advice.annotation.Thrown;
+import org.jboss.aop.joinpoint.MethodExecution;
 
 /**
  * Aspect used on overloaded finally advice tests (for JoinPoint, Return, Thrown, Arg
@@ -192,238 +192,238 @@
    
    /* FINALLY1 ADVICE */
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1, @Arg long arg2)
    {
-      finally1 = "void,MethodInfo,String,Throwable,int,long";
+      finally1 = "void,MethodExecution,String,Throwable,int,long";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1, @Arg long arg2)
    {
-      finally1 = "void,MethodInfo,String,Serializable,int,long";
+      finally1 = "void,MethodExecution,String,Serializable,int,long";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1, @Arg long arg2)
    {
-      finally1 = "void,MethodInfo,CharSequence,Throwable,int,long";
+      finally1 = "void,MethodExecution,CharSequence,Throwable,int,long";
    }
    
-   public String finally1(@JoinPoint MethodInfo joinPoint,
+   public String finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally1 = "String,MethodInfo,String,Throwable,int";
+      finally1 = "String,MethodExecution,String,Throwable,int";
       return "finally1";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally1 = "void,MethodInfo,String,Throwable,long";
+      finally1 = "void,MethodExecution,String,Throwable,long";
    }
    
-   public String finally1(@JoinPoint MethodInfo joinPoint,
+   public String finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg long arg2)
    {
-      finally1 = "String,MethodInfo,String,Serializable,long";
+      finally1 = "String,MethodExecution,String,Serializable,long";
       return "finally1";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1)
    {
-      finally1 = "void,MethodInfo,String,Serializable,int";
+      finally1 = "void,MethodExecution,String,Serializable,int";
    }
    
-   public Object finally1(@JoinPoint MethodInfo joinPoint,
+   public Object finally1(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally1 = "Object,MethodInfo,CharSequence,Throwable,int";
+      finally1 = "Object,MethodExecution,CharSequence,Throwable,int";
       return "finally1";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally1 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally1 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally1 = "void,MethodInfo,String,Throwable,Object[]";
+      finally1 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally1 = "void,MethodInfo,String,Throwable,Object";
+      finally1 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally1 = "void,MethodInfo,String,Serializable,Object[]";
+      finally1 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally1 = "void,MethodInfo,String,Serializable,Object";
+      finally1 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally1 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally1 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally1 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally1 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally1 = "void,MethodInfo,String,Throwable";
+      finally1 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally1 = "void,MethodInfo,String,Serializable";
+      finally1 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally1 = "void,MethodInfo,CharSequence,Throwable";
+      finally1 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally1 = "void,MethodInfo,Throwable,int,long";
+      finally1 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally1 = "void,MethodInfo,Serializable,int,long";
+      finally1 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally1(@JoinPoint MethodInfo joinPoint,
+   public Object finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally1 = "Object,MethodInfo,Throwable,long";
+      finally1 = "Object,MethodExecution,Throwable,long";
       return "finally1";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally1 = "void,MethodInfo,Throwable,int";
+      finally1 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally1(@JoinPoint MethodInfo joinPoint,
+   public String finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally1 = "String,MethodInfo,Serializable,int";
+      finally1 = "String,MethodExecution,Serializable,int";
       return "finally1";
    }
    
-   public Object finally1(@JoinPoint MethodInfo joinPoint,
+   public Object finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally1 = "Object,MethodInfo,Serializable,long";
+      finally1 = "Object,MethodExecution,Serializable,long";
       return "finally1";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally1 = "void,MethodInfo,Throwable,Object[]";
+      finally1 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally1 = "void,MethodInfo,Throwable,Object";
+      finally1 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally1 = "void,MethodInfo,Serializable,Object[]";
+      finally1 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally1 = "void,MethodInfo,Serializable,Object";
+      finally1 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally1 = "void,MethodInfo,Throwable";
+      finally1 = "void,MethodExecution,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint,
+   public void finally1(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally1 = "void,MethodInfo,Serializable";
+      finally1 = "void,MethodExecution,Serializable";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally1(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally1 = "void,MethodInfo,int,long";
+      finally1 = "void,MethodExecution,int,long";
    }
    
-   public String finally1(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally1(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally1 = "String,MethodInfo,long";
+      finally1 = "String,MethodExecution,long";
       return "finally1";
    }
    
-   public Object finally1(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally1(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally1 = "Object,MethodInfo,int";
+      finally1 = "Object,MethodExecution,int";
       return "finally1";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally1(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally1 = "void,MethodInfo,Object[]";
+      finally1 = "void,MethodExecution,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally1(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally1 = "void,MethodInfo,Object";
+      finally1 = "void,MethodExecution,Object";
    }
    
-   public void finally1(@JoinPoint MethodInfo joinPoint)
+   public void finally1(@JoinPoint MethodExecution joinPoint)
    {
-      finally1 = "void,MethodInfo";
+      finally1 = "void,MethodExecution";
    }
    
    public void finally1(@Return String valueReturned,
@@ -636,231 +636,231 @@
    
    /* FINALLY2 ADVICE */
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1, @Arg long arg2)
    {
-      finally2 = "void,MethodInfo,String,Serializable,int,long";
+      finally2 = "void,MethodExecution,String,Serializable,int,long";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1, @Arg long arg2)
    {
-      finally2 = "void,MethodInfo,CharSequence,Throwable,int,long";
+      finally2 = "void,MethodExecution,CharSequence,Throwable,int,long";
    }
    
-   public String finally2(@JoinPoint MethodInfo joinPoint,
+   public String finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally2 = "String,MethodInfo,String,Throwable,int";
+      finally2 = "String,MethodExecution,String,Throwable,int";
       return "finally2";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally2 = "void,MethodInfo,String,Throwable,long";
+      finally2 = "void,MethodExecution,String,Throwable,long";
    }
    
-   public String finally2(@JoinPoint MethodInfo joinPoint,
+   public String finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg long arg2)
    {
-      finally2 = "String,MethodInfo,String,Serializable,long";
+      finally2 = "String,MethodExecution,String,Serializable,long";
       return "finally2";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1)
    {
-      finally2 = "void,MethodInfo,String,Serializable,int";
+      finally2 = "void,MethodExecution,String,Serializable,int";
    }
    
-   public Object finally2(@JoinPoint MethodInfo joinPoint,
+   public Object finally2(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally2 = "Object,MethodInfo,CharSequence,Throwable,int";
+      finally2 = "Object,MethodExecution,CharSequence,Throwable,int";
       return "finally2";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally2 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally2 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally2 = "void,MethodInfo,String,Throwable,Object[]";
+      finally2 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally2 = "void,MethodInfo,String,Throwable,Object";
+      finally2 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally2 = "void,MethodInfo,String,Serializable,Object[]";
+      finally2 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally2 = "void,MethodInfo,String,Serializable,Object";
+      finally2 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally2 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally2 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally2 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally2 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally2 = "void,MethodInfo,String,Throwable";
+      finally2 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally2 = "void,MethodInfo,String,Serializable";
+      finally2 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally2 = "void,MethodInfo,CharSequence,Throwable";
+      finally2 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally2 = "void,MethodInfo,Throwable,int,long";
+      finally2 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally2 = "void,MethodInfo,Serializable,int,long";
+      finally2 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally2(@JoinPoint MethodInfo joinPoint,
+   public Object finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally2 = "Object,MethodInfo,Throwable,long";
+      finally2 = "Object,MethodExecution,Throwable,long";
       return "finally2";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally2 = "void,MethodInfo,Throwable,int";
+      finally2 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally2(@JoinPoint MethodInfo joinPoint,
+   public String finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally2 = "String,MethodInfo,Serializable,int";
+      finally2 = "String,MethodExecution,Serializable,int";
       return "finally2";
    }
    
-   public Object finally2(@JoinPoint MethodInfo joinPoint,
+   public Object finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally2 = "Object,MethodInfo,Serializable,long";
+      finally2 = "Object,MethodExecution,Serializable,long";
       return "finally2";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally2 = "void,MethodInfo,Throwable,Object[]";
+      finally2 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally2 = "void,MethodInfo,Throwable,Object";
+      finally2 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally2 = "void,MethodInfo,Serializable,Object[]";
+      finally2 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally2 = "void,MethodInfo,Serializable,Object";
+      finally2 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally2 = "void,MethodInfo,Throwable";
+      finally2 = "void,MethodExecution,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint,
+   public void finally2(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally2 = "void,MethodInfo,Serializable";
+      finally2 = "void,MethodExecution,Serializable";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally2(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally2 = "void,MethodInfo,int,long";
+      finally2 = "void,MethodExecution,int,long";
    }
    
-   public String finally2(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally2(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally2 = "String,MethodInfo,long";
+      finally2 = "String,MethodExecution,long";
       return "finally2";
    }
    
-   public Object finally2(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally2(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally2 = "Object,MethodInfo,int";
+      finally2 = "Object,MethodExecution,int";
       return "finally2";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally2(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally2 = "void,MethodInfo,Object[]";
+      finally2 = "void,MethodExecution,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally2(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally2 = "void,MethodInfo,Object";
+      finally2 = "void,MethodExecution,Object";
    }
    
-   public void finally2(@JoinPoint MethodInfo joinPoint)
+   public void finally2(@JoinPoint MethodExecution joinPoint)
    {
-      finally2 = "void,MethodInfo";
+      finally2 = "void,MethodExecution";
    }
    
    public void finally2(@Return String valueReturned,
@@ -1073,224 +1073,224 @@
    
    /* FINALLY3 ADVICE */
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1, @Arg long arg2)
    {
-      finally3 = "void,MethodInfo,CharSequence,Throwable,int,long";
+      finally3 = "void,MethodExecution,CharSequence,Throwable,int,long";
    }
    
-   public String finally3(@JoinPoint MethodInfo joinPoint,
+   public String finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally3 = "String,MethodInfo,String,Throwable,int";
+      finally3 = "String,MethodExecution,String,Throwable,int";
       return "finally3";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally3 = "void,MethodInfo,String,Throwable,long";
+      finally3 = "void,MethodExecution,String,Throwable,long";
    }
    
-   public String finally3(@JoinPoint MethodInfo joinPoint,
+   public String finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg long arg2)
    {
-      finally3 = "String,MethodInfo,String,Serializable,long";
+      finally3 = "String,MethodExecution,String,Serializable,long";
       return "finally3";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1)
    {
-      finally3 = "void,MethodInfo,String,Serializable,int";
+      finally3 = "void,MethodExecution,String,Serializable,int";
    }
    
-   public Object finally3(@JoinPoint MethodInfo joinPoint,
+   public Object finally3(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally3 = "Object,MethodInfo,CharSequence,Throwable,int";
+      finally3 = "Object,MethodExecution,CharSequence,Throwable,int";
       return "finally3";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally3 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally3 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally3 = "void,MethodInfo,String,Throwable,Object[]";
+      finally3 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally3 = "void,MethodInfo,String,Throwable,Object";
+      finally3 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally3 = "void,MethodInfo,String,Serializable,Object[]";
+      finally3 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally3 = "void,MethodInfo,String,Serializable,Object";
+      finally3 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally3 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally3 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally3 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally3 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally3 = "void,MethodInfo,String,Throwable";
+      finally3 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally3 = "void,MethodInfo,String,Serializable";
+      finally3 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally3 = "void,MethodInfo,CharSequence,Throwable";
+      finally3 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally3 = "void,MethodInfo,Throwable,int,long";
+      finally3 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally3 = "void,MethodInfo,Serializable,int,long";
+      finally3 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally3(@JoinPoint MethodInfo joinPoint,
+   public Object finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally3 = "Object,MethodInfo,Throwable,long";
+      finally3 = "Object,MethodExecution,Throwable,long";
       return "finally3";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally3 = "void,MethodInfo,Throwable,int";
+      finally3 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally3(@JoinPoint MethodInfo joinPoint,
+   public String finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally3 = "String,MethodInfo,Serializable,int";
+      finally3 = "String,MethodExecution,Serializable,int";
       return "finally3";
    }
    
-   public Object finally3(@JoinPoint MethodInfo joinPoint,
+   public Object finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally3 = "Object,MethodInfo,Serializable,long";
+      finally3 = "Object,MethodExecution,Serializable,long";
       return "finally3";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally3 = "void,MethodInfo,Throwable,Object[]";
+      finally3 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally3 = "void,MethodInfo,Throwable,Object";
+      finally3 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally3 = "void,MethodInfo,Serializable,Object[]";
+      finally3 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally3 = "void,MethodInfo,Serializable,Object";
+      finally3 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally3 = "void,MethodInfo,Throwable";
+      finally3 = "void,MethodExecution,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint,
+   public void finally3(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally3 = "void,MethodInfo,Serializable";
+      finally3 = "void,MethodExecution,Serializable";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally3(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally3 = "void,MethodInfo,int,long";
+      finally3 = "void,MethodExecution,int,long";
    }
    
-   public String finally3(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally3(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally3 = "String,MethodInfo,long";
+      finally3 = "String,MethodExecution,long";
       return "finally3";
    }
    
-   public Object finally3(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally3(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally3 = "Object,MethodInfo,int";
+      finally3 = "Object,MethodExecution,int";
       return "finally3";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally3(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally3 = "void,MethodInfo,Object[]";
+      finally3 = "void,MethodExecution,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally3(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally3 = "void,MethodInfo,Object";
+      finally3 = "void,MethodExecution,Object";
    }
    
-   public void finally3(@JoinPoint MethodInfo joinPoint)
+   public void finally3(@JoinPoint MethodExecution joinPoint)
    {
-      finally3 = "void,MethodInfo";
+      finally3 = "void,MethodExecution";
    }
    
    public void finally3(@Return String valueReturned,
@@ -1503,217 +1503,217 @@
    
    /* FINALLY4 ADVICE */
    
-   public String finally4(@JoinPoint MethodInfo joinPoint,
+   public String finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally4 = "String,MethodInfo,String,Throwable,int";
+      finally4 = "String,MethodExecution,String,Throwable,int";
       return "finally4";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally4 = "void,MethodInfo,String,Throwable,long";
+      finally4 = "void,MethodExecution,String,Throwable,long";
    }
    
-   public String finally4(@JoinPoint MethodInfo joinPoint,
+   public String finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg long arg2)
    {
-      finally4 = "String,MethodInfo,String,Serializable,long";
+      finally4 = "String,MethodExecution,String,Serializable,long";
       return "finally4";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1)
    {
-      finally4 = "void,MethodInfo,String,Serializable,int";
+      finally4 = "void,MethodExecution,String,Serializable,int";
    }
    
-   public Object finally4(@JoinPoint MethodInfo joinPoint,
+   public Object finally4(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally4 = "Object,MethodInfo,CharSequence,Throwable,int";
+      finally4 = "Object,MethodExecution,CharSequence,Throwable,int";
       return "finally4";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally4 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally4 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally4 = "void,MethodInfo,String,Throwable,Object[]";
+      finally4 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally4 = "void,MethodInfo,String,Throwable,Object";
+      finally4 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally4 = "void,MethodInfo,String,Serializable,Object[]";
+      finally4 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally4 = "void,MethodInfo,String,Serializable,Object";
+      finally4 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally4 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally4 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally4 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally4 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally4 = "void,MethodInfo,String,Throwable";
+      finally4 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally4 = "void,MethodInfo,String,Serializable";
+      finally4 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally4 = "void,MethodInfo,CharSequence,Throwable";
+      finally4 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally4 = "void,MethodInfo,Throwable,int,long";
+      finally4 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally4 = "void,MethodInfo,Serializable,int,long";
+      finally4 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally4(@JoinPoint MethodInfo joinPoint,
+   public Object finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally4 = "Object,MethodInfo,Throwable,long";
+      finally4 = "Object,MethodExecution,Throwable,long";
       return "finally4";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally4 = "void,MethodInfo,Throwable,int";
+      finally4 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally4(@JoinPoint MethodInfo joinPoint,
+   public String finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally4 = "String,MethodInfo,Serializable,int";
+      finally4 = "String,MethodExecution,Serializable,int";
       return "finally4";
    }
    
-   public Object finally4(@JoinPoint MethodInfo joinPoint,
+   public Object finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally4 = "Object,MethodInfo,Serializable,long";
+      finally4 = "Object,MethodExecution,Serializable,long";
       return "finally4";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally4 = "void,MethodInfo,Throwable,Object[]";
+      finally4 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally4 = "void,MethodInfo,Throwable,Object";
+      finally4 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally4 = "void,MethodInfo,Serializable,Object[]";
+      finally4 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally4 = "void,MethodInfo,Serializable,Object";
+      finally4 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally4 = "void,MethodInfo,Throwable";
+      finally4 = "void,MethodExecution,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint,
+   public void finally4(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally4 = "void,MethodInfo,Serializable";
+      finally4 = "void,MethodExecution,Serializable";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally4(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally4 = "void,MethodInfo,int,long";
+      finally4 = "void,MethodExecution,int,long";
    }
    
-   public String finally4(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally4(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally4 = "String,MethodInfo,long";
+      finally4 = "String,MethodExecution,long";
       return "finally4";
    }
    
-   public Object finally4(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally4(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally4 = "Object,MethodInfo,int";
+      finally4 = "Object,MethodExecution,int";
       return "finally4";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally4(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally4 = "void,MethodInfo,Object[]";
+      finally4 = "void,MethodExecution,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally4(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally4 = "void,MethodInfo,Object";
+      finally4 = "void,MethodExecution,Object";
    }
    
-   public void finally4(@JoinPoint MethodInfo joinPoint)
+   public void finally4(@JoinPoint MethodExecution joinPoint)
    {
-      finally4 = "void,MethodInfo";
+      finally4 = "void,MethodExecution";
    }
    
    public void finally4(@Return String valueReturned,
@@ -1926,209 +1926,209 @@
    
    /* FINALLY5 ADVICE */
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally5 = "void,MethodInfo,String,Throwable,long";
+      finally5 = "void,MethodExecution,String,Throwable,long";
    }
    
-   public String finally5(@JoinPoint MethodInfo joinPoint,
+   public String finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg long arg2)
    {
-      finally5 = "String,MethodInfo,String,Serializable,long";
+      finally5 = "String,MethodExecution,String,Serializable,long";
       return "finally5";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1)
    {
-      finally5 = "void,MethodInfo,String,Serializable,int";
+      finally5 = "void,MethodExecution,String,Serializable,int";
    }
    
-   public Object finally5(@JoinPoint MethodInfo joinPoint,
+   public Object finally5(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally5 = "Object,MethodInfo,CharSequence,Throwable,int";
+      finally5 = "Object,MethodExecution,CharSequence,Throwable,int";
       return "finally5";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally5 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally5 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally5 = "void,MethodInfo,String,Throwable,Object[]";
+      finally5 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally5 = "void,MethodInfo,String,Throwable,Object";
+      finally5 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally5 = "void,MethodInfo,String,Serializable,Object[]";
+      finally5 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally5 = "void,MethodInfo,String,Serializable,Object";
+      finally5 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally5 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally5 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally5 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally5 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally5 = "void,MethodInfo,String,Throwable";
+      finally5 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally5 = "void,MethodInfo,String,Serializable";
+      finally5 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally5 = "void,MethodInfo,CharSequence,Throwable";
+      finally5 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally5 = "void,MethodInfo,Throwable,int,long";
+      finally5 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally5 = "void,MethodInfo,Serializable,int,long";
+      finally5 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally5(@JoinPoint MethodInfo joinPoint,
+   public Object finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally5 = "Object,MethodInfo,Throwable,long";
+      finally5 = "Object,MethodExecution,Throwable,long";
       return "finally5";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally5 = "void,MethodInfo,Throwable,int";
+      finally5 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally5(@JoinPoint MethodInfo joinPoint,
+   public String finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally5 = "String,MethodInfo,Serializable,int";
+      finally5 = "String,MethodExecution,Serializable,int";
       return "finally5";
    }
    
-   public Object finally5(@JoinPoint MethodInfo joinPoint,
+   public Object finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally5 = "Object,MethodInfo,Serializable,long";
+      finally5 = "Object,MethodExecution,Serializable,long";
       return "finally5";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally5 = "void,MethodInfo,Throwable,Object[]";
+      finally5 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally5 = "void,MethodInfo,Throwable,Object";
+      finally5 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally5 = "void,MethodInfo,Serializable,Object[]";
+      finally5 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally5 = "void,MethodInfo,Serializable,Object";
+      finally5 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally5 = "void,MethodInfo,Throwable";
+      finally5 = "void,MethodExecution,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint,
+   public void finally5(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally5 = "void,MethodInfo,Serializable";
+      finally5 = "void,MethodExecution,Serializable";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally5(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally5 = "void,MethodInfo,int,long";
+      finally5 = "void,MethodExecution,int,long";
    }
    
-   public String finally5(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally5(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally5 = "String,MethodInfo,long";
+      finally5 = "String,MethodExecution,long";
       return "finally5";
    }
    
-   public Object finally5(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally5(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally5 = "Object,MethodInfo,int";
+      finally5 = "Object,MethodExecution,int";
       return "finally5";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally5(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally5 = "void,MethodInfo,Object[]";
+      finally5 = "void,MethodExecution,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally5(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally5 = "void,MethodInfo,Object";
+      finally5 = "void,MethodExecution,Object";
    }
    
-   public void finally5(@JoinPoint MethodInfo joinPoint)
+   public void finally5(@JoinPoint MethodExecution joinPoint)
    {
-      finally5 = "void,MethodInfo";
+      finally5 = "void,MethodExecution";
    }
    
    public void finally5(@Return String valueReturned,
@@ -2341,202 +2341,202 @@
    
    /* FINALLY6 ADVICE */
    
-   public String finally6(@JoinPoint MethodInfo joinPoint,
+   public String finally6(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg long arg2)
    {
-      finally6 = "String,MethodInfo,String,Serializable,long";
+      finally6 = "String,MethodExecution,String,Serializable,long";
       return "finally6";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1)
    {
-      finally6 = "void,MethodInfo,String,Serializable,int";
+      finally6 = "void,MethodExecution,String,Serializable,int";
    }
    
-   public Object finally6(@JoinPoint MethodInfo joinPoint,
+   public Object finally6(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally6 = "Object,MethodInfo,CharSequence,Throwable,int";
+      finally6 = "Object,MethodExecution,CharSequence,Throwable,int";
       return "finally6";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally6 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally6 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally6 = "void,MethodInfo,String,Throwable,Object[]";
+      finally6 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally6 = "void,MethodInfo,String,Throwable,Object";
+      finally6 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally6 = "void,MethodInfo,String,Serializable,Object[]";
+      finally6 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally6 = "void,MethodInfo,String,Serializable,Object";
+      finally6 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally6 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally6 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally6 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally6 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally6 = "void,MethodInfo,String,Throwable";
+      finally6 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally6 = "void,MethodInfo,String,Serializable";
+      finally6 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally6 = "void,MethodInfo,CharSequence,Throwable";
+      finally6 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally6 = "void,MethodInfo,Throwable,int,long";
+      finally6 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally6 = "void,MethodInfo,Serializable,int,long";
+      finally6 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally6(@JoinPoint MethodInfo joinPoint,
+   public Object finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally6 = "Object,MethodInfo,Throwable,long";
+      finally6 = "Object,MethodExecution,Throwable,long";
       return "finally6";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally6 = "void,MethodInfo,Throwable,int";
+      finally6 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally6(@JoinPoint MethodInfo joinPoint,
+   public String finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally6 = "String,MethodInfo,Serializable,int";
+      finally6 = "String,MethodExecution,Serializable,int";
       return "finally6";
    }
    
-   public Object finally6(@JoinPoint MethodInfo joinPoint,
+   public Object finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally6 = "Object,MethodInfo,Serializable,long";
+      finally6 = "Object,MethodExecution,Serializable,long";
       return "finally6";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally6 = "void,MethodInfo,Throwable,Object[]";
+      finally6 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally6 = "void,MethodInfo,Throwable,Object";
+      finally6 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally6 = "void,MethodInfo,Serializable,Object[]";
+      finally6 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally6 = "void,MethodInfo,Serializable,Object";
+      finally6 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally6 = "void,MethodInfo,Throwable";
+      finally6 = "void,MethodExecution,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint,
+   public void finally6(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally6 = "void,MethodInfo,Serializable";
+      finally6 = "void,MethodExecution,Serializable";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally6(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally6 = "void,MethodInfo,int,long";
+      finally6 = "void,MethodExecution,int,long";
    }
    
-   public String finally6(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally6(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally6 = "String,MethodInfo,long";
+      finally6 = "String,MethodExecution,long";
       return "finally6";
    }
    
-   public Object finally6(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally6(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally6 = "Object,MethodInfo,int";
+      finally6 = "Object,MethodExecution,int";
       return "finally6";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally6(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally6 = "void,MethodInfo,Object[]";
+      finally6 = "void,MethodExecution,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally6(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally6 = "void,MethodInfo,Object";
+      finally6 = "void,MethodExecution,Object";
    }
    
-   public void finally6(@JoinPoint MethodInfo joinPoint)
+   public void finally6(@JoinPoint MethodExecution joinPoint)
    {
-      finally6 = "void,MethodInfo";
+      finally6 = "void,MethodExecution";
    }
    
    public void finally6(@Return String valueReturned,
@@ -2749,194 +2749,194 @@
    
    /* FINALLY7 ADVICE */
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Arg int arg1)
    {
-      finally7 = "void,MethodInfo,String,Serializable,int";
+      finally7 = "void,MethodExecution,String,Serializable,int";
    }
    
-   public Object finally7(@JoinPoint MethodInfo joinPoint,
+   public Object finally7(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally7 = "Object,MethodInfo,CharSequence,Throwable,int";
+      finally7 = "Object,MethodExecution,CharSequence,Throwable,int";
       return "finally7";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally7 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally7 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally7 = "void,MethodInfo,String,Throwable,Object[]";
+      finally7 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally7 = "void,MethodInfo,String,Throwable,Object";
+      finally7 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally7 = "void,MethodInfo,String,Serializable,Object[]";
+      finally7 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally7 = "void,MethodInfo,String,Serializable,Object";
+      finally7 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally7 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally7 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally7 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally7 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally7 = "void,MethodInfo,String,Throwable";
+      finally7 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally7 = "void,MethodInfo,String,Serializable";
+      finally7 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally7 = "void,MethodInfo,CharSequence,Throwable";
+      finally7 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally7 = "void,MethodInfo,Throwable,int,long";
+      finally7 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally7 = "void,MethodInfo,Serializable,int,long";
+      finally7 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally7(@JoinPoint MethodInfo joinPoint,
+   public Object finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally7 = "Object,MethodInfo,Throwable,long";
+      finally7 = "Object,MethodExecution,Throwable,long";
       return "finally7";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally7 = "void,MethodInfo,Throwable,int";
+      finally7 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally7(@JoinPoint MethodInfo joinPoint,
+   public String finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally7 = "String,MethodInfo,Serializable,int";
+      finally7 = "String,MethodExecution,Serializable,int";
       return "finally7";
    }
    
-   public Object finally7(@JoinPoint MethodInfo joinPoint,
+   public Object finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally7 = "Object,MethodInfo,Serializable,long";
+      finally7 = "Object,MethodExecution,Serializable,long";
       return "finally7";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally7 = "void,MethodInfo,Throwable,Object[]";
+      finally7 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally7 = "void,MethodInfo,Throwable,Object";
+      finally7 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally7 = "void,MethodInfo,Serializable,Object[]";
+      finally7 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally7 = "void,MethodInfo,Serializable,Object";
+      finally7 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally7 = "void,MethodInfo,Throwable";
+      finally7 = "void,MethodExecution,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint,
+   public void finally7(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally7 = "void,MethodInfo,Serializable";
+      finally7 = "void,MethodExecution,Serializable";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally7(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally7 = "void,MethodInfo,int,long";
+      finally7 = "void,MethodExecution,int,long";
    }
    
-   public String finally7(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally7(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally7 = "String,MethodInfo,long";
+      finally7 = "String,MethodExecution,long";
       return "finally7";
    }
    
-   public Object finally7(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally7(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally7 = "Object,MethodInfo,int";
+      finally7 = "Object,MethodExecution,int";
       return "finally7";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally7(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally7 = "void,MethodInfo,Object[]";
+      finally7 = "void,MethodExecution,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally7(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally7 = "void,MethodInfo,Object";
+      finally7 = "void,MethodExecution,Object";
    }
    
-   public void finally7(@JoinPoint MethodInfo joinPoint)
+   public void finally7(@JoinPoint MethodExecution joinPoint)
    {
-      finally7 = "void,MethodInfo";
+      finally7 = "void,MethodExecution";
    }
    
    public void finally7(@Return String valueReturned,
@@ -3149,187 +3149,187 @@
    
    /* FINALLY8 ADVICE */
    
-   public Object finally8(@JoinPoint MethodInfo joinPoint,
+   public Object finally8(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg int arg1)
    {
-      finally8 = "Object,MethodInfo,CharSequence,Throwable,int";
+      finally8 = "Object,MethodExecution,CharSequence,Throwable,int";
       return "finally8";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally8 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally8 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally8 = "void,MethodInfo,String,Throwable,Object[]";
+      finally8 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally8 = "void,MethodInfo,String,Throwable,Object";
+      finally8 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally8 = "void,MethodInfo,String,Serializable,Object[]";
+      finally8 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally8 = "void,MethodInfo,String,Serializable,Object";
+      finally8 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally8 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally8 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally8 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally8 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally8 = "void,MethodInfo,String,Throwable";
+      finally8 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally8 = "void,MethodInfo,String,Serializable";
+      finally8 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally8 = "void,MethodInfo,CharSequence,Throwable";
+      finally8 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally8 = "void,MethodInfo,Throwable,int,long";
+      finally8 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally8 = "void,MethodInfo,Serializable,int,long";
+      finally8 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally8(@JoinPoint MethodInfo joinPoint,
+   public Object finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally8 = "Object,MethodInfo,Throwable,long";
+      finally8 = "Object,MethodExecution,Throwable,long";
       return "finally8";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally8 = "void,MethodInfo,Throwable,int";
+      finally8 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally8(@JoinPoint MethodInfo joinPoint,
+   public String finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally8 = "String,MethodInfo,Serializable,int";
+      finally8 = "String,MethodExecution,Serializable,int";
       return "finally8";
    }
    
-   public Object finally8(@JoinPoint MethodInfo joinPoint,
+   public Object finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally8 = "Object,MethodInfo,Serializable,long";
+      finally8 = "Object,MethodExecution,Serializable,long";
       return "finally8";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally8 = "void,MethodInfo,Throwable,Object[]";
+      finally8 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally8 = "void,MethodInfo,Throwable,Object";
+      finally8 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally8 = "void,MethodInfo,Serializable,Object[]";
+      finally8 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally8 = "void,MethodInfo,Serializable,Object";
+      finally8 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally8 = "void,MethodInfo,Throwable";
+      finally8 = "void,MethodExecution,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint,
+   public void finally8(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally8 = "void,MethodInfo,Serializable";
+      finally8 = "void,MethodExecution,Serializable";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally8(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally8 = "void,MethodInfo,int,long";
+      finally8 = "void,MethodExecution,int,long";
    }
    
-   public String finally8(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally8(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally8 = "String,MethodInfo,long";
+      finally8 = "String,MethodExecution,long";
       return "finally8";
    }
    
-   public Object finally8(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally8(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally8 = "Object,MethodInfo,int";
+      finally8 = "Object,MethodExecution,int";
       return "finally8";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally8(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally8 = "void,MethodInfo,Object[]";
+      finally8 = "void,MethodExecution,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally8(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally8 = "void,MethodInfo,Object";
+      finally8 = "void,MethodExecution,Object";
    }
    
-   public void finally8(@JoinPoint MethodInfo joinPoint)
+   public void finally8(@JoinPoint MethodExecution joinPoint)
    {
-      finally8 = "void,MethodInfo";
+      finally8 = "void,MethodExecution";
    }
    
    public void finally8(@Return String valueReturned,
@@ -3542,179 +3542,179 @@
    
    /* FINALLY9 ADVICE */
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Arg long arg2)
    {
-      finally9 = "void,MethodInfo,CharSequence,Throwable,long";
+      finally9 = "void,MethodExecution,CharSequence,Throwable,long";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally9 = "void,MethodInfo,String,Throwable,Object[]";
+      finally9 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally9 = "void,MethodInfo,String,Throwable,Object";
+      finally9 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally9 = "void,MethodInfo,String,Serializable,Object[]";
+      finally9 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally9 = "void,MethodInfo,String,Serializable,Object";
+      finally9 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally9 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally9 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally9 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally9 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally9 = "void,MethodInfo,String,Throwable";
+      finally9 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally9 = "void,MethodInfo,String,Serializable";
+      finally9 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally9 = "void,MethodInfo,CharSequence,Throwable";
+      finally9 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally9 = "void,MethodInfo,Throwable,int,long";
+      finally9 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally9 = "void,MethodInfo,Serializable,int,long";
+      finally9 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally9(@JoinPoint MethodInfo joinPoint,
+   public Object finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally9 = "Object,MethodInfo,Throwable,long";
+      finally9 = "Object,MethodExecution,Throwable,long";
       return "finally9";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally9 = "void,MethodInfo,Throwable,int";
+      finally9 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally9(@JoinPoint MethodInfo joinPoint,
+   public String finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally9 = "String,MethodInfo,Serializable,int";
+      finally9 = "String,MethodExecution,Serializable,int";
       return "finally9";
    }
    
-   public Object finally9(@JoinPoint MethodInfo joinPoint,
+   public Object finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally9 = "Object,MethodInfo,Serializable,long";
+      finally9 = "Object,MethodExecution,Serializable,long";
       return "finally9";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally9 = "void,MethodInfo,Throwable,Object[]";
+      finally9 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally9 = "void,MethodInfo,Throwable,Object";
+      finally9 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally9 = "void,MethodInfo,Serializable,Object[]";
+      finally9 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally9 = "void,MethodInfo,Serializable,Object";
+      finally9 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally9 = "void,MethodInfo,Throwable";
+      finally9 = "void,MethodExecution,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint,
+   public void finally9(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally9 = "void,MethodInfo,Serializable";
+      finally9 = "void,MethodExecution,Serializable";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally9(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally9 = "void,MethodInfo,int,long";
+      finally9 = "void,MethodExecution,int,long";
    }
    
-   public String finally9(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally9(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally9 = "String,MethodInfo,long";
+      finally9 = "String,MethodExecution,long";
       return "finally9";
    }
    
-   public Object finally9(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally9(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally9 = "Object,MethodInfo,int";
+      finally9 = "Object,MethodExecution,int";
       return "finally9";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally9(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally9 = "void,MethodInfo,Object[]";
+      finally9 = "void,MethodExecution,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally9(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally9 = "void,MethodInfo,Object";
+      finally9 = "void,MethodExecution,Object";
    }
    
-   public void finally9(@JoinPoint MethodInfo joinPoint)
+   public void finally9(@JoinPoint MethodExecution joinPoint)
    {
-      finally9 = "void,MethodInfo";
+      finally9 = "void,MethodExecution";
    }
    
    public void finally9(@Return String valueReturned,
@@ -3927,172 +3927,172 @@
    
    /* FINALLY10 ADVICE */
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally10 = "void,MethodInfo,String,Throwable,Object[]";
+      finally10 = "void,MethodExecution,String,Throwable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally10 = "void,MethodInfo,String,Throwable,Object";
+      finally10 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally10 = "void,MethodInfo,String,Serializable,Object[]";
+      finally10 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally10 = "void,MethodInfo,String,Serializable,Object";
+      finally10 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally10 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally10 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally10 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally10 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally10 = "void,MethodInfo,String,Throwable";
+      finally10 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally10 = "void,MethodInfo,String,Serializable";
+      finally10 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally10 = "void,MethodInfo,CharSequence,Throwable";
+      finally10 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally10 = "void,MethodInfo,Throwable,int,long";
+      finally10 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally10 = "void,MethodInfo,Serializable,int,long";
+      finally10 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally10(@JoinPoint MethodInfo joinPoint,
+   public Object finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally10 = "Object,MethodInfo,Throwable,long";
+      finally10 = "Object,MethodExecution,Throwable,long";
       return "finally10";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally10 = "void,MethodInfo,Throwable,int";
+      finally10 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally10(@JoinPoint MethodInfo joinPoint,
+   public String finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally10 = "String,MethodInfo,Serializable,int";
+      finally10 = "String,MethodExecution,Serializable,int";
       return "finally10";
    }
    
-   public Object finally10(@JoinPoint MethodInfo joinPoint,
+   public Object finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally10 = "Object,MethodInfo,Serializable,long";
+      finally10 = "Object,MethodExecution,Serializable,long";
       return "finally10";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally10 = "void,MethodInfo,Throwable,Object[]";
+      finally10 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally10 = "void,MethodInfo,Throwable,Object";
+      finally10 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally10 = "void,MethodInfo,Serializable,Object[]";
+      finally10 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally10 = "void,MethodInfo,Serializable,Object";
+      finally10 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally10 = "void,MethodInfo,Throwable";
+      finally10 = "void,MethodExecution,Throwable";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint,
+   public void finally10(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally10 = "void,MethodInfo,Serializable";
+      finally10 = "void,MethodExecution,Serializable";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally10(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally10 = "void,MethodInfo,int,long";
+      finally10 = "void,MethodExecution,int,long";
    }
    
-   public String finally10(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally10(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally10 = "String,MethodInfo,long";
+      finally10 = "String,MethodExecution,long";
       return "finally10";
    }
    
-   public Object finally10(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally10(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally10 = "Object,MethodInfo,int";
+      finally10 = "Object,MethodExecution,int";
       return "finally10";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally10(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally10 = "void,MethodInfo,Object[]";
+      finally10 = "void,MethodExecution,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally10(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally10 = "void,MethodInfo,Object";
+      finally10 = "void,MethodExecution,Object";
    }
    
-   public void finally10(@JoinPoint MethodInfo joinPoint)
+   public void finally10(@JoinPoint MethodExecution joinPoint)
    {
-      finally10 = "void,MethodInfo";
+      finally10 = "void,MethodExecution";
    }
    
    public void finally10(@Return String valueReturned,
@@ -4305,165 +4305,165 @@
    
    /* FINALLY11 ADVICE */
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally11 = "void,MethodInfo,String,Throwable,Object";
+      finally11 = "void,MethodExecution,String,Throwable,Object";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally11 = "void,MethodInfo,String,Serializable,Object[]";
+      finally11 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally11 = "void,MethodInfo,String,Serializable,Object";
+      finally11 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally11 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally11 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally11 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally11 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally11 = "void,MethodInfo,String,Throwable";
+      finally11 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally11 = "void,MethodInfo,String,Serializable";
+      finally11 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally11 = "void,MethodInfo,CharSequence,Throwable";
+      finally11 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally11 = "void,MethodInfo,Throwable,int,long";
+      finally11 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally11 = "void,MethodInfo,Serializable,int,long";
+      finally11 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally11(@JoinPoint MethodInfo joinPoint,
+   public Object finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally11 = "Object,MethodInfo,Throwable,long";
+      finally11 = "Object,MethodExecution,Throwable,long";
       return "finally11";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally11 = "void,MethodInfo,Throwable,int";
+      finally11 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally11(@JoinPoint MethodInfo joinPoint,
+   public String finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally11 = "String,MethodInfo,Serializable,int";
+      finally11 = "String,MethodExecution,Serializable,int";
       return "finally11";
    }
    
-   public Object finally11(@JoinPoint MethodInfo joinPoint,
+   public Object finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally11 = "Object,MethodInfo,Serializable,long";
+      finally11 = "Object,MethodExecution,Serializable,long";
       return "finally11";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally11 = "void,MethodInfo,Throwable,Object[]";
+      finally11 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally11 = "void,MethodInfo,Throwable,Object";
+      finally11 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally11 = "void,MethodInfo,Serializable,Object[]";
+      finally11 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally11 = "void,MethodInfo,Serializable,Object";
+      finally11 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally11 = "void,MethodInfo,Throwable";
+      finally11 = "void,MethodExecution,Throwable";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint,
+   public void finally11(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally11 = "void,MethodInfo,Serializable";
+      finally11 = "void,MethodExecution,Serializable";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally11(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally11 = "void,MethodInfo,int,long";
+      finally11 = "void,MethodExecution,int,long";
    }
    
-   public String finally11(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally11(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally11 = "String,MethodInfo,long";
+      finally11 = "String,MethodExecution,long";
       return "finally11";
    }
    
-   public Object finally11(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally11(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally11 = "Object,MethodInfo,int";
+      finally11 = "Object,MethodExecution,int";
       return "finally11";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally11(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally11 = "void,MethodInfo,Object[]";
+      finally11 = "void,MethodExecution,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally11(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally11 = "void,MethodInfo,Object";
+      finally11 = "void,MethodExecution,Object";
    }
    
-   public void finally11(@JoinPoint MethodInfo joinPoint)
+   public void finally11(@JoinPoint MethodExecution joinPoint)
    {
-      finally11 = "void,MethodInfo";
+      finally11 = "void,MethodExecution";
    }
    
    public void finally11(@Return String valueReturned,
@@ -4676,158 +4676,158 @@
    
    /* FINALLY12 ADVICE */
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object[] args)
    {
-      finally12 = "void,MethodInfo,String,Serializable,Object[]";
+      finally12 = "void,MethodExecution,String,Serializable,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally12 = "void,MethodInfo,String,Serializable,Object";
+      finally12 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally12 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally12 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally12 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally12 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally12 = "void,MethodInfo,String,Throwable";
+      finally12 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally12 = "void,MethodInfo,String,Serializable";
+      finally12 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally12 = "void,MethodInfo,CharSequence,Throwable";
+      finally12 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally12 = "void,MethodInfo,Throwable,int,long";
+      finally12 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally12 = "void,MethodInfo,Serializable,int,long";
+      finally12 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally12(@JoinPoint MethodInfo joinPoint,
+   public Object finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally12 = "Object,MethodInfo,Throwable,long";
+      finally12 = "Object,MethodExecution,Throwable,long";
       return "finally12";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally12 = "void,MethodInfo,Throwable,int";
+      finally12 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally12(@JoinPoint MethodInfo joinPoint,
+   public String finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally12 = "String,MethodInfo,Serializable,int";
+      finally12 = "String,MethodExecution,Serializable,int";
       return "finally12";
    }
    
-   public Object finally12(@JoinPoint MethodInfo joinPoint,
+   public Object finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally12 = "Object,MethodInfo,Serializable,long";
+      finally12 = "Object,MethodExecution,Serializable,long";
       return "finally12";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally12 = "void,MethodInfo,Throwable,Object[]";
+      finally12 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally12 = "void,MethodInfo,Throwable,Object";
+      finally12 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally12 = "void,MethodInfo,Serializable,Object[]";
+      finally12 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally12 = "void,MethodInfo,Serializable,Object";
+      finally12 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally12 = "void,MethodInfo,Throwable";
+      finally12 = "void,MethodExecution,Throwable";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint,
+   public void finally12(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally12 = "void,MethodInfo,Serializable";
+      finally12 = "void,MethodExecution,Serializable";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally12(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally12 = "void,MethodInfo,int,long";
+      finally12 = "void,MethodExecution,int,long";
    }
    
-   public String finally12(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally12(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally12 = "String,MethodInfo,long";
+      finally12 = "String,MethodExecution,long";
       return "finally12";
    }
    
-   public Object finally12(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally12(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally12 = "Object,MethodInfo,int";
+      finally12 = "Object,MethodExecution,int";
       return "finally12";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally12(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally12 = "void,MethodInfo,Object[]";
+      finally12 = "void,MethodExecution,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally12(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally12 = "void,MethodInfo,Object";
+      finally12 = "void,MethodExecution,Object";
    }
    
-   public void finally12(@JoinPoint MethodInfo joinPoint)
+   public void finally12(@JoinPoint MethodExecution joinPoint)
    {
-      finally12 = "void,MethodInfo";
+      finally12 = "void,MethodExecution";
    }
    
    public void finally12(@Return String valueReturned,
@@ -5040,151 +5040,151 @@
    
    /* FINALLY13 ADVICE */
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException,
          @Args Object args)
    {
-      finally13 = "void,MethodInfo,String,Serializable,Object";
+      finally13 = "void,MethodExecution,String,Serializable,Object";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally13 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally13 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally13 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally13 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally13 = "void,MethodInfo,String,Throwable";
+      finally13 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally13 = "void,MethodInfo,String,Serializable";
+      finally13 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally13 = "void,MethodInfo,CharSequence,Throwable";
+      finally13 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally13 = "void,MethodInfo,Throwable,int,long";
+      finally13 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally13 = "void,MethodInfo,Serializable,int,long";
+      finally13 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally13(@JoinPoint MethodInfo joinPoint,
+   public Object finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally13 = "Object,MethodInfo,Throwable,long";
+      finally13 = "Object,MethodExecution,Throwable,long";
       return "finally13";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally13 = "void,MethodInfo,Throwable,int";
+      finally13 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally13(@JoinPoint MethodInfo joinPoint,
+   public String finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally13 = "String,MethodInfo,Serializable,int";
+      finally13 = "String,MethodExecution,Serializable,int";
       return "finally13";
    }
    
-   public Object finally13(@JoinPoint MethodInfo joinPoint,
+   public Object finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally13 = "Object,MethodInfo,Serializable,long";
+      finally13 = "Object,MethodExecution,Serializable,long";
       return "finally13";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally13 = "void,MethodInfo,Throwable,Object[]";
+      finally13 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally13 = "void,MethodInfo,Throwable,Object";
+      finally13 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally13 = "void,MethodInfo,Serializable,Object[]";
+      finally13 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally13 = "void,MethodInfo,Serializable,Object";
+      finally13 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally13 = "void,MethodInfo,Throwable";
+      finally13 = "void,MethodExecution,Throwable";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint,
+   public void finally13(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally13 = "void,MethodInfo,Serializable";
+      finally13 = "void,MethodExecution,Serializable";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally13(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally13 = "void,MethodInfo,int,long";
+      finally13 = "void,MethodExecution,int,long";
    }
    
-   public String finally13(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally13(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally13 = "String,MethodInfo,long";
+      finally13 = "String,MethodExecution,long";
       return "finally13";
    }
    
-   public Object finally13(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally13(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally13 = "Object,MethodInfo,int";
+      finally13 = "Object,MethodExecution,int";
       return "finally13";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally13(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally13 = "void,MethodInfo,Object[]";
+      finally13 = "void,MethodExecution,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally13(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally13 = "void,MethodInfo,Object";
+      finally13 = "void,MethodExecution,Object";
    }
    
-   public void finally13(@JoinPoint MethodInfo joinPoint)
+   public void finally13(@JoinPoint MethodExecution joinPoint)
    {
-      finally13 = "void,MethodInfo";
+      finally13 = "void,MethodExecution";
    }
    
    public void finally13(@Return String valueReturned,
@@ -5397,144 +5397,144 @@
    
    /* FINALLY14 ADVICE */
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally14 = "void,MethodInfo,CharSequence,Throwable,Object[]";
+      finally14 = "void,MethodExecution,CharSequence,Throwable,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally14 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally14 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally14 = "void,MethodInfo,String,Throwable";
+      finally14 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally14 = "void,MethodInfo,String,Serializable";
+      finally14 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally14 = "void,MethodInfo,CharSequence,Throwable";
+      finally14 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally14 = "void,MethodInfo,Throwable,int,long";
+      finally14 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally14 = "void,MethodInfo,Serializable,int,long";
+      finally14 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally14(@JoinPoint MethodInfo joinPoint,
+   public Object finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally14 = "Object,MethodInfo,Throwable,long";
+      finally14 = "Object,MethodExecution,Throwable,long";
       return "finally14";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally14 = "void,MethodInfo,Throwable,int";
+      finally14 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally14(@JoinPoint MethodInfo joinPoint,
+   public String finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally14 = "String,MethodInfo,Serializable,int";
+      finally14 = "String,MethodExecution,Serializable,int";
       return "finally14";
    }
    
-   public Object finally14(@JoinPoint MethodInfo joinPoint,
+   public Object finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally14 = "Object,MethodInfo,Serializable,long";
+      finally14 = "Object,MethodExecution,Serializable,long";
       return "finally14";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally14 = "void,MethodInfo,Throwable,Object[]";
+      finally14 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally14 = "void,MethodInfo,Throwable,Object";
+      finally14 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally14 = "void,MethodInfo,Serializable,Object[]";
+      finally14 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally14 = "void,MethodInfo,Serializable,Object";
+      finally14 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally14 = "void,MethodInfo,Throwable";
+      finally14 = "void,MethodExecution,Throwable";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint,
+   public void finally14(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally14 = "void,MethodInfo,Serializable";
+      finally14 = "void,MethodExecution,Serializable";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally14(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally14 = "void,MethodInfo,int,long";
+      finally14 = "void,MethodExecution,int,long";
    }
    
-   public String finally14(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally14(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally14 = "String,MethodInfo,long";
+      finally14 = "String,MethodExecution,long";
       return "finally14";
    }
    
-   public Object finally14(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally14(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally14 = "Object,MethodInfo,int";
+      finally14 = "Object,MethodExecution,int";
       return "finally14";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally14(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally14 = "void,MethodInfo,Object[]";
+      finally14 = "void,MethodExecution,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally14(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally14 = "void,MethodInfo,Object";
+      finally14 = "void,MethodExecution,Object";
    }
    
-   public void finally14(@JoinPoint MethodInfo joinPoint)
+   public void finally14(@JoinPoint MethodExecution joinPoint)
    {
-      finally14 = "void,MethodInfo";
+      finally14 = "void,MethodExecution";
    }
    
    public void finally14(@Return String valueReturned,
@@ -5747,137 +5747,137 @@
    
    /* FINALLY15 ADVICE */
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException,
          @Args Object args)
    {
-      finally15 = "void,MethodInfo,CharSequence,Throwable,Object";
+      finally15 = "void,MethodExecution,CharSequence,Throwable,Object";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally15 = "void,MethodInfo,String,Throwable";
+      finally15 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally15 = "void,MethodInfo,String,Serializable";
+      finally15 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally15 = "void,MethodInfo,CharSequence,Throwable";
+      finally15 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally15 = "void,MethodInfo,Throwable,int,long";
+      finally15 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally15 = "void,MethodInfo,Serializable,int,long";
+      finally15 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally15(@JoinPoint MethodInfo joinPoint,
+   public Object finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally15 = "Object,MethodInfo,Throwable,long";
+      finally15 = "Object,MethodExecution,Throwable,long";
       return "finally15";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally15 = "void,MethodInfo,Throwable,int";
+      finally15 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally15(@JoinPoint MethodInfo joinPoint,
+   public String finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally15 = "String,MethodInfo,Serializable,int";
+      finally15 = "String,MethodExecution,Serializable,int";
       return "finally15";
    }
    
-   public Object finally15(@JoinPoint MethodInfo joinPoint,
+   public Object finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally15 = "Object,MethodInfo,Serializable,long";
+      finally15 = "Object,MethodExecution,Serializable,long";
       return "finally15";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally15 = "void,MethodInfo,Throwable,Object[]";
+      finally15 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally15 = "void,MethodInfo,Throwable,Object";
+      finally15 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally15 = "void,MethodInfo,Serializable,Object[]";
+      finally15 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally15 = "void,MethodInfo,Serializable,Object";
+      finally15 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally15 = "void,MethodInfo,Throwable";
+      finally15 = "void,MethodExecution,Throwable";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint,
+   public void finally15(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally15 = "void,MethodInfo,Serializable";
+      finally15 = "void,MethodExecution,Serializable";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally15(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally15 = "void,MethodInfo,int,long";
+      finally15 = "void,MethodExecution,int,long";
    }
    
-   public String finally15(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally15(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally15 = "String,MethodInfo,long";
+      finally15 = "String,MethodExecution,long";
       return "finally15";
    }
    
-   public Object finally15(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally15(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally15 = "Object,MethodInfo,int";
+      finally15 = "Object,MethodExecution,int";
       return "finally15";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally15(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally15 = "void,MethodInfo,Object[]";
+      finally15 = "void,MethodExecution,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally15(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally15 = "void,MethodInfo,Object";
+      finally15 = "void,MethodExecution,Object";
    }
    
-   public void finally15(@JoinPoint MethodInfo joinPoint)
+   public void finally15(@JoinPoint MethodExecution joinPoint)
    {
-      finally15 = "void,MethodInfo";
+      finally15 = "void,MethodExecution";
    }
    
    public void finally15(@Return String valueReturned,
@@ -6090,130 +6090,130 @@
    
    /* FINALLY16 ADVICE */
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Throwable thrownException)
    {
-      finally16 = "void,MethodInfo,String,Throwable";
+      finally16 = "void,MethodExecution,String,Throwable";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally16 = "void,MethodInfo,String,Serializable";
+      finally16 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally16 = "void,MethodInfo,CharSequence,Throwable";
+      finally16 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally16 = "void,MethodInfo,Throwable,int,long";
+      finally16 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally16 = "void,MethodInfo,Serializable,int,long";
+      finally16 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally16(@JoinPoint MethodInfo joinPoint,
+   public Object finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally16 = "Object,MethodInfo,Throwable,long";
+      finally16 = "Object,MethodExecution,Throwable,long";
       return "finally16";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally16 = "void,MethodInfo,Throwable,int";
+      finally16 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally16(@JoinPoint MethodInfo joinPoint,
+   public String finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally16 = "String,MethodInfo,Serializable,int";
+      finally16 = "String,MethodExecution,Serializable,int";
       return "finally16";
    }
    
-   public Object finally16(@JoinPoint MethodInfo joinPoint,
+   public Object finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally16 = "Object,MethodInfo,Serializable,long";
+      finally16 = "Object,MethodExecution,Serializable,long";
       return "finally16";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally16 = "void,MethodInfo,Throwable,Object[]";
+      finally16 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally16 = "void,MethodInfo,Throwable,Object";
+      finally16 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally16 = "void,MethodInfo,Serializable,Object[]";
+      finally16 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally16 = "void,MethodInfo,Serializable,Object";
+      finally16 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally16 = "void,MethodInfo,Throwable";
+      finally16 = "void,MethodExecution,Throwable";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint,
+   public void finally16(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally16 = "void,MethodInfo,Serializable";
+      finally16 = "void,MethodExecution,Serializable";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally16(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally16 = "void,MethodInfo,int,long";
+      finally16 = "void,MethodExecution,int,long";
    }
    
-   public String finally16(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally16(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally16 = "String,MethodInfo,long";
+      finally16 = "String,MethodExecution,long";
       return "finally16";
    }
    
-   public Object finally16(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally16(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally16 = "Object,MethodInfo,int";
+      finally16 = "Object,MethodExecution,int";
       return "finally16";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally16(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally16 = "void,MethodInfo,Object[]";
+      finally16 = "void,MethodExecution,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally16(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally16 = "void,MethodInfo,Object";
+      finally16 = "void,MethodExecution,Object";
    }
    
-   public void finally16(@JoinPoint MethodInfo joinPoint)
+   public void finally16(@JoinPoint MethodExecution joinPoint)
    {
-      finally16 = "void,MethodInfo";
+      finally16 = "void,MethodExecution";
    }
    
    public void finally16(@Return String valueReturned,
@@ -6426,124 +6426,124 @@
    
    /* FINALLY17 ADVICE */
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Return String valueReturned, @Thrown Serializable thrownException)
    {
-      finally17 = "void,MethodInfo,String,Serializable";
+      finally17 = "void,MethodExecution,String,Serializable";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally17 = "void,MethodInfo,CharSequence,Throwable";
+      finally17 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally17 = "void,MethodInfo,Throwable,int,long";
+      finally17 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally17 = "void,MethodInfo,Serializable,int,long";
+      finally17 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally17(@JoinPoint MethodInfo joinPoint,
+   public Object finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally17 = "Object,MethodInfo,Throwable,long";
+      finally17 = "Object,MethodExecution,Throwable,long";
       return "finally17";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally17 = "void,MethodInfo,Throwable,int";
+      finally17 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally17(@JoinPoint MethodInfo joinPoint,
+   public String finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally17 = "String,MethodInfo,Serializable,int";
+      finally17 = "String,MethodExecution,Serializable,int";
       return "finally17";
    }
    
-   public Object finally17(@JoinPoint MethodInfo joinPoint,
+   public Object finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally17 = "Object,MethodInfo,Serializable,long";
+      finally17 = "Object,MethodExecution,Serializable,long";
       return "finally17";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally17 = "void,MethodInfo,Throwable,Object[]";
+      finally17 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally17 = "void,MethodInfo,Throwable,Object";
+      finally17 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally17 = "void,MethodInfo,Serializable,Object[]";
+      finally17 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally17 = "void,MethodInfo,Serializable,Object";
+      finally17 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally17 = "void,MethodInfo,Throwable";
+      finally17 = "void,MethodExecution,Throwable";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint,
+   public void finally17(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally17 = "void,MethodInfo,Serializable";
+      finally17 = "void,MethodExecution,Serializable";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally17(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally17 = "void,MethodInfo,int,long";
+      finally17 = "void,MethodExecution,int,long";
    }
    
-   public String finally17(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally17(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally17 = "String,MethodInfo,long";
+      finally17 = "String,MethodExecution,long";
       return "finally17";
    }
    
-   public Object finally17(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally17(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally17 = "Object,MethodInfo,int";
+      finally17 = "Object,MethodExecution,int";
       return "finally17";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally17(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally17 = "void,MethodInfo,Object[]";
+      finally17 = "void,MethodExecution,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally17(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally17 = "void,MethodInfo,Object";
+      finally17 = "void,MethodExecution,Object";
    }
    
-   public void finally17(@JoinPoint MethodInfo joinPoint)
+   public void finally17(@JoinPoint MethodExecution joinPoint)
    {
-      finally17 = "void,MethodInfo";
+      finally17 = "void,MethodExecution";
    }
    
    public void finally17(@Return String valueReturned,
@@ -6756,118 +6756,118 @@
    
    /* FINALLY18 ADVICE */
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Return CharSequence valueReturned, @Thrown Throwable thrownException)
    {
-      finally18 = "void,MethodInfo,CharSequence,Throwable";
+      finally18 = "void,MethodExecution,CharSequence,Throwable";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally18 = "void,MethodInfo,Throwable,int,long";
+      finally18 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally18 = "void,MethodInfo,Serializable,int,long";
+      finally18 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally18(@JoinPoint MethodInfo joinPoint,
+   public Object finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally18 = "Object,MethodInfo,Throwable,long";
+      finally18 = "Object,MethodExecution,Throwable,long";
       return "finally18";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally18 = "void,MethodInfo,Throwable,int";
+      finally18 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally18(@JoinPoint MethodInfo joinPoint,
+   public String finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally18 = "String,MethodInfo,Serializable,int";
+      finally18 = "String,MethodExecution,Serializable,int";
       return "finally18";
    }
    
-   public Object finally18(@JoinPoint MethodInfo joinPoint,
+   public Object finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally18 = "Object,MethodInfo,Serializable,long";
+      finally18 = "Object,MethodExecution,Serializable,long";
       return "finally18";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally18 = "void,MethodInfo,Throwable,Object[]";
+      finally18 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally18 = "void,MethodInfo,Throwable,Object";
+      finally18 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally18 = "void,MethodInfo,Serializable,Object[]";
+      finally18 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally18 = "void,MethodInfo,Serializable,Object";
+      finally18 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally18 = "void,MethodInfo,Throwable";
+      finally18 = "void,MethodExecution,Throwable";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint,
+   public void finally18(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally18 = "void,MethodInfo,Serializable";
+      finally18 = "void,MethodExecution,Serializable";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally18(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally18 = "void,MethodInfo,int,long";
+      finally18 = "void,MethodExecution,int,long";
    }
    
-   public String finally18(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally18(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally18 = "String,MethodInfo,long";
+      finally18 = "String,MethodExecution,long";
       return "finally18";
    }
    
-   public Object finally18(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally18(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally18 = "Object,MethodInfo,int";
+      finally18 = "Object,MethodExecution,int";
       return "finally18";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally18(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally18 = "void,MethodInfo,Object[]";
+      finally18 = "void,MethodExecution,Object[]";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally18(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally18 = "void,MethodInfo,Object";
+      finally18 = "void,MethodExecution,Object";
    }
    
-   public void finally18(@JoinPoint MethodInfo joinPoint)
+   public void finally18(@JoinPoint MethodExecution joinPoint)
    {
-      finally18 = "void,MethodInfo";
+      finally18 = "void,MethodExecution";
    }
    
    public void finally18(@Return String valueReturned,
@@ -7080,112 +7080,112 @@
    
    /* FINALLY19 ADVICE */
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally19 = "void,MethodInfo,Throwable,int,long";
+      finally19 = "void,MethodExecution,Throwable,int,long";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally19 = "void,MethodInfo,Serializable,int,long";
+      finally19 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally19(@JoinPoint MethodInfo joinPoint,
+   public Object finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally19 = "Object,MethodInfo,Throwable,long";
+      finally19 = "Object,MethodExecution,Throwable,long";
       return "finally19";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally19 = "void,MethodInfo,Throwable,int";
+      finally19 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally19(@JoinPoint MethodInfo joinPoint,
+   public String finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally19 = "String,MethodInfo,Serializable,int";
+      finally19 = "String,MethodExecution,Serializable,int";
       return "finally19";
    }
    
-   public Object finally19(@JoinPoint MethodInfo joinPoint,
+   public Object finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally19 = "Object,MethodInfo,Serializable,long";
+      finally19 = "Object,MethodExecution,Serializable,long";
       return "finally19";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally19 = "void,MethodInfo,Throwable,Object[]";
+      finally19 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally19 = "void,MethodInfo,Throwable,Object";
+      finally19 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally19 = "void,MethodInfo,Serializable,Object[]";
+      finally19 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally19 = "void,MethodInfo,Serializable,Object";
+      finally19 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally19 = "void,MethodInfo,Throwable";
+      finally19 = "void,MethodExecution,Throwable";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint,
+   public void finally19(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally19 = "void,MethodInfo,Serializable";
+      finally19 = "void,MethodExecution,Serializable";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally19(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally19 = "void,MethodInfo,int,long";
+      finally19 = "void,MethodExecution,int,long";
    }
    
-   public String finally19(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally19(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally19 = "String,MethodInfo,long";
+      finally19 = "String,MethodExecution,long";
       return "finally19";
    }
    
-   public Object finally19(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally19(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally19 = "Object,MethodInfo,int";
+      finally19 = "Object,MethodExecution,int";
       return "finally19";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally19(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally19 = "void,MethodInfo,Object[]";
+      finally19 = "void,MethodExecution,Object[]";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally19(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally19 = "void,MethodInfo,Object";
+      finally19 = "void,MethodExecution,Object";
    }
    
-   public void finally19(@JoinPoint MethodInfo joinPoint)
+   public void finally19(@JoinPoint MethodExecution joinPoint)
    {
-      finally19 = "void,MethodInfo";
+      finally19 = "void,MethodExecution";
    }
    
    public void finally19(@Return String valueReturned,
@@ -7398,106 +7398,106 @@
    
    /* FINALLY20 ADVICE */
    
-   public void finally20(@JoinPoint MethodInfo joinPoint,
+   public void finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1, @Arg long arg2)
    {
-      finally20 = "void,MethodInfo,Serializable,int,long";
+      finally20 = "void,MethodExecution,Serializable,int,long";
    }
       
-   public Object finally20(@JoinPoint MethodInfo joinPoint,
+   public Object finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally20 = "Object,MethodInfo,Throwable,long";
+      finally20 = "Object,MethodExecution,Throwable,long";
       return "finally20";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint,
+   public void finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally20 = "void,MethodInfo,Throwable,int";
+      finally20 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally20(@JoinPoint MethodInfo joinPoint,
+   public String finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally20 = "String,MethodInfo,Serializable,int";
+      finally20 = "String,MethodExecution,Serializable,int";
       return "finally20";
    }
    
-   public Object finally20(@JoinPoint MethodInfo joinPoint,
+   public Object finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally20 = "Object,MethodInfo,Serializable,long";
+      finally20 = "Object,MethodExecution,Serializable,long";
       return "finally20";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint,
+   public void finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally20 = "void,MethodInfo,Throwable,Object[]";
+      finally20 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint,
+   public void finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally20 = "void,MethodInfo,Throwable,Object";
+      finally20 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint,
+   public void finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally20 = "void,MethodInfo,Serializable,Object[]";
+      finally20 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint,
+   public void finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally20 = "void,MethodInfo,Serializable,Object";
+      finally20 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint,
+   public void finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally20 = "void,MethodInfo,Throwable";
+      finally20 = "void,MethodExecution,Throwable";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint,
+   public void finally20(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally20 = "void,MethodInfo,Serializable";
+      finally20 = "void,MethodExecution,Serializable";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally20(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally20 = "void,MethodInfo,int,long";
+      finally20 = "void,MethodExecution,int,long";
    }
    
-   public String finally20(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally20(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally20 = "String,MethodInfo,long";
+      finally20 = "String,MethodExecution,long";
       return "finally20";
    }
    
-   public Object finally20(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally20(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally20 = "Object,MethodInfo,int";
+      finally20 = "Object,MethodExecution,int";
       return "finally20";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally20(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally20 = "void,MethodInfo,Object[]";
+      finally20 = "void,MethodExecution,Object[]";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally20(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally20 = "void,MethodInfo,Object";
+      finally20 = "void,MethodExecution,Object";
    }
    
-   public void finally20(@JoinPoint MethodInfo joinPoint)
+   public void finally20(@JoinPoint MethodExecution joinPoint)
    {
-      finally20 = "void,MethodInfo";
+      finally20 = "void,MethodExecution";
    }
    
    public void finally20(@Return String valueReturned,
@@ -7710,100 +7710,100 @@
    
    /* FINALLY21 ADVICE */
    
-   public Object finally21(@JoinPoint MethodInfo joinPoint,
+   public Object finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg long arg2)
    {
-      finally21 = "Object,MethodInfo,Throwable,long";
+      finally21 = "Object,MethodExecution,Throwable,long";
       return "finally21";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint,
+   public void finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally21 = "void,MethodInfo,Throwable,int";
+      finally21 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally21(@JoinPoint MethodInfo joinPoint,
+   public String finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally21 = "String,MethodInfo,Serializable,int";
+      finally21 = "String,MethodExecution,Serializable,int";
       return "finally21";
    }
    
-   public Object finally21(@JoinPoint MethodInfo joinPoint,
+   public Object finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally21 = "Object,MethodInfo,Serializable,long";
+      finally21 = "Object,MethodExecution,Serializable,long";
       return "finally21";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint,
+   public void finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally21 = "void,MethodInfo,Throwable,Object[]";
+      finally21 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint,
+   public void finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally21 = "void,MethodInfo,Throwable,Object";
+      finally21 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint,
+   public void finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally21 = "void,MethodInfo,Serializable,Object[]";
+      finally21 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint,
+   public void finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally21 = "void,MethodInfo,Serializable,Object";
+      finally21 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint,
+   public void finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally21 = "void,MethodInfo,Throwable";
+      finally21 = "void,MethodExecution,Throwable";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint,
+   public void finally21(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally21 = "void,MethodInfo,Serializable";
+      finally21 = "void,MethodExecution,Serializable";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally21(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally21 = "void,MethodInfo,int,long";
+      finally21 = "void,MethodExecution,int,long";
    }
    
-   public String finally21(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally21(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally21 = "String,MethodInfo,long";
+      finally21 = "String,MethodExecution,long";
       return "finally21";
    }
    
-   public Object finally21(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally21(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally21 = "Object,MethodInfo,int";
+      finally21 = "Object,MethodExecution,int";
       return "finally21";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally21(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally21 = "void,MethodInfo,Object[]";
+      finally21 = "void,MethodExecution,Object[]";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally21(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally21 = "void,MethodInfo,Object";
+      finally21 = "void,MethodExecution,Object";
    }
    
-   public void finally21(@JoinPoint MethodInfo joinPoint)
+   public void finally21(@JoinPoint MethodExecution joinPoint)
    {
-      finally21 = "void,MethodInfo";
+      finally21 = "void,MethodExecution";
    }
    
    public void finally21(@Return String valueReturned,
@@ -8016,93 +8016,93 @@
    
    /* FINALLY22 ADVICE */
    
-   public void finally22(@JoinPoint MethodInfo joinPoint,
+   public void finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Arg int arg1)
    {
-      finally22 = "void,MethodInfo,Throwable,int";
+      finally22 = "void,MethodExecution,Throwable,int";
    }
    
-   public String finally22(@JoinPoint MethodInfo joinPoint,
+   public String finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally22 = "String,MethodInfo,Serializable,int";
+      finally22 = "String,MethodExecution,Serializable,int";
       return "finally22";
    }
    
-   public Object finally22(@JoinPoint MethodInfo joinPoint,
+   public Object finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally22 = "Object,MethodInfo,Serializable,long";
+      finally22 = "Object,MethodExecution,Serializable,long";
       return "finally22";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint,
+   public void finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally22 = "void,MethodInfo,Throwable,Object[]";
+      finally22 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint,
+   public void finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally22 = "void,MethodInfo,Throwable,Object";
+      finally22 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint,
+   public void finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally22 = "void,MethodInfo,Serializable,Object[]";
+      finally22 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint,
+   public void finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally22 = "void,MethodInfo,Serializable,Object";
+      finally22 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint,
+   public void finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally22 = "void,MethodInfo,Throwable";
+      finally22 = "void,MethodExecution,Throwable";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint,
+   public void finally22(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally22 = "void,MethodInfo,Serializable";
+      finally22 = "void,MethodExecution,Serializable";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally22(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally22 = "void,MethodInfo,int,long";
+      finally22 = "void,MethodExecution,int,long";
    }
    
-   public String finally22(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally22(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally22 = "String,MethodInfo,long";
+      finally22 = "String,MethodExecution,long";
       return "finally22";
    }
    
-   public Object finally22(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally22(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally22 = "Object,MethodInfo,int";
+      finally22 = "Object,MethodExecution,int";
       return "finally22";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally22(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally22 = "void,MethodInfo,Object[]";
+      finally22 = "void,MethodExecution,Object[]";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally22(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally22 = "void,MethodInfo,Object";
+      finally22 = "void,MethodExecution,Object";
    }
    
-   public void finally22(@JoinPoint MethodInfo joinPoint)
+   public void finally22(@JoinPoint MethodExecution joinPoint)
    {
-      finally22 = "void,MethodInfo";
+      finally22 = "void,MethodExecution";
    }
    
    public void finally22(@Return String valueReturned,
@@ -8315,87 +8315,87 @@
    
    /* FINALLY23 ADVICE */
    
-   public String finally23(@JoinPoint MethodInfo joinPoint,
+   public String finally23(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg int arg1)
    {
-      finally23 = "String,MethodInfo,Serializable,int";
+      finally23 = "String,MethodExecution,Serializable,int";
       return "finally23";
    }
    
-   public Object finally23(@JoinPoint MethodInfo joinPoint,
+   public Object finally23(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally23 = "Object,MethodInfo,Serializable,long";
+      finally23 = "Object,MethodExecution,Serializable,long";
       return "finally23";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint,
+   public void finally23(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally23 = "void,MethodInfo,Throwable,Object[]";
+      finally23 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint,
+   public void finally23(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally23 = "void,MethodInfo,Throwable,Object";
+      finally23 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint,
+   public void finally23(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally23 = "void,MethodInfo,Serializable,Object[]";
+      finally23 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint,
+   public void finally23(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally23 = "void,MethodInfo,Serializable,Object";
+      finally23 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint,
+   public void finally23(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally23 = "void,MethodInfo,Throwable";
+      finally23 = "void,MethodExecution,Throwable";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint,
+   public void finally23(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally23 = "void,MethodInfo,Serializable";
+      finally23 = "void,MethodExecution,Serializable";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally23(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally23 = "void,MethodInfo,int,long";
+      finally23 = "void,MethodExecution,int,long";
    }
    
-   public String finally23(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally23(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally23 = "String,MethodInfo,long";
+      finally23 = "String,MethodExecution,long";
       return "finally23";
    }
    
-   public Object finally23(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally23(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally23 = "Object,MethodInfo,int";
+      finally23 = "Object,MethodExecution,int";
       return "finally23";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally23(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally23 = "void,MethodInfo,Object[]";
+      finally23 = "void,MethodExecution,Object[]";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally23(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally23 = "void,MethodInfo,Object";
+      finally23 = "void,MethodExecution,Object";
    }
    
-   public void finally23(@JoinPoint MethodInfo joinPoint)
+   public void finally23(@JoinPoint MethodExecution joinPoint)
    {
-      finally23 = "void,MethodInfo";
+      finally23 = "void,MethodExecution";
    }
    
    public void finally23(@Return String valueReturned,
@@ -8608,80 +8608,80 @@
    
    /* FINALLY24 ADVICE */
    
-   public Object finally24(@JoinPoint MethodInfo joinPoint,
+   public Object finally24(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Arg long arg1)
    {
-      finally24 = "Object,MethodInfo,Serializable,long";
+      finally24 = "Object,MethodExecution,Serializable,long";
       return "finally24";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint,
+   public void finally24(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally24 = "void,MethodInfo,Throwable,Object[]";
+      finally24 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint,
+   public void finally24(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally24 = "void,MethodInfo,Throwable,Object";
+      finally24 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint,
+   public void finally24(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally24 = "void,MethodInfo,Serializable,Object[]";
+      finally24 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint,
+   public void finally24(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally24 = "void,MethodInfo,Serializable,Object";
+      finally24 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint,
+   public void finally24(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally24 = "void,MethodInfo,Throwable";
+      finally24 = "void,MethodExecution,Throwable";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint,
+   public void finally24(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally24 = "void,MethodInfo,Serializable";
+      finally24 = "void,MethodExecution,Serializable";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally24(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally24 = "void,MethodInfo,int,long";
+      finally24 = "void,MethodExecution,int,long";
    }
    
-   public String finally24(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally24(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally24 = "String,MethodInfo,long";
+      finally24 = "String,MethodExecution,long";
       return "finally24";
    }
    
-   public Object finally24(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally24(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally24 = "Object,MethodInfo,int";
+      finally24 = "Object,MethodExecution,int";
       return "finally24";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally24(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally24 = "void,MethodInfo,Object[]";
+      finally24 = "void,MethodExecution,Object[]";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally24(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally24 = "void,MethodInfo,Object";
+      finally24 = "void,MethodExecution,Object";
    }
    
-   public void finally24(@JoinPoint MethodInfo joinPoint)
+   public void finally24(@JoinPoint MethodExecution joinPoint)
    {
-      finally24 = "void,MethodInfo";
+      finally24 = "void,MethodExecution";
    }
    
    public void finally24(@Return String valueReturned,
@@ -8894,73 +8894,73 @@
    
    /* FINALLY25 ADVICE */
    
-   public void finally25(@JoinPoint MethodInfo joinPoint,
+   public void finally25(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally25 = "void,MethodInfo,Throwable,Object[]";
+      finally25 = "void,MethodExecution,Throwable,Object[]";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint,
+   public void finally25(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally25 = "void,MethodInfo,Throwable,Object";
+      finally25 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint,
+   public void finally25(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally25 = "void,MethodInfo,Serializable,Object[]";
+      finally25 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint,
+   public void finally25(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally25 = "void,MethodInfo,Serializable,Object";
+      finally25 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint,
+   public void finally25(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally25 = "void,MethodInfo,Throwable";
+      finally25 = "void,MethodExecution,Throwable";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint,
+   public void finally25(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally25 = "void,MethodInfo,Serializable";
+      finally25 = "void,MethodExecution,Serializable";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally25(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally25 = "void,MethodInfo,int,long";
+      finally25 = "void,MethodExecution,int,long";
    }
    
-   public String finally25(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally25(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally25 = "String,MethodInfo,long";
+      finally25 = "String,MethodExecution,long";
       return "finally25";
    }
    
-   public Object finally25(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally25(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally25 = "Object,MethodInfo,int";
+      finally25 = "Object,MethodExecution,int";
       return "finally25";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally25(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally25 = "void,MethodInfo,Object[]";
+      finally25 = "void,MethodExecution,Object[]";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally25(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally25 = "void,MethodInfo,Object";
+      finally25 = "void,MethodExecution,Object";
    }
    
-   public void finally25(@JoinPoint MethodInfo joinPoint)
+   public void finally25(@JoinPoint MethodExecution joinPoint)
    {
-      finally25 = "void,MethodInfo";
+      finally25 = "void,MethodExecution";
    }
    
    public void finally25(@Return String valueReturned,
@@ -9173,67 +9173,67 @@
    
    /* FINALLY26 ADVICE */
    
-   public void finally26(@JoinPoint MethodInfo joinPoint,
+   public void finally26(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException, @Args Object args)
    {
-      finally26 = "void,MethodInfo,Throwable,Object";
+      finally26 = "void,MethodExecution,Throwable,Object";
    }
    
-   public void finally26(@JoinPoint MethodInfo joinPoint,
+   public void finally26(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally26 = "void,MethodInfo,Serializable,Object[]";
+      finally26 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally26(@JoinPoint MethodInfo joinPoint,
+   public void finally26(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally26 = "void,MethodInfo,Serializable,Object";
+      finally26 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally26(@JoinPoint MethodInfo joinPoint,
+   public void finally26(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally26 = "void,MethodInfo,Throwable";
+      finally26 = "void,MethodExecution,Throwable";
    }
    
-   public void finally26(@JoinPoint MethodInfo joinPoint,
+   public void finally26(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally26 = "void,MethodInfo,Serializable";
+      finally26 = "void,MethodExecution,Serializable";
    }
    
-   public void finally26(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally26(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally26 = "void,MethodInfo,int,long";
+      finally26 = "void,MethodExecution,int,long";
    }
    
-   public String finally26(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally26(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally26 = "String,MethodInfo,long";
+      finally26 = "String,MethodExecution,long";
       return "finally26";
    }
    
-   public Object finally26(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally26(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally26 = "Object,MethodInfo,int";
+      finally26 = "Object,MethodExecution,int";
       return "finally26";
    }
    
-   public void finally26(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally26(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally26 = "void,MethodInfo,Object[]";
+      finally26 = "void,MethodExecution,Object[]";
    }
    
-   public void finally26(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally26(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally26 = "void,MethodInfo,Object";
+      finally26 = "void,MethodExecution,Object";
    }
    
-   public void finally26(@JoinPoint MethodInfo joinPoint)
+   public void finally26(@JoinPoint MethodExecution joinPoint)
    {
-      finally26 = "void,MethodInfo";
+      finally26 = "void,MethodExecution";
    }
    
    public void finally26(@Return String valueReturned,
@@ -9446,61 +9446,61 @@
    
    /* FINALLY27 ADVICE */
    
-   public void finally27(@JoinPoint MethodInfo joinPoint,
+   public void finally27(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object[] args)
    {
-      finally27 = "void,MethodInfo,Serializable,Object[]";
+      finally27 = "void,MethodExecution,Serializable,Object[]";
    }
    
-   public void finally27(@JoinPoint MethodInfo joinPoint,
+   public void finally27(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally27 = "void,MethodInfo,Serializable,Object";
+      finally27 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally27(@JoinPoint MethodInfo joinPoint,
+   public void finally27(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally27 = "void,MethodInfo,Throwable";
+      finally27 = "void,MethodExecution,Throwable";
    }
    
-   public void finally27(@JoinPoint MethodInfo joinPoint,
+   public void finally27(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally27 = "void,MethodInfo,Serializable";
+      finally27 = "void,MethodExecution,Serializable";
    }
    
-   public void finally27(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally27(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally27 = "void,MethodInfo,int,long";
+      finally27 = "void,MethodExecution,int,long";
    }
    
-   public String finally27(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally27(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally27 = "String,MethodInfo,long";
+      finally27 = "String,MethodExecution,long";
       return "finally27";
    }
    
-   public Object finally27(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally27(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally27 = "Object,MethodInfo,int";
+      finally27 = "Object,MethodExecution,int";
       return "finally27";
    }
    
-   public void finally27(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally27(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally27 = "void,MethodInfo,Object[]";
+      finally27 = "void,MethodExecution,Object[]";
    }
    
-   public void finally27(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally27(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally27 = "void,MethodInfo,Object";
+      finally27 = "void,MethodExecution,Object";
    }
    
-   public void finally27(@JoinPoint MethodInfo joinPoint)
+   public void finally27(@JoinPoint MethodExecution joinPoint)
    {
-      finally27 = "void,MethodInfo";
+      finally27 = "void,MethodExecution";
    }
    
    public void finally27(@Return String valueReturned,
@@ -9713,55 +9713,55 @@
    
    /* FINALLY28 ADVICE */
    
-   public void finally28(@JoinPoint MethodInfo joinPoint,
+   public void finally28(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException, @Args Object args)
    {
-      finally28 = "void,MethodInfo,Serializable,Object";
+      finally28 = "void,MethodExecution,Serializable,Object";
    }
    
-   public void finally28(@JoinPoint MethodInfo joinPoint,
+   public void finally28(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally28 = "void,MethodInfo,Throwable";
+      finally28 = "void,MethodExecution,Throwable";
    }
    
-   public void finally28(@JoinPoint MethodInfo joinPoint,
+   public void finally28(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally28 = "void,MethodInfo,Serializable";
+      finally28 = "void,MethodExecution,Serializable";
    }
    
-   public void finally28(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally28(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally28 = "void,MethodInfo,int,long";
+      finally28 = "void,MethodExecution,int,long";
    }
    
-   public String finally28(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally28(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally28 = "String,MethodInfo,long";
+      finally28 = "String,MethodExecution,long";
       return "finally28";
    }
    
-   public Object finally28(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally28(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally28 = "Object,MethodInfo,int";
+      finally28 = "Object,MethodExecution,int";
       return "finally28";
    }
    
-   public void finally28(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally28(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally28 = "void,MethodInfo,Object[]";
+      finally28 = "void,MethodExecution,Object[]";
    }
    
-   public void finally28(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally28(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally28 = "void,MethodInfo,Object";
+      finally28 = "void,MethodExecution,Object";
    }
    
-   public void finally28(@JoinPoint MethodInfo joinPoint)
+   public void finally28(@JoinPoint MethodExecution joinPoint)
    {
-      finally28 = "void,MethodInfo";
+      finally28 = "void,MethodExecution";
    }
    
    public void finally28(@Return String valueReturned,
@@ -9974,49 +9974,49 @@
    
    /* FINALLY29 ADVICE */
    
-   public void finally29(@JoinPoint MethodInfo joinPoint,
+   public void finally29(@JoinPoint MethodExecution joinPoint,
          @Thrown Throwable thrownException)
    {
-      finally29 = "void,MethodInfo,Throwable";
+      finally29 = "void,MethodExecution,Throwable";
    }
    
-   public void finally29(@JoinPoint MethodInfo joinPoint,
+   public void finally29(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally29 = "void,MethodInfo,Serializable";
+      finally29 = "void,MethodExecution,Serializable";
    }
    
-   public void finally29(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally29(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally29 = "void,MethodInfo,int,long";
+      finally29 = "void,MethodExecution,int,long";
    }
    
-   public String finally29(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally29(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally29 = "String,MethodInfo,long";
+      finally29 = "String,MethodExecution,long";
       return "finally29";
    }
    
-   public Object finally29(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally29(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally29 = "Object,MethodInfo,int";
+      finally29 = "Object,MethodExecution,int";
       return "finally29";
    }
    
-   public void finally29(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally29(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally29 = "void,MethodInfo,Object[]";
+      finally29 = "void,MethodExecution,Object[]";
    }
    
-   public void finally29(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally29(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally29 = "void,MethodInfo,Object";
+      finally29 = "void,MethodExecution,Object";
    }
    
-   public void finally29(@JoinPoint MethodInfo joinPoint)
+   public void finally29(@JoinPoint MethodExecution joinPoint)
    {
-      finally29 = "void,MethodInfo";
+      finally29 = "void,MethodExecution";
    }
    
    public void finally29(@Return String valueReturned,
@@ -10229,43 +10229,43 @@
    
    /* FINALLY30 ADVICE */
    
-   public void finally30(@JoinPoint MethodInfo joinPoint,
+   public void finally30(@JoinPoint MethodExecution joinPoint,
          @Thrown Serializable thrownException)
    {
-      finally30 = "void,MethodInfo,Serializable";
+      finally30 = "void,MethodExecution,Serializable";
    }
    
-   public void finally30(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally30(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally30 = "void,MethodInfo,int,long";
+      finally30 = "void,MethodExecution,int,long";
    }
    
-   public String finally30(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally30(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally30 = "String,MethodInfo,long";
+      finally30 = "String,MethodExecution,long";
       return "finally30";
    }
    
-   public Object finally30(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally30(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally30 = "Object,MethodInfo,int";
+      finally30 = "Object,MethodExecution,int";
       return "finally30";
    }
    
-   public void finally30(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally30(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally30 = "void,MethodInfo,Object[]";
+      finally30 = "void,MethodExecution,Object[]";
    }
    
-   public void finally30(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally30(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally30 = "void,MethodInfo,Object";
+      finally30 = "void,MethodExecution,Object";
    }
    
-   public void finally30(@JoinPoint MethodInfo joinPoint)
+   public void finally30(@JoinPoint MethodExecution joinPoint)
    {
-      finally30 = "void,MethodInfo";
+      finally30 = "void,MethodExecution";
    }
    
    public void finally30(@Return String valueReturned,
@@ -10478,37 +10478,37 @@
    
    /* FINALLY31 ADVICE */
    
-   public void finally31(@JoinPoint MethodInfo joinPoint, @Arg int arg1,
+   public void finally31(@JoinPoint MethodExecution joinPoint, @Arg int arg1,
          @Arg long arg2)
    {
-      finally31 = "void,MethodInfo,int,long";
+      finally31 = "void,MethodExecution,int,long";
    }
    
-   public String finally31(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally31(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally31 = "String,MethodInfo,long";
+      finally31 = "String,MethodExecution,long";
       return "finally31";
    }
    
-   public Object finally31(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally31(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally31 = "Object,MethodInfo,int";
+      finally31 = "Object,MethodExecution,int";
       return "finally31";
    }
    
-   public void finally31(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally31(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally31 = "void,MethodInfo,Object[]";
+      finally31 = "void,MethodExecution,Object[]";
    }
    
-   public void finally31(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally31(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally31 = "void,MethodInfo,Object";
+      finally31 = "void,MethodExecution,Object";
    }
    
-   public void finally31(@JoinPoint MethodInfo joinPoint)
+   public void finally31(@JoinPoint MethodExecution joinPoint)
    {
-      finally31 = "void,MethodInfo";
+      finally31 = "void,MethodExecution";
    }
    
    public void finally31(@Return String valueReturned,
@@ -10721,31 +10721,31 @@
    
    /* FINALLY32 ADVICE */
    
-   public String finally32(@JoinPoint MethodInfo joinPoint, @Arg long arg2)
+   public String finally32(@JoinPoint MethodExecution joinPoint, @Arg long arg2)
    {
-      finally32 = "String,MethodInfo,long";
+      finally32 = "String,MethodExecution,long";
       return "finally32";
    }
    
-   public Object finally32(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally32(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally32 = "Object,MethodInfo,int";
+      finally32 = "Object,MethodExecution,int";
       return "finally32";
    }
    
-   public void finally32(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally32(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally32 = "void,MethodInfo,Object[]";
+      finally32 = "void,MethodExecution,Object[]";
    }
    
-   public void finally32(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally32(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally32 = "void,MethodInfo,Object";
+      finally32 = "void,MethodExecution,Object";
    }
    
-   public void finally32(@JoinPoint MethodInfo joinPoint)
+   public void finally32(@JoinPoint MethodExecution joinPoint)
    {
-      finally32 = "void,MethodInfo";
+      finally32 = "void,MethodExecution";
    }
    
    public void finally32(@Return String valueReturned,
@@ -10958,25 +10958,25 @@
    
    /* FINALLY33 ADVICE */
    
-   public Object finally33(@JoinPoint MethodInfo joinPoint, @Arg int arg1)
+   public Object finally33(@JoinPoint MethodExecution joinPoint, @Arg int arg1)
    {
-      finally33 = "Object,MethodInfo,int";
+      finally33 = "Object,MethodExecution,int";
       return "finally33";
    }
    
-   public void finally33(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally33(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally33 = "void,MethodInfo,Object[]";
+      finally33 = "void,MethodExecution,Object[]";
    }
    
-   public void finally33(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally33(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally33 = "void,MethodInfo,Object";
+      finally33 = "void,MethodExecution,Object";
    }
    
-   public void finally33(@JoinPoint MethodInfo joinPoint)
+   public void finally33(@JoinPoint MethodExecution joinPoint)
    {
-      finally33 = "void,MethodInfo";
+      finally33 = "void,MethodExecution";
    }
    
    public void finally33(@Return String valueReturned,
@@ -11189,19 +11189,19 @@
    
    /* FINALLY34 ADVICE */
    
-   public void finally34(@JoinPoint MethodInfo joinPoint, @Args Object[] args)
+   public void finally34(@JoinPoint MethodExecution joinPoint, @Args Object[] args)
    {
-      finally34 = "void,MethodInfo,Object[]";
+      finally34 = "void,MethodExecution,Object[]";
    }
    
-   public void finally34(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally34(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally34 = "void,MethodInfo,Object";
+      finally34 = "void,MethodExecution,Object";
    }
    
-   public void finally34(@JoinPoint MethodInfo joinPoint)
+   public void finally34(@JoinPoint MethodExecution joinPoint)
    {
-      finally34 = "void,MethodInfo";
+      finally34 = "void,MethodExecution";
    }
    
    public void finally34(@Return String valueReturned,
@@ -11414,14 +11414,14 @@
    
    /* FINALLY35 ADVICE */
    
-   public void finally35(@JoinPoint MethodInfo joinPoint, @Args Object args)
+   public void finally35(@JoinPoint MethodExecution joinPoint, @Args Object args)
    {
-      finally35 = "void,MethodInfo,Object";
+      finally35 = "void,MethodExecution,Object";
    }
    
-   public void finally35(@JoinPoint MethodInfo joinPoint)
+   public void finally35(@JoinPoint MethodExecution joinPoint)
    {
-      finally35 = "void,MethodInfo";
+      finally35 = "void,MethodExecution";
    }
    
    public void finally35(@Return String valueReturned,
@@ -11634,9 +11634,9 @@
    
    /* FINALLY36 ADVICE */
    
-   public void finally36(@JoinPoint MethodInfo joinPoint)
+   public void finally36(@JoinPoint MethodExecution joinPoint)
    {
-      finally36 = "void,MethodInfo";
+      finally36 = "void,MethodExecution";
    }
    
    public void finally36(@Return String valueReturned,

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyCallAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedFinallyCallAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -21,7 +21,6 @@
  */
 package org.jboss.test.aop.beforeafterArgs;
 
-import org.jboss.aop.MethodByMethodInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;
 import org.jboss.aop.advice.annotation.Caller;
@@ -29,6 +28,7 @@
 import org.jboss.aop.advice.annotation.Return;
 import org.jboss.aop.advice.annotation.Target;
 import org.jboss.aop.advice.annotation.Thrown;
+import org.jboss.aop.joinpoint.MethodCallByMethod;
 
 /**
  * Aspect used on overloaded finally advice tests (for Caller and Target tests
@@ -174,247 +174,247 @@
    
    /* FINALLY1 ADVICE */
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally1 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally1 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally1 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally1 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally1 = "MethodByMethodInfo,long,Throwable,int";
+      finally1 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally1(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally1(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally1 = "MethodByMethodInfo";
+      finally1 = "MethodCallByMethod";
    }
    
    public void finally1(@Target OverloadedAdvicePOJO target,
@@ -574,7 +574,7 @@
    public void finally1(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally1(@Caller OverloadedAdvicePOJOCaller caller)
@@ -590,239 +590,239 @@
    
    /* FINALLY2 ADVICE */
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally2 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally2 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally2 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally2 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally2 = "MethodByMethodInfo,long,Throwable,int";
+      finally2 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally2(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally2(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally2 = "MethodByMethodInfo";
+      finally2 = "MethodCallByMethod";
    }
    
    public void finally2(@Target OverloadedAdvicePOJO target,
@@ -982,7 +982,7 @@
    public void finally2(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally2(@Caller OverloadedAdvicePOJOCaller caller)
@@ -998,232 +998,232 @@
    
    /* FINALLY3 ADVICE */
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally3 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally3 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally3 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally3 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally3 = "MethodByMethodInfo,long,Throwable,int";
+      finally3 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally3(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally3(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally3 = "MethodByMethodInfo";
+      finally3 = "MethodCallByMethod";
    }
    
    public void finally3(@Target OverloadedAdvicePOJO target,
@@ -1383,7 +1383,7 @@
    public void finally3(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally3(@Caller OverloadedAdvicePOJOCaller caller)
@@ -1399,225 +1399,225 @@
    
    /* FINALLY4 ADVICE */
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally4 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally4 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally4 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally4 = "MethodByMethodInfo,long,Throwable,int";
+      finally4 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally4(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally4(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally4 = "MethodByMethodInfo";
+      finally4 = "MethodCallByMethod";
    }
    
    public void finally4(@Target OverloadedAdvicePOJO target,
@@ -1777,7 +1777,7 @@
    public void finally4(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally4(@Caller OverloadedAdvicePOJOCaller caller)
@@ -1793,217 +1793,217 @@
    
    /* FINALLY5 ADVICE */
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally5 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally5 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally5 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally5 = "MethodByMethodInfo,long,Throwable,int";
+      finally5 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally5(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally5(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally5 = "MethodByMethodInfo";
+      finally5 = "MethodCallByMethod";
    }
    
    public void finally5(@Target OverloadedAdvicePOJO target,
@@ -2163,7 +2163,7 @@
    public void finally5(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally5(@Caller OverloadedAdvicePOJOCaller caller)
@@ -2179,209 +2179,209 @@
    
    /* FINALLY6 ADVICE */
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally6 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally6 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally6 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally6 = "MethodByMethodInfo,long,Throwable,int";
+      finally6 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally6(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally6(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally6 = "MethodByMethodInfo";
+      finally6 = "MethodCallByMethod";
    }
    
    public void finally6(@Target OverloadedAdvicePOJO target,
@@ -2541,7 +2541,7 @@
    public void finally6(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally6(@Caller OverloadedAdvicePOJOCaller caller)
@@ -2557,201 +2557,201 @@
    
    /* FINALLY7 ADVICE */
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally7 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally7 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally7 = "MethodByMethodInfo,long,Throwable,int";
+      finally7 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally7(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally7(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally7 = "MethodByMethodInfo";
+      finally7 = "MethodCallByMethod";
    }
    
    public void finally7(@Target OverloadedAdvicePOJO target,
@@ -2911,7 +2911,7 @@
    public void finally7(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally7(@Caller OverloadedAdvicePOJOCaller caller)
@@ -2927,193 +2927,193 @@
    
    /* FINALLY8 ADVICE */
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Caller SuperClass caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,SuperClass,long,Throwable";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,SuperClass,long,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally8 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally8 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally8 = "MethodByMethodInfo,long,Throwable,int";
+      finally8 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally8(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally8(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally8 = "MethodByMethodInfo";
+      finally8 = "MethodCallByMethod";
    }
    
    public void finally8(@Target OverloadedAdvicePOJO target,
@@ -3273,7 +3273,7 @@
    public void finally8(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally8(@Caller OverloadedAdvicePOJOCaller caller)
@@ -3289,186 +3289,186 @@
    
    /* FINALLY9 ADVICE */
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target Object target, @Caller OverloadedAdvicePOJOCaller caller,
          @Return long valueReturned, @Thrown Throwable thrownException)
    {
-      finally9 = "MethodByMethodInfo,Object,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally9 = "MethodCallByMethod,Object,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally9 = "MethodByMethodInfo,long,Throwable,int";
+      finally9 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally9(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally9(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally9 = "MethodByMethodInfo";
+      finally9 = "MethodCallByMethod";
    }
    
    public void finally9(@Target OverloadedAdvicePOJO target,
@@ -3628,7 +3628,7 @@
    public void finally9(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally9(@Caller OverloadedAdvicePOJOCaller caller)
@@ -3644,179 +3644,179 @@
    
    /* FINALLY10 ADVICE */
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally10 = "MethodByMethodInfo,long,Throwable,int";
+      finally10 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally10(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally10(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally10 = "MethodByMethodInfo";
+      finally10 = "MethodCallByMethod";
    }
    
    public void finally10(@Target OverloadedAdvicePOJO target,
@@ -3976,7 +3976,7 @@
    public void finally10(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally10 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally10 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally10(@Caller OverloadedAdvicePOJOCaller caller)
@@ -3992,171 +3992,171 @@
    
    /* FINALLY11 ADVICE */
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally11 = "MethodByMethodInfo,long,Throwable,int";
+      finally11 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally11(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally11(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally11 = "MethodByMethodInfo";
+      finally11 = "MethodCallByMethod";
    }
    
    public void finally11(@Target OverloadedAdvicePOJO target,
@@ -4316,7 +4316,7 @@
    public void finally11(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally11 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally11 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally11(@Caller OverloadedAdvicePOJOCaller caller)
@@ -4332,163 +4332,163 @@
    
    /* FINALLY12 ADVICE */
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally12 = "MethodByMethodInfo,long,Throwable,int";
+      finally12 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally12(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally12(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally12 = "MethodByMethodInfo";
+      finally12 = "MethodCallByMethod";
    }
    
    public void finally12(@Target OverloadedAdvicePOJO target,
@@ -4648,7 +4648,7 @@
    public void finally12(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally12 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally12 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally12(@Caller OverloadedAdvicePOJOCaller caller)
@@ -4664,155 +4664,155 @@
    
    /* FINALLY13 ADVICE */
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally13 = "MethodByMethodInfo,long,Throwable,int";
+      finally13 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally13(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally13(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally13 = "MethodByMethodInfo";
+      finally13 = "MethodCallByMethod";
    }
    
    public void finally13(@Target OverloadedAdvicePOJO target,
@@ -4972,7 +4972,7 @@
    public void finally13(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally13 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally13 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally13(@Caller OverloadedAdvicePOJOCaller caller)
@@ -4988,148 +4988,148 @@
    
    /* FINALLY14 ADVICE */
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally14 = "MethodByMethodInfo,long,Throwable,int";
+      finally14 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally14(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally14(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally14 = "MethodByMethodInfo";
+      finally14 = "MethodCallByMethod";
    }
    
    public void finally14(@Target OverloadedAdvicePOJO target,
@@ -5289,7 +5289,7 @@
    public void finally14(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally14 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally14 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally14(@Caller OverloadedAdvicePOJOCaller caller)
@@ -5305,141 +5305,141 @@
    
    /* FINALLY15 ADVICE */
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally15 = "MethodByMethodInfo,long,Throwable,int";
+      finally15 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally15(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally15(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally15 = "MethodByMethodInfo";
+      finally15 = "MethodCallByMethod";
    }
    
    public void finally15(@Target OverloadedAdvicePOJO target,
@@ -5599,7 +5599,7 @@
    public void finally15(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally15 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally15 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally15(@Caller OverloadedAdvicePOJOCaller caller)
@@ -5615,134 +5615,134 @@
    
    /* FINALLY16 ADVICE */
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,int";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,int";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally16 = "MethodByMethodInfo,long,Throwable,int";
+      finally16 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally16(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally16(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally16 = "MethodByMethodInfo";
+      finally16 = "MethodCallByMethod";
    }
    
    public void finally16(@Target OverloadedAdvicePOJO target,
@@ -5902,7 +5902,7 @@
    public void finally16(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally16 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally16 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally16(@Caller OverloadedAdvicePOJOCaller caller)
@@ -5918,127 +5918,127 @@
    
    /* FINALLY17 ADVICE */
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable,Object[]";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally17 = "MethodByMethodInfo,long,Throwable,int";
+      finally17 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally17(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally17(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally17 = "MethodByMethodInfo";
+      finally17 = "MethodCallByMethod";
    }
    
    public void finally17(@Target OverloadedAdvicePOJO target,
@@ -6198,7 +6198,7 @@
    public void finally17(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally17 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally17 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally17(@Caller OverloadedAdvicePOJOCaller caller)
@@ -6214,120 +6214,120 @@
    
    /* FINALLY18 ADVICE */
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJO,long,Throwable";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJO,long,Throwable";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally18 = "MethodByMethodInfo,long,Throwable,int";
+      finally18 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally18(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally18(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally18 = "MethodByMethodInfo";
+      finally18 = "MethodCallByMethod";
    }
    
    public void finally18(@Target OverloadedAdvicePOJO target,
@@ -6487,7 +6487,7 @@
    public void finally18(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally18 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally18 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally18(@Caller OverloadedAdvicePOJOCaller caller)
@@ -6503,113 +6503,113 @@
    
    /* FINALLY19 ADVICE */
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Arg int arg)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,int";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,int";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally19 = "MethodByMethodInfo,long,Throwable,int";
+      finally19 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally19(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally19(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally19 = "MethodByMethodInfo";
+      finally19 = "MethodCallByMethod";
    }
    
    public void finally19(@Target OverloadedAdvicePOJO target,
@@ -6769,7 +6769,7 @@
    public void finally19(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally19 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally19 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally19(@Caller OverloadedAdvicePOJOCaller caller)
@@ -6785,106 +6785,106 @@
    
    /* FINALLY20 ADVICE */
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException,
          @Args Object[] args)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally20 = "MethodByMethodInfo,long,Throwable,int";
+      finally20 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally20(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally20(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally20 = "MethodByMethodInfo";
+      finally20 = "MethodCallByMethod";
    }
    
    public void finally20(@Target OverloadedAdvicePOJO target,
@@ -7044,7 +7044,7 @@
    public void finally20(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally20 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally20 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally20(@Caller OverloadedAdvicePOJOCaller caller)
@@ -7060,99 +7060,99 @@
    
    /* FINALLY21 ADVICE */
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrownException)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally21 = "MethodByMethodInfo,long,Throwable,int";
+      finally21 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally21(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally21(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally21 = "MethodByMethodInfo";
+      finally21 = "MethodCallByMethod";
    }
    
    public void finally21(@Target OverloadedAdvicePOJO target,
@@ -7312,7 +7312,7 @@
    public void finally21(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally21 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally21 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally21(@Caller OverloadedAdvicePOJOCaller caller)
@@ -7328,93 +7328,93 @@
    
    /* FINALLY22 ADVICE */
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Arg int arg)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJO,int";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJO,int";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally22 = "MethodByMethodInfo,long,Throwable,int";
+      finally22 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally22(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally22(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally22 = "MethodByMethodInfo";
+      finally22 = "MethodCallByMethod";
    }
    
    public void finally22(@Target OverloadedAdvicePOJO target,
@@ -7574,7 +7574,7 @@
    public void finally22(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally22 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally22 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally22(@Caller OverloadedAdvicePOJOCaller caller)
@@ -7590,87 +7590,87 @@
    
    /* FINALLY23 ADVICE */
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Args Object[] args)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJO,Object[]";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJO,Object[]";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally23 = "MethodByMethodInfo,long,Throwable,int";
+      finally23 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally23(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally23(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally23 = "MethodByMethodInfo";
+      finally23 = "MethodCallByMethod";
    }
    
    public void finally23(@Target OverloadedAdvicePOJO target,
@@ -7830,7 +7830,7 @@
    public void finally23(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally23 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally23 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally23(@Caller OverloadedAdvicePOJOCaller caller)
@@ -7846,81 +7846,81 @@
    
    /* FINALLY24 ADVICE */
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJO";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJO";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally24 = "MethodByMethodInfo,long,Throwable,int";
+      finally24 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally24(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally24(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally24 = "MethodByMethodInfo";
+      finally24 = "MethodCallByMethod";
    }
    
    public void finally24(@Target OverloadedAdvicePOJO target,
@@ -8080,7 +8080,7 @@
    public void finally24(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally24 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally24 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally24(@Caller OverloadedAdvicePOJOCaller caller)
@@ -8096,75 +8096,75 @@
    
    /* FINALLY25 ADVICE */
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,int";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,int";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally25 = "MethodByMethodInfo,long,Throwable,int";
+      finally25 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally25(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally25(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally25 = "MethodByMethodInfo";
+      finally25 = "MethodCallByMethod";
    }
    
    public void finally25(@Target OverloadedAdvicePOJO target,
@@ -8324,7 +8324,7 @@
    public void finally25(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally25 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally25 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally25(@Caller OverloadedAdvicePOJOCaller caller)
@@ -8340,68 +8340,68 @@
    
    /* FINALLY26 ADVICE */
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable,Object[]";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally26 = "MethodByMethodInfo,long,Throwable,int";
+      finally26 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally26(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally26(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally26 = "MethodByMethodInfo";
+      finally26 = "MethodCallByMethod";
    }
    
    public void finally26(@Target OverloadedAdvicePOJO target,
@@ -8561,7 +8561,7 @@
    public void finally26(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally26 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally26 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally26(@Caller OverloadedAdvicePOJOCaller caller)
@@ -8577,61 +8577,61 @@
    
    /* FINALLY27 ADVICE */
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Return long valueReturned,
          @Thrown Throwable thrownException)
    {
-      finally27 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,long,Throwable";
+      finally27 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,long,Throwable";
    }
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally27 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally27 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally27 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally27 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally27 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally27 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally27 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally27 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally27 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally27 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally27 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally27 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally27 = "MethodByMethodInfo,long,Throwable,int";
+      finally27 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally27(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally27(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally27 = "MethodByMethodInfo";
+      finally27 = "MethodCallByMethod";
    }
    
    public void finally27(@Target OverloadedAdvicePOJO target,
@@ -8791,7 +8791,7 @@
    public void finally27(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally27 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally27 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally27(@Caller OverloadedAdvicePOJOCaller caller)
@@ -8807,54 +8807,54 @@
    
    /* FINALLY28 ADVICE */
    
-   public void finally28(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally28(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally28 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,int";
+      finally28 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,int";
    }
    
-   public void finally28(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally28(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally28 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally28 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally28(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally28(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally28 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally28 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally28(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally28(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally28 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally28 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally28(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally28(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally28 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally28 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally28(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally28(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally28 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally28 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally28(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally28(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally28 = "MethodByMethodInfo,long,Throwable,int";
+      finally28 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally28(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally28(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally28 = "MethodByMethodInfo";
+      finally28 = "MethodCallByMethod";
    }
    
    public void finally28(@Target OverloadedAdvicePOJO target,
@@ -9014,7 +9014,7 @@
    public void finally28(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally28 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally28 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally28(@Caller OverloadedAdvicePOJOCaller caller)
@@ -9030,47 +9030,47 @@
    
    /* FINALLY29 ADVICE */
    
-   public void finally29(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally29(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException, @Args Object[] args)
    {
-      finally29 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      finally29 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void finally29(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally29(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally29 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally29 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally29(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally29(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally29 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally29 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally29(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally29(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally29 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally29 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally29(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally29(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally29 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally29 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally29(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally29(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally29 = "MethodByMethodInfo,long,Throwable,int";
+      finally29 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally29(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally29(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally29 = "MethodByMethodInfo";
+      finally29 = "MethodCallByMethod";
    }
    
    public void finally29(@Target OverloadedAdvicePOJO target,
@@ -9230,7 +9230,7 @@
    public void finally29(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally29 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally29 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally29(@Caller OverloadedAdvicePOJOCaller caller)
@@ -9246,40 +9246,40 @@
    
    /* FINALLY30 ADVICE */
    
-   public void finally30(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally30(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller,
          @Thrown Throwable thrownException)
    {
-      finally30 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      finally30 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void finally30(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally30(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally30 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally30 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally30(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally30(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally30 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally30 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally30(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally30(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally30 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally30 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally30(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally30(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally30 = "MethodByMethodInfo,long,Throwable,int";
+      finally30 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally30(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally30(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally30 = "MethodByMethodInfo";
+      finally30 = "MethodCallByMethod";
    }
    
    public void finally30(@Target OverloadedAdvicePOJO target,
@@ -9439,7 +9439,7 @@
    public void finally30(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally30 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally30 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally30(@Caller OverloadedAdvicePOJOCaller caller)
@@ -9455,33 +9455,33 @@
    
    /* FINALLY31 ADVICE */
    
-   public void finally31(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally31(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Arg int arg)
    {
-      finally31 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,int";
+      finally31 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,int";
    }
    
-   public void finally31(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally31(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally31 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally31 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally31(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally31(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally31 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally31 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally31(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally31(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally31 = "MethodByMethodInfo,long,Throwable,int";
+      finally31 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally31(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally31(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally31 = "MethodByMethodInfo";
+      finally31 = "MethodCallByMethod";
    }
    
    public void finally31(@Target OverloadedAdvicePOJO target,
@@ -9641,7 +9641,7 @@
    public void finally31(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally31 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally31 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally31(@Caller OverloadedAdvicePOJOCaller caller)
@@ -9657,27 +9657,27 @@
    
    /* FINALLY32 ADVICE */
    
-   public void finally32(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally32(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Args Object[] args)
    {
-      finally32 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally32 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
-   public void finally32(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally32(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally32 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally32 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally32(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally32(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally32 = "MethodByMethodInfo,long,Throwable,int";
+      finally32 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally32(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally32(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally32 = "MethodByMethodInfo";
+      finally32 = "MethodCallByMethod";
    }
    
    public void finally32(@Target OverloadedAdvicePOJO target,
@@ -9837,7 +9837,7 @@
    public void finally32(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally32 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally32 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally32(@Caller OverloadedAdvicePOJOCaller caller)
@@ -9853,21 +9853,21 @@
    
    /* FINALLY33 ADVICE */
    
-   public void finally33(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally33(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller)
    {
-      finally33 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller";
+      finally33 = "MethodCallByMethod,OverloadedAdvicePOJOCaller";
    }
    
-   public void finally33(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally33(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally33 = "MethodByMethodInfo,long,Throwable,int";
+      finally33 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally33(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally33(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally33 = "MethodByMethodInfo";
+      finally33 = "MethodCallByMethod";
    }
    
    public void finally33(@Target OverloadedAdvicePOJO target,
@@ -10027,7 +10027,7 @@
    public void finally33(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally33 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally33 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally33(@Caller OverloadedAdvicePOJOCaller caller)
@@ -10043,15 +10043,15 @@
    
    /* FINALLY34 ADVICE */
    
-   public void finally34(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void finally34(@JoinPoint MethodCallByMethod joinPoint,
          @Return long valueReturned, @Thrown Throwable thrownException, @Arg int arg)
    {
-      finally34 = "MethodByMethodInfo,long,Throwable,int";
+      finally34 = "MethodCallByMethod,long,Throwable,int";
    }
    
-   public void finally34(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally34(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally34 = "MethodByMethodInfo";
+      finally34 = "MethodCallByMethod";
    }
    
    public void finally34(@Target OverloadedAdvicePOJO target,
@@ -10211,7 +10211,7 @@
    public void finally34(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally34 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally34 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally34(@Caller OverloadedAdvicePOJOCaller caller)
@@ -10227,9 +10227,9 @@
    
    /* FINALLY35 ADVICE */
    
-   public void finally35(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void finally35(@JoinPoint MethodCallByMethod joinPoint)
    {
-      finally35 = "MethodByMethodInfo";
+      finally35 = "MethodCallByMethod";
    }
    
    public void finally35(@Target OverloadedAdvicePOJO target,
@@ -10389,7 +10389,7 @@
    public void finally35(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally35 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally35 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally35(@Caller OverloadedAdvicePOJOCaller caller)
@@ -10562,7 +10562,7 @@
    public void finally36(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally36 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally36 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally36(@Caller OverloadedAdvicePOJOCaller caller)
@@ -10728,7 +10728,7 @@
    public void finally37(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally37 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally37 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally37(@Caller OverloadedAdvicePOJOCaller caller)
@@ -10887,7 +10887,7 @@
    public void finally38(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally38 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally38 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally38(@Caller OverloadedAdvicePOJOCaller caller)
@@ -11039,7 +11039,7 @@
    public void finally39(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally39 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally39 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally39(@Caller OverloadedAdvicePOJOCaller caller)
@@ -11184,7 +11184,7 @@
    public void finally40(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally40 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally40 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally40(@Caller OverloadedAdvicePOJOCaller caller)
@@ -11322,7 +11322,7 @@
    public void finally41(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally41 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally41 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally41(@Caller OverloadedAdvicePOJOCaller caller)
@@ -11453,7 +11453,7 @@
    public void finally42(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally42 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally42 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally42(@Caller OverloadedAdvicePOJOCaller caller)
@@ -11578,7 +11578,7 @@
    public void finally43(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally43 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally43 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally43(@Caller OverloadedAdvicePOJOCaller caller)
@@ -11697,7 +11697,7 @@
    public void finally44(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally44 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally44 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally44(@Caller OverloadedAdvicePOJOCaller caller)
@@ -11810,7 +11810,7 @@
    public void finally45(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally45 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally45 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally45(@Caller OverloadedAdvicePOJOCaller caller)
@@ -11917,7 +11917,7 @@
    public void finally46(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally46 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally46 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally46(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12017,7 +12017,7 @@
    public void finally47(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally47 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally47 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally47(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12111,7 +12111,7 @@
    public void finally48(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally48 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally48 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally48(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12199,7 +12199,7 @@
    public void finally49(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally49 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally49 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally49(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12281,7 +12281,7 @@
    public void finally50(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally50 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally50 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally50(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12357,7 +12357,7 @@
    public void finally51(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally51 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally51 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally51(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12428,7 +12428,7 @@
    public void finally52(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally52 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally52 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally52(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12494,7 +12494,7 @@
    public void finally53(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally53 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally53 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally53(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12555,7 +12555,7 @@
    public void finally54(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally54 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally54 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally54(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12610,7 +12610,7 @@
    public void finally55(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally55 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally55 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally55(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12658,7 +12658,7 @@
    public void finally56(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally56 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally56 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally56(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12700,7 +12700,7 @@
    public void finally57(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally57 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally57 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally57(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12736,7 +12736,7 @@
    public void finally58(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally58 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally58 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally58(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12766,7 +12766,7 @@
    public void finally59(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally59 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally59 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally59(@Caller OverloadedAdvicePOJOCaller caller)
@@ -12790,7 +12790,7 @@
    public void finally60(@Caller OverloadedAdvicePOJOCaller caller,
          @Args Object[] args)
    {
-      finally60 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Object[]";
+      finally60 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Object[]";
    }
    
    public void finally60(@Caller OverloadedAdvicePOJOCaller caller)

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,11 +23,11 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Thrown;
+import org.jboss.aop.joinpoint.JoinPointBean;
 
 /**
  * Aspect used on overloaded throwing advice tests (for JoinPoint, Thrown, Arg and
@@ -122,221 +122,221 @@
 
    /* THROWING1 ADVICE */
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SubInterface,Implementor";
+      throwing1 = "JoinPointBean,Throwable,SubInterface,Implementor";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,Interface,Implementor";
+      throwing1 = "JoinPointBean,Throwable,Interface,Implementor";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SubInterface,SubInterface";
+      throwing1 = "JoinPointBean,Throwable,SubInterface,SubInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SubInterface,Object";
+      throwing1 = "JoinPointBean,Throwable,SubInterface,Object";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing1 = "JoinPointInfo,Throwable,SuperInterface,Implementor";
+      throwing1 = "JoinPointBean,Throwable,SuperInterface,Implementor";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SubInterface,Interface";
+      throwing1 = "JoinPointBean,Throwable,SubInterface,Interface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,Interface,SubInterface";
+      throwing1 = "JoinPointBean,Throwable,Interface,SubInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SuperInterface,SubInterface";
+      throwing1 = "JoinPointBean,Throwable,SuperInterface,SubInterface";
    }
 
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SuperInterface,Object";
+      throwing1 = "JoinPointBean,Throwable,SuperInterface,Object";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,Interface,Interface";
+      throwing1 = "JoinPointBean,Throwable,Interface,Interface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SubInterface,SuperInterface";
+      throwing1 = "JoinPointBean,Throwable,SubInterface,SuperInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SuperInterface,Interface";
+      throwing1 = "JoinPointBean,Throwable,SuperInterface,Interface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,Interface,SuperInterface";
+      throwing1 = "JoinPointBean,Throwable,Interface,SuperInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,SuperInterface,SuperInterface";
+      throwing1 = "JoinPointBean,Throwable,SuperInterface,SuperInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SubInterface,Implementor";
+      throwing1 = "JoinPointBean,Object,SubInterface,Implementor";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing1 = "JoinPointInfo,Object,Interface,Implementor";
+      throwing1 = "JoinPointBean,Object,Interface,Implementor";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SubInterface,SubInterface";
+      throwing1 = "JoinPointBean,Object,SubInterface,SubInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SubInterface,Object";
+      throwing1 = "JoinPointBean,Object,SubInterface,Object";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing1 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing1 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing1 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing1 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing1 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing1 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,Interface,Interface";
+      throwing1 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing1 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing1 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing1 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing1(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing1 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing1 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing1(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing1 = "JoinPointInfo,Throwable,SubInterface";
+      throwing1 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing1(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,Implementor";
+      throwing1 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing1(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing1 = "JoinPointInfo,Throwable,Interface";
+      throwing1 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing1(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing1 = "JoinPointInfo,Throwable,Object";
+      throwing1 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing1(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing1 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing1 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing1(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing1 = "JoinPointInfo,Throwable,Object[]";
+      throwing1 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing1(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing1 = "JoinPointInfo,Object,Object[]";
+      throwing1 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing1(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -499,222 +499,222 @@
       throwing1 = "Object";
    }
    
-   public void throwing1(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing1(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING2 ADVICE */
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,Interface,Implementor";
+      throwing2 = "JoinPointBean,Throwable,Interface,Implementor";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,SubInterface,SubInterface";
+      throwing2 = "JoinPointBean,Throwable,SubInterface,SubInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,SubInterface,Object";
+      throwing2 = "JoinPointBean,Throwable,SubInterface,Object";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing2 = "JoinPointInfo,Throwable,SuperInterface,Implementor";
+      throwing2 = "JoinPointBean,Throwable,SuperInterface,Implementor";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,SubInterface,Interface";
+      throwing2 = "JoinPointBean,Throwable,SubInterface,Interface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,Interface,SubInterface";
+      throwing2 = "JoinPointBean,Throwable,Interface,SubInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,SuperInterface,SubInterface";
+      throwing2 = "JoinPointBean,Throwable,SuperInterface,SubInterface";
    }
 
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,SuperInterface,Object";
+      throwing2 = "JoinPointBean,Throwable,SuperInterface,Object";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,Interface,Interface";
+      throwing2 = "JoinPointBean,Throwable,Interface,Interface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,SubInterface,SuperInterface";
+      throwing2 = "JoinPointBean,Throwable,SubInterface,SuperInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,SuperInterface,Interface";
+      throwing2 = "JoinPointBean,Throwable,SuperInterface,Interface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,Interface,SuperInterface";
+      throwing2 = "JoinPointBean,Throwable,Interface,SuperInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,SuperInterface,SuperInterface";
+      throwing2 = "JoinPointBean,Throwable,SuperInterface,SuperInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SubInterface,Implementor";
+      throwing2 = "JoinPointBean,Object,SubInterface,Implementor";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing2 = "JoinPointInfo,Object,Interface,Implementor";
+      throwing2 = "JoinPointBean,Object,Interface,Implementor";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SubInterface,SubInterface";
+      throwing2 = "JoinPointBean,Object,SubInterface,SubInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SubInterface,Object";
+      throwing2 = "JoinPointBean,Object,SubInterface,Object";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing2 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing2 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing2 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing2 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing2 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing2 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,Interface,Interface";
+      throwing2 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing2 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing2 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing2 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing2(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing2 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing2 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing2(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing2 = "JoinPointInfo,Throwable,SubInterface";
+      throwing2 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing2(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing2(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,Implementor";
+      throwing2 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing2(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing2 = "JoinPointInfo,Throwable,Interface";
+      throwing2 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing2(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing2(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing2 = "JoinPointInfo,Throwable,Object";
+      throwing2 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing2(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing2(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing2 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing2 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing2(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing2 = "JoinPointInfo,Throwable,Object[]";
+      throwing2 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing2(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing2 = "JoinPointInfo,Object,Object[]";
+      throwing2 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing2(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -877,204 +877,204 @@
       throwing2 = "Object";
    }
    
-   public void throwing2(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing2(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING3 ADVICE */
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing3 = "JoinPointInfo,Throwable,SuperInterface,Implementor";
+      throwing3 = "JoinPointBean,Throwable,SuperInterface,Implementor";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,SubInterface,Interface";
+      throwing3 = "JoinPointBean,Throwable,SubInterface,Interface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,Interface,SubInterface";
+      throwing3 = "JoinPointBean,Throwable,Interface,SubInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,SuperInterface,SubInterface";
+      throwing3 = "JoinPointBean,Throwable,SuperInterface,SubInterface";
    }
 
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,SuperInterface,Object";
+      throwing3 = "JoinPointBean,Throwable,SuperInterface,Object";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,Interface,Interface";
+      throwing3 = "JoinPointBean,Throwable,Interface,Interface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,SubInterface,SuperInterface";
+      throwing3 = "JoinPointBean,Throwable,SubInterface,SuperInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,SuperInterface,Interface";
+      throwing3 = "JoinPointBean,Throwable,SuperInterface,Interface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,Interface,SuperInterface";
+      throwing3 = "JoinPointBean,Throwable,Interface,SuperInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,SuperInterface,SuperInterface";
+      throwing3 = "JoinPointBean,Throwable,SuperInterface,SuperInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SubInterface,Implementor";
+      throwing3 = "JoinPointBean,Object,SubInterface,Implementor";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing3 = "JoinPointInfo,Object,Interface,Implementor";
+      throwing3 = "JoinPointBean,Object,Interface,Implementor";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SubInterface,SubInterface";
+      throwing3 = "JoinPointBean,Object,SubInterface,SubInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SubInterface,Object";
+      throwing3 = "JoinPointBean,Object,SubInterface,Object";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing3 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing3 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing3 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing3 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing3 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing3 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,Interface,Interface";
+      throwing3 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing3 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing3 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing3 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing3(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing3 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing3 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing3(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing3 = "JoinPointInfo,Throwable,SubInterface";
+      throwing3 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing3(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing3(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,Implementor";
+      throwing3 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing3(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing3 = "JoinPointInfo,Throwable,Interface";
+      throwing3 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing3(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing3(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing3 = "JoinPointInfo,Throwable,Object";
+      throwing3 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing3(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing3(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing3 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing3 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing3(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing3 = "JoinPointInfo,Throwable,Object[]";
+      throwing3 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing3(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing3 = "JoinPointInfo,Object,Object[]";
+      throwing3 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing3(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -1237,185 +1237,185 @@
       throwing3 = "Object";
    }
    
-   public void throwing3(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing3(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING4 ADVICE */
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,SuperInterface,SubInterface";
+      throwing4 = "JoinPointBean,Throwable,SuperInterface,SubInterface";
    }
 
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,SuperInterface,Object";
+      throwing4 = "JoinPointBean,Throwable,SuperInterface,Object";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,Interface,Interface";
+      throwing4 = "JoinPointBean,Throwable,Interface,Interface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,SubInterface,SuperInterface";
+      throwing4 = "JoinPointBean,Throwable,SubInterface,SuperInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,SuperInterface,Interface";
+      throwing4 = "JoinPointBean,Throwable,SuperInterface,Interface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,Interface,SuperInterface";
+      throwing4 = "JoinPointBean,Throwable,Interface,SuperInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,SuperInterface,SuperInterface";
+      throwing4 = "JoinPointBean,Throwable,SuperInterface,SuperInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SubInterface,Implementor";
+      throwing4 = "JoinPointBean,Object,SubInterface,Implementor";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing4 = "JoinPointInfo,Object,Interface,Implementor";
+      throwing4 = "JoinPointBean,Object,Interface,Implementor";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SubInterface,SubInterface";
+      throwing4 = "JoinPointBean,Object,SubInterface,SubInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SubInterface,Object";
+      throwing4 = "JoinPointBean,Object,SubInterface,Object";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing4 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing4 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing4 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing4 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing4 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing4 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,Interface,Interface";
+      throwing4 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing4 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing4 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing4 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing4(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing4 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing4 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing4(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing4 = "JoinPointInfo,Throwable,SubInterface";
+      throwing4 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing4(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing4(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,Implementor";
+      throwing4 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing4(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing4 = "JoinPointInfo,Throwable,Interface";
+      throwing4 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing4(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing4(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing4 = "JoinPointInfo,Throwable,Object";
+      throwing4 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing4(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing4(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing4 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing4 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing4(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing4 = "JoinPointInfo,Throwable,Object[]";
+      throwing4 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing4(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing4 = "JoinPointInfo,Object,Object[]";
+      throwing4 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing4(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -1578,159 +1578,159 @@
       throwing4 = "Object";
    }
    
-   public void throwing4(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing4(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING5 ADVICE */
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing5 = "JoinPointInfo,Throwable,SuperInterface,Interface";
+      throwing5 = "JoinPointBean,Throwable,SuperInterface,Interface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing5 = "JoinPointInfo,Throwable,Interface,SuperInterface";
+      throwing5 = "JoinPointBean,Throwable,Interface,SuperInterface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing5 = "JoinPointInfo,Throwable,SuperInterface,SuperInterface";
+      throwing5 = "JoinPointBean,Throwable,SuperInterface,SuperInterface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SubInterface,Implementor";
+      throwing5 = "JoinPointBean,Object,SubInterface,Implementor";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing5 = "JoinPointInfo,Object,Interface,Implementor";
+      throwing5 = "JoinPointBean,Object,Interface,Implementor";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SubInterface,SubInterface";
+      throwing5 = "JoinPointBean,Object,SubInterface,SubInterface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SubInterface,Object";
+      throwing5 = "JoinPointBean,Object,SubInterface,Object";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing5 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing5 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing5 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing5 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing5 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing5 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,Interface,Interface";
+      throwing5 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing5 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing5 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing5 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing5(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing5 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing5 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing5(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing5 = "JoinPointInfo,Throwable,SubInterface";
+      throwing5 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing5(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing5(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing5 = "JoinPointInfo,Throwable,Implementor";
+      throwing5 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing5(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing5 = "JoinPointInfo,Throwable,Interface";
+      throwing5 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing5(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing5(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing5 = "JoinPointInfo,Throwable,Object";
+      throwing5 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing5(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing5(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing5 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing5 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing5(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing5 = "JoinPointInfo,Throwable,Object[]";
+      throwing5 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing5(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing5 = "JoinPointInfo,Object,Object[]";
+      throwing5 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing5(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -1893,147 +1893,147 @@
       throwing5 = "Object";
    }
    
-   public void throwing5(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing5(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING6 ADVICE */
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing6 = "JoinPointInfo,Throwable,SuperInterface,SuperInterface";
+      throwing6 = "JoinPointBean,Throwable,SuperInterface,SuperInterface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SubInterface,Implementor";
+      throwing6 = "JoinPointBean,Object,SubInterface,Implementor";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing6 = "JoinPointInfo,Object,Interface,Implementor";
+      throwing6 = "JoinPointBean,Object,Interface,Implementor";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SubInterface,SubInterface";
+      throwing6 = "JoinPointBean,Object,SubInterface,SubInterface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SubInterface,Object";
+      throwing6 = "JoinPointBean,Object,SubInterface,Object";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing6 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing6 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing6 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing6 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing6 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing6 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,Interface,Interface";
+      throwing6 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing6 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing6 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing6 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing6(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing6 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing6 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing6(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing6 = "JoinPointInfo,Throwable,SubInterface";
+      throwing6 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing6(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing6(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing6 = "JoinPointInfo,Throwable,Implementor";
+      throwing6 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing6(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing6 = "JoinPointInfo,Throwable,Interface";
+      throwing6 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing6(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing6(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing6 = "JoinPointInfo,Throwable,Object";
+      throwing6 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing6(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing6(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing6 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing6 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing6(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing6 = "JoinPointInfo,Throwable,Object[]";
+      throwing6 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing6(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing6 = "JoinPointInfo,Object,Object[]";
+      throwing6 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing6(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -2196,140 +2196,140 @@
       throwing6 = "Object";
    }
    
-   public void throwing6(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing6(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING7 ADVICE */
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Implementor arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SubInterface,Implementor";
+      throwing7 = "JoinPointBean,Object,SubInterface,Implementor";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing7 = "JoinPointInfo,Object,Interface,Implementor";
+      throwing7 = "JoinPointBean,Object,Interface,Implementor";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SubInterface,SubInterface";
+      throwing7 = "JoinPointBean,Object,SubInterface,SubInterface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SubInterface,Object";
+      throwing7 = "JoinPointBean,Object,SubInterface,Object";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing7 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing7 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing7 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing7 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing7 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing7 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,Interface,Interface";
+      throwing7 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing7 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing7 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing7 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing7(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing7 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing7 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing7(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing7 = "JoinPointInfo,Throwable,SubInterface";
+      throwing7 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing7(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing7(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing7 = "JoinPointInfo,Throwable,Implementor";
+      throwing7 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing7(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing7 = "JoinPointInfo,Throwable,Interface";
+      throwing7 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing7(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing7(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing7 = "JoinPointInfo,Throwable,Object";
+      throwing7 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing7(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing7(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing7 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing7 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing7(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing7 = "JoinPointInfo,Throwable,Object[]";
+      throwing7 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing7(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing7 = "JoinPointInfo,Object,Object[]";
+      throwing7 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing7(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -2492,134 +2492,134 @@
       throwing7 = "Object";
    }
    
-   public void throwing7(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing7(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING8 ADVICE */
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Implementor arg2)
    {
-      throwing8 = "JoinPointInfo,Object,Interface,Implementor";
+      throwing8 = "JoinPointBean,Object,Interface,Implementor";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg SubInterface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,SubInterface,SubInterface";
+      throwing8 = "JoinPointBean,Object,SubInterface,SubInterface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing8 = "JoinPointInfo,Object,SubInterface,Object";
+      throwing8 = "JoinPointBean,Object,SubInterface,Object";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing8 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing8 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing8 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing8 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing8 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing8 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing8 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,Interface,Interface";
+      throwing8 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing8 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing8 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing8 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing8(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing8 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing8 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing8(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing8 = "JoinPointInfo,Throwable,SubInterface";
+      throwing8 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing8(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing8(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing8 = "JoinPointInfo,Throwable,Implementor";
+      throwing8 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing8(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing8 = "JoinPointInfo,Throwable,Interface";
+      throwing8 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing8(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing8(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing8 = "JoinPointInfo,Throwable,Object";
+      throwing8 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing8(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing8(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing8 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing8 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing8(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing8 = "JoinPointInfo,Throwable,Object[]";
+      throwing8 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing8(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing8 = "JoinPointInfo,Object,Object[]";
+      throwing8 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing8(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -2782,116 +2782,116 @@
       throwing8 = "Object";
    }
    
-   public void throwing8(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing8(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING9 ADVICE */
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg,
          @Arg Implementor implementor)
    {
-      throwing9 = "JoinPointInfo,Object,SuperInterface,Implementor";
+      throwing9 = "JoinPointBean,Object,SuperInterface,Implementor";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, @Arg Interface arg2)
    {
-      throwing9 = "JoinPointInfo,Object,SubInterface,Interface";
+      throwing9 = "JoinPointBean,Object,SubInterface,Interface";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SubInterface arg2)
    {
-      throwing9 = "JoinPointInfo,Object,Interface,SubInterface";
+      throwing9 = "JoinPointBean,Object,Interface,SubInterface";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing9 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing9 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing9 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing9 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing9 = "JoinPointInfo,Object,Interface,Interface";
+      throwing9 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing9 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing9 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing9 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing9 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing9 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing9 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing9(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing9 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing9 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing9(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing9 = "JoinPointInfo,Throwable,SubInterface";
+      throwing9 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing9(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing9(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing9 = "JoinPointInfo,Throwable,Implementor";
+      throwing9 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing9(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing9 = "JoinPointInfo,Throwable,Interface";
+      throwing9 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing9(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing9(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing9 = "JoinPointInfo,Throwable,Object";
+      throwing9 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing9(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing9(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing9 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing9 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing9(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing9 = "JoinPointInfo,Throwable,Object[]";
+      throwing9 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing9(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing9 = "JoinPointInfo,Object,Object[]";
+      throwing9 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing9(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -3054,97 +3054,97 @@
       throwing9 = "Object";
    }
    
-   public void throwing9(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing9(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING10 ADVICE */
    
-   public void throwing10(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing10(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1,
          @Arg SubInterface arg2)
    {
-      throwing10 = "JoinPointInfo,Object,SuperInterface,SubInterface";
+      throwing10 = "JoinPointBean,Object,SuperInterface,SubInterface";
    }
 
-   public void throwing10(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing10(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg(index=1) Object arg2)
    {
-      throwing10 = "JoinPointInfo,Object,SuperInterface,Object";
+      throwing10 = "JoinPointBean,Object,SuperInterface,Object";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing10(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg Interface arg2)
    {
-      throwing10 = "JoinPointInfo,Object,Interface,Interface";
+      throwing10 = "JoinPointBean,Object,Interface,Interface";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing10(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SubInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing10 = "JoinPointInfo,Object,SubInterface,SuperInterface";
+      throwing10 = "JoinPointBean,Object,SubInterface,SuperInterface";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing10(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing10 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing10 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing10(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing10 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing10 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing10(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing10 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing10 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing10(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing10 = "JoinPointInfo,Throwable,SubInterface";
+      throwing10 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing10(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing10(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing10 = "JoinPointInfo,Throwable,Implementor";
+      throwing10 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing10(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing10 = "JoinPointInfo,Throwable,Interface";
+      throwing10 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing10(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing10(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing10 = "JoinPointInfo,Throwable,Object";
+      throwing10 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing10(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing10(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing10 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing10 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing10(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing10 = "JoinPointInfo,Throwable,Object[]";
+      throwing10 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing10(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing10 = "JoinPointInfo,Object,Object[]";
+      throwing10 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing10(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -3307,71 +3307,71 @@
       throwing10 = "Object";
    }
    
-   public void throwing10(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing10(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING11 ADVICE */
    
-   public void throwing11(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing11(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, @Arg Interface arg2)
    {
-      throwing11 = "JoinPointInfo,Object,SuperInterface,Interface";
+      throwing11 = "JoinPointBean,Object,SuperInterface,Interface";
    }
    
-   public void throwing11(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing11(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg Interface arg1, @Arg SuperInterface arg2)
    {
-      throwing11 = "JoinPointInfo,Object,Interface,SuperInterface";
+      throwing11 = "JoinPointBean,Object,Interface,SuperInterface";
    }
    
-   public void throwing11(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing11(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing11 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing11 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing11(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing11(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing11 = "JoinPointInfo,Throwable,SubInterface";
+      throwing11 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing11(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing11(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing11 = "JoinPointInfo,Throwable,Implementor";
+      throwing11 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing11(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing11(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing11 = "JoinPointInfo,Throwable,Interface";
+      throwing11 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing11(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing11(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing11 = "JoinPointInfo,Throwable,Object";
+      throwing11 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing11(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing11(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing11 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing11 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing11(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing11(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing11 = "JoinPointInfo,Throwable,Object[]";
+      throwing11 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing11(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing11(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing11 = "JoinPointInfo,Object,Object[]";
+      throwing11 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing11(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -3534,59 +3534,59 @@
       throwing11 = "Object";
    }
    
-   public void throwing11(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing11(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING12 ADVICE */
    
-   public void throwing12(@JoinPoint JoinPointInfo joinpoint,
+   public void throwing12(@JoinPoint JoinPointBean joinpoint,
          @Thrown Object thrown, @Arg SuperInterface arg1, 
          @Arg SuperInterface arg2)
    {
-      throwing12 = "JoinPointInfo,Object,SuperInterface,SuperInterface";
+      throwing12 = "JoinPointBean,Object,SuperInterface,SuperInterface";
    }
    
-   public void throwing12(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing12(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing12 = "JoinPointInfo,Throwable,SubInterface";
+      throwing12 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing12(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing12(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing12 = "JoinPointInfo,Throwable,Implementor";
+      throwing12 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing12(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing12(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing12 = "JoinPointInfo,Throwable,Interface";
+      throwing12 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing12(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing12(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing12 = "JoinPointInfo,Throwable,Object";
+      throwing12 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing12(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing12(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing12 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing12 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing12(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing12(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing12 = "JoinPointInfo,Throwable,Object[]";
+      throwing12 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing12(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing12(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing12 = "JoinPointInfo,Object,Object[]";
+      throwing12 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing12(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -3749,52 +3749,52 @@
       throwing12 = "Object";
    }
    
-   public void throwing12(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing12(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING13 ADVICE */
    
-   public void throwing13(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing13(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SubInterface arg1)
    {
-      throwing13 = "JoinPointInfo,Throwable,SubInterface";
+      throwing13 = "JoinPointBean,Throwable,SubInterface";
    }
 
-   public void throwing13(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing13(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Implementor arg2)
    {
-      throwing13 = "JoinPointInfo,Throwable,Implementor";
+      throwing13 = "JoinPointBean,Throwable,Implementor";
    }
    
-   public void throwing13(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing13(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing13 = "JoinPointInfo,Throwable,Interface";
+      throwing13 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing13(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing13(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing13 = "JoinPointInfo,Throwable,Object";
+      throwing13 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing13(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing13(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing13 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing13 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing13(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing13(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing13 = "JoinPointInfo,Throwable,Object[]";
+      throwing13 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing13(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing13(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing13 = "JoinPointInfo,Object,Object[]";
+      throwing13 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing13(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -3957,40 +3957,40 @@
       throwing13 = "Object";
    }
    
-   public void throwing13(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing13(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING14 ADVICE */
    
-   public void throwing14(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing14(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg Interface arg1)
    {
-      throwing14 = "JoinPointInfo,Throwable,Interface";
+      throwing14 = "JoinPointBean,Throwable,Interface";
    }
 
-   public void throwing14(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing14(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg(index=1) Object arg2)
    {
-      throwing14 = "JoinPointInfo,Throwable,Object";
+      throwing14 = "JoinPointBean,Throwable,Object";
    }
-   public void throwing14(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing14(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing14 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing14 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing14(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing14(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing14 = "JoinPointInfo,Throwable,Object[]";
+      throwing14 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing14(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing14(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing14 = "JoinPointInfo,Object,Object[]";
+      throwing14 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing14(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -4153,29 +4153,29 @@
       throwing14 = "Object";
    }
    
-   public void throwing14(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing14(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING15 ADVICE */
    
-   public void throwing15(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing15(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Arg SuperInterface arg1)
    {
-      throwing15 = "JoinPointInfo,Throwable,SuperInterface";
+      throwing15 = "JoinPointBean,Throwable,SuperInterface";
    }
    
-   public void throwing15(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing15(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing15 = "JoinPointInfo,Throwable,Object[]";
+      throwing15 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing15(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing15(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing15 = "JoinPointInfo,Object,Object[]";
+      throwing15 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing15(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -4338,23 +4338,23 @@
       throwing15 = "Object";
    }
    
-   public void throwing15(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing15(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING16 ADVICE */
    
-   public void throwing16(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing16(@JoinPoint JoinPointBean joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing16 = "JoinPointInfo,Throwable,Object[]";
+      throwing16 = "JoinPointBean,Throwable,Object[]";
    }
    
-   public void throwing16(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing16(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing16 = "JoinPointInfo,Object,Object[]";
+      throwing16 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing16(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -4517,17 +4517,17 @@
       throwing16 = "Object";
    }
    
-   public void throwing16(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing16(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING17 ADVICE */
    
-   public void throwing17(@JoinPoint JoinPointInfo joinPoint,
+   public void throwing17(@JoinPoint JoinPointBean joinPoint,
          @Thrown Object thrown, @Args Object[] args)
    {
-      throwing17 = "JoinPointInfo,Object,Object[]";
+      throwing17 = "JoinPointBean,Object,Object[]";
    }
    
    public void throwing17(@Thrown Throwable thrown, @Arg SubInterface arg1,
@@ -4690,7 +4690,7 @@
       throwing17 = "Object";
    }
    
-   public void throwing17(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing17(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4857,7 +4857,7 @@
       throwing18 = "Object";
    }
    
-   public void throwing18(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing18(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5018,7 +5018,7 @@
       throwing19 = "Object";
    }
    
-   public void throwing19(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing19(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5161,7 +5161,7 @@
       throwing20 = "Object";
    }
    
-   public void throwing20(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing20(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5286,7 +5286,7 @@
       throwing21 = "Object";
    }
    
-   public void throwing21(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing21(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5387,7 +5387,7 @@
       throwing22 = "Object";
    }
    
-   public void throwing22(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing22(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5476,7 +5476,7 @@
       throwing23 = "Object";
    }
    
-   public void throwing23(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing23(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5559,7 +5559,7 @@
       throwing24 = "Object";
    }
    
-   public void throwing24(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing24(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5636,7 +5636,7 @@
       throwing25 = "Object";
    }
    
-   public void throwing25(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing25(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5703,7 +5703,7 @@
       throwing26 = "Object";
    }
    
-   public void throwing26(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing26(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5760,7 +5760,7 @@
       throwing27 = "Object";
    }
    
-   public void throwing27(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing27(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5812,7 +5812,7 @@
       throwing28 = "Object";
    }
    
-   public void throwing28(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing28(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5854,7 +5854,7 @@
       throwing29 = "Object";
    }
    
-   public void throwing29(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing29(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5886,7 +5886,7 @@
       throwing30 = "Object";
    }
    
-   public void throwing30(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing30(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5913,7 +5913,7 @@
       throwing31 = "Object";
    }
    
-   public void throwing31(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing31(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5935,7 +5935,7 @@
       throwing32 = "Object";
    }
    
-   public void throwing32(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing32(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5952,7 +5952,7 @@
       throwing33 = "Object";
    }
    
-   public void throwing33(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing33(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -5964,7 +5964,7 @@
       throwing34 = "Object";
    }
    
-   public void throwing34(@JoinPoint JoinPointInfo joinpoint)
+   public void throwing34(@JoinPoint JoinPointBean joinpoint)
    {
       Assert.fail("This advice should never be executed");
    }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingCallAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingCallAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/OverloadedThrowingCallAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,13 +23,13 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.MethodByMethodInfo;
 import org.jboss.aop.advice.annotation.Arg;
 import org.jboss.aop.advice.annotation.Args;
 import org.jboss.aop.advice.annotation.Caller;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Target;
 import org.jboss.aop.advice.annotation.Thrown;
+import org.jboss.aop.joinpoint.MethodCallByMethod;
 
 /**
  * Aspect used on overloaded throwing advice tests (for Call and Target tests
@@ -147,85 +147,85 @@
 
    /* THROWING1 ADVICE */
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,boolean";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,boolean";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,boolean";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,boolean";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,boolean";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,boolean";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing1 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing1 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing1 = "MethodByMethodInfo,Throwable,boolean";
+      throwing1 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing1 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing1 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing1 = "MethodByMethodInfo,Throwable";
+      throwing1 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing1(@Target OverloadedAdvicePOJO target,
@@ -381,84 +381,84 @@
       throwing1 = "Throwable,boolean";
    }
    
-   public void throwing1(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing1(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING2 ADVICE */
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing2 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      throwing2 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,boolean";
+      throwing2 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,boolean";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      throwing2 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown)
    {
-      throwing2 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      throwing2 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,boolean";
+      throwing2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,boolean";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing2 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing2 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing2 = "MethodByMethodInfo,Throwable,boolean";
+      throwing2 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing2 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing2 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing2 = "MethodByMethodInfo,Throwable";
+      throwing2 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing2(@Target OverloadedAdvicePOJO target,
@@ -614,76 +614,76 @@
       throwing2 = "Throwable,boolean";
    }
    
-   public void throwing2(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing2(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING3 ADVICE */
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing3 = "MethodByMethodInfo,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
+      throwing3 = "MethodCallByMethod,OverloadedAdvicePOJO,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,boolean";
+      throwing3 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,boolean";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      throwing3 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown)
    {
-      throwing3 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      throwing3 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,boolean";
+      throwing3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,boolean";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing3 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing3 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing3 = "MethodByMethodInfo,Throwable,boolean";
+      throwing3 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing3 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing3 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing3 = "MethodByMethodInfo,Throwable";
+      throwing3 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing3(@Target OverloadedAdvicePOJO target,
@@ -839,69 +839,69 @@
       throwing3 = "Throwable,boolean";
    }
    
-   public void throwing3(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing3(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING4 ADVICE */
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,boolean";
+      throwing4 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,boolean";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      throwing4 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown)
    {
-      throwing4 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      throwing4 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,boolean";
+      throwing4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,boolean";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing4 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing4 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing4 = "MethodByMethodInfo,Throwable,boolean";
+      throwing4 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing4 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing4 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing4 = "MethodByMethodInfo,Throwable";
+      throwing4 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing4(@Target OverloadedAdvicePOJO target,
@@ -1057,62 +1057,62 @@
       throwing4 = "Throwable,boolean";
    }
    
-   public void throwing4(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing4(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING5 ADVICE */
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing5 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable,Object[]";
+      throwing5 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable,Object[]";
    }
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown)
    {
-      throwing5 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      throwing5 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,boolean";
+      throwing5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,boolean";
    }
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing5 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing5 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing5 = "MethodByMethodInfo,Throwable,boolean";
+      throwing5 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing5 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing5 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing5 = "MethodByMethodInfo,Throwable";
+      throwing5 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing5(@Target OverloadedAdvicePOJO target,
@@ -1268,55 +1268,55 @@
       throwing5 = "Throwable,boolean";
    }
    
-   public void throwing5(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing5(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING6 ADVICE */
    
-   public void throwing6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing6(@JoinPoint MethodCallByMethod joinPoint,
          @Target OverloadedAdvicePOJO target, @Thrown Throwable thrown)
    {
-      throwing6 = "MethodByMethodInfo,OverloadedAdvicePOJO,Throwable";
+      throwing6 = "MethodCallByMethod,OverloadedAdvicePOJO,Throwable";
    }
    
-   public void throwing6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,boolean";
+      throwing6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,boolean";
    }
    
-   public void throwing6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing6(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing6 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing6 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing6(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing6 = "MethodByMethodInfo,Throwable,boolean";
+      throwing6 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing6(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing6 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing6 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing6(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing6(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing6 = "MethodByMethodInfo,Throwable";
+      throwing6 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing6(@Target OverloadedAdvicePOJO target,
@@ -1472,49 +1472,49 @@
       throwing6 = "Throwable,boolean";
    }
    
-   public void throwing6(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing6(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING7 ADVICE */
    
-   public void throwing7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Arg boolean arg)
    {
-      throwing7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,boolean";
+      throwing7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,boolean";
    }
    
-   public void throwing7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing7(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing7 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing7 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing7(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing7 = "MethodByMethodInfo,Throwable,boolean";
+      throwing7 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing7(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing7 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing7 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing7(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing7(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing7 = "MethodByMethodInfo,Throwable";
+      throwing7 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing7(@Target OverloadedAdvicePOJO target,
@@ -1670,42 +1670,42 @@
       throwing7 = "Throwable,boolean";
    }
    
-   public void throwing7(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing7(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING8 ADVICE */
    
-   public void throwing8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown,
          @Args Object[] args)
    {
-      throwing8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable,Object[]";
+      throwing8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable,Object[]";
    }
    
-   public void throwing8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing8(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing8 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing8 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing8(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing8 = "MethodByMethodInfo,Throwable,boolean";
+      throwing8 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing8(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing8 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing8 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing8(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing8(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing8 = "MethodByMethodInfo,Throwable";
+      throwing8 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing8(@Target OverloadedAdvicePOJO target,
@@ -1861,35 +1861,35 @@
       throwing8 = "Throwable,boolean";
    }
    
-   public void throwing8(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing8(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING9 ADVICE */
    
-   public void throwing9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing9(@JoinPoint MethodCallByMethod joinPoint,
          @Caller OverloadedAdvicePOJOCaller caller, @Thrown Throwable thrown)
    {
-      throwing9 = "MethodByMethodInfo,OverloadedAdvicePOJOCaller,Throwable";
+      throwing9 = "MethodCallByMethod,OverloadedAdvicePOJOCaller,Throwable";
    }
    
-   public void throwing9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing9(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing9 = "MethodByMethodInfo,Throwable,boolean";
+      throwing9 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing9(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing9 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing9 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing9(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing9(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing9 = "MethodByMethodInfo,Throwable";
+      throwing9 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing9(@Target OverloadedAdvicePOJO target,
@@ -2045,29 +2045,29 @@
       throwing9 = "Throwable,boolean";
    }
    
-   public void throwing9(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing9(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING10 ADVICE */
    
-   public void throwing10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing10(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Arg boolean arg)
    {
-      throwing10 = "MethodByMethodInfo,Throwable,boolean";
+      throwing10 = "MethodCallByMethod,Throwable,boolean";
    }
    
-   public void throwing10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing10(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing10 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing10 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing10(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing10(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing10 = "MethodByMethodInfo,Throwable";
+      throwing10 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing10(@Target OverloadedAdvicePOJO target,
@@ -2223,23 +2223,23 @@
       throwing10 = "Throwable,boolean";
    }
    
-   public void throwing10(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing10(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING11 ADVICE */
    
-   public void throwing11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing11(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown, @Args Object[] args)
    {
-      throwing11 = "MethodByMethodInfo,Throwable,Object[]";
+      throwing11 = "MethodCallByMethod,Throwable,Object[]";
    }
    
-   public void throwing11(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing11(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing11 = "MethodByMethodInfo,Throwable";
+      throwing11 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing11(@Target OverloadedAdvicePOJO target,
@@ -2395,17 +2395,17 @@
       throwing11 = "Throwable,boolean";
    }
    
-   public void throwing11(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing11(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
    
    /* THROWING12 ADVICE */
    
-   public void throwing12(@JoinPoint MethodByMethodInfo joinPointInfo,
+   public void throwing12(@JoinPoint MethodCallByMethod joinPoint,
          @Thrown Throwable thrown)
    {
-      throwing12 = "MethodByMethodInfo,Throwable";
+      throwing12 = "MethodCallByMethod,Throwable";
    }
    
    public void throwing12(@Target OverloadedAdvicePOJO target,
@@ -2561,7 +2561,7 @@
       throwing12 = "Throwable,boolean";
    }
    
-   public void throwing12(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing12(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -2721,7 +2721,7 @@
       throwing13 = "Throwable,boolean";
    }
    
-   public void throwing13(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing13(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -2874,7 +2874,7 @@
       throwing14 = "Throwable,boolean";
    }
    
-   public void throwing14(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing14(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3020,7 +3020,7 @@
       throwing15 = "Throwable,boolean";
    }
    
-   public void throwing15(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing15(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3159,7 +3159,7 @@
       throwing16 = "Throwable,boolean";
    }
    
-   public void throwing16(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing16(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3292,7 +3292,7 @@
       throwing17 = "Throwable,boolean";
    }
    
-   public void throwing17(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing17(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3417,7 +3417,7 @@
       throwing18 = "Throwable,boolean";
    }
    
-   public void throwing18(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing18(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3536,7 +3536,7 @@
       throwing19 = "Throwable,boolean";
    }
    
-   public void throwing19(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing19(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3648,7 +3648,7 @@
       throwing20 = "Throwable,boolean";
    }
    
-   public void throwing20(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing20(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3754,7 +3754,7 @@
       throwing21 = "Throwable,boolean";
    }
    
-   public void throwing21(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing21(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3854,7 +3854,7 @@
       throwing22 = "Throwable,boolean";
    }
    
-   public void throwing22(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing22(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -3948,7 +3948,7 @@
       throwing23 = "Throwable,boolean";
    }
    
-   public void throwing23(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing23(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4036,7 +4036,7 @@
       throwing24 = "Throwable,boolean";
    }
    
-   public void throwing24(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing24(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4118,7 +4118,7 @@
       throwing25 = "Throwable,boolean";
    }
    
-   public void throwing25(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing25(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4194,7 +4194,7 @@
       throwing26 = "Throwable,boolean";
    }
    
-   public void throwing26(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing26(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4264,7 +4264,7 @@
       throwing27 = "Throwable,boolean";
    }
    
-   public void throwing27(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing27(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4328,7 +4328,7 @@
       throwing28 = "Throwable,boolean";
    }
    
-   public void throwing28(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing28(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4386,7 +4386,7 @@
       throwing29 = "Throwable,boolean";
    }
    
-   public void throwing29(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing29(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4438,7 +4438,7 @@
       throwing30 = "Throwable,boolean";
    }
    
-   public void throwing30(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing30(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4485,7 +4485,7 @@
       throwing31 = "Throwable,boolean";
    }
    
-   public void throwing31(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing31(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4526,7 +4526,7 @@
       throwing32 = "Throwable,boolean";
    }
    
-   public void throwing32(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing32(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4561,7 +4561,7 @@
       throwing33 = "Throwable,boolean";
    }
    
-   public void throwing33(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing33(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4590,7 +4590,7 @@
       throwing34 = "Throwable,boolean";
    }
    
-   public void throwing34(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing34(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4613,7 +4613,7 @@
       throwing35 = "Throwable,boolean";
    }
    
-   public void throwing35(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing35(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4630,7 +4630,7 @@
       throwing36 = "Throwable,boolean";
    }
    
-   public void throwing36(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing36(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }
@@ -4642,7 +4642,7 @@
       throwing37 = "Throwable,boolean";
    }
    
-   public void throwing37(@JoinPoint MethodByMethodInfo joinPointInfo)
+   public void throwing37(@JoinPoint MethodCallByMethod joinPoint)
    {
       Assert.fail("This advice should never be executed");
    }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnAspect.java	2007-06-08 23:34:32 UTC (rev 63438)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ReturnAspect.java	2007-06-09 05:32:34 UTC (rev 63439)
@@ -23,11 +23,11 @@
 
 import junit.framework.Assert;
 
-import org.jboss.aop.JoinPointInfo;
 import org.jboss.aop.advice.annotation.JoinPoint;
 import org.jboss.aop.advice.annotation.Return;
 import org.jboss.aop.advice.annotation.Thrown;
 import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.aop.joinpoint.JoinPointBean;
 
 /**
  * Aspect used both on @Return parameter tests, and on advice return type tests.
@@ -145,7 +145,7 @@
       return new SuperValue(120);
    }
    
-   public void after1(@org.jboss.aop.advice.annotation.JoinPoint JoinPointInfo info) throws Exception
+   public void after1(@org.jboss.aop.advice.annotation.JoinPoint JoinPointBean info) throws Exception
    {
       afterAdvice = "after1";
    }
@@ -156,7 +156,7 @@
       afterReturn = returnedValue;
    }
    
-   public Object after3(@JoinPoint JoinPointInfo info, @Return String returnedValue)
+   public Object after3(@JoinPoint JoinPointBean info, @Return String returnedValue)
    throws Throwable
    {
       afterAdvice = "after3";
@@ -182,7 +182,7 @@
       afterAdvice = "after6";
    }
    
-   public String after7(@JoinPoint JoinPointInfo joinPoint,
+   public String after7(@JoinPoint JoinPointBean joinPoint,
          @Return String returnedValue) throws Throwable
    {
       afterAdvice = "after7";




More information about the jboss-cvs-commits mailing list