[jboss-cvs] JBossAS SVN: r78571 - in tags/JBoss_AOP_1_5_5_GA_CP02/aop/src: resources/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 16 05:28:29 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-09-16 05:28:28 -0400 (Tue, 16 Sep 2008)
New Revision: 78571
Removed:
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/resources/test/synthetic/
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/test/org/jboss/test/aop/synthetic/
Modified:
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/ClassicInstrumentor.java
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/ConstructorExecutionTransformer.java
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/FieldAccessTransformer.java
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/NonOptimizedMethodExecutionTransformer.java
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java
tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/TransformerCommon.java
Log:
[JBAOP-642] Undo changes that were done against the wrong tag/branch
Modified: tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/ClassicInstrumentor.java
===================================================================
--- tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/ClassicInstrumentor.java 2008-09-16 09:18:08 UTC (rev 78570)
+++ tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/ClassicInstrumentor.java 2008-09-16 09:28:28 UTC (rev 78571)
@@ -119,7 +119,6 @@
method.getExceptionTypes(), null, clazz);
nmethod.setModifiers(method.getModifiers());
nmethod.setBody(code);
- addSyntheticAttribute(nmethod);
clazz.addMethod(nmethod);
@@ -184,7 +183,6 @@
" return " + ClassicInstrumentor.HELPER_FIELD_NAME + ";" +
"}",
clazz);
- addSyntheticAttribute(getter);
clazz.addMethod(getter);
}
@@ -205,7 +203,6 @@
" } " +
"}",
clazz);
- addSyntheticAttribute(getter);
clazz.addMethod(getter);
CtMethod setter = CtNewMethod.make("public void _setInstanceAdvisor(org.jboss.aop.InstanceAdvisor newAdvisor)" +
@@ -215,7 +212,6 @@
" } " +
"}",
clazz);
- addSyntheticAttribute(setter);
clazz.addMethod(setter);
}
Modified: tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/ConstructorExecutionTransformer.java
===================================================================
--- tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/ConstructorExecutionTransformer.java 2008-09-16 09:18:08 UTC (rev 78570)
+++ tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/ConstructorExecutionTransformer.java 2008-09-16 09:28:28 UTC (rev 78571)
@@ -486,7 +486,6 @@
CtMethod wmethod = CtNewMethod.make(type, constructorFactory(name), constructor.getParameterTypes(), exceptions, null, clazz);
wmethod.setModifiers(mod);
setTemporaryWrapperCode(type, wmethod);
- Instrumentor.addSyntheticAttribute(wmethod);
clazz.addMethod(wmethod);
// prepare ForWrapping
Modified: tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/FieldAccessTransformer.java
===================================================================
--- tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/FieldAccessTransformer.java 2008-09-16 09:18:08 UTC (rev 78570)
+++ tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/FieldAccessTransformer.java 2008-09-16 09:28:28 UTC (rev 78571)
@@ -546,7 +546,6 @@
CtMethod rmethod = CtNewMethod.make(ftype, wrapperName, readParam, null, null, clazz);
rmethod.setModifiers(mod);
rmethod.setBody(code);
- Instrumentor.addSyntheticAttribute(rmethod);
clazz.addMethod(rmethod);
return rmethod;
@@ -579,7 +578,6 @@
CtMethod wmethod = CtNewMethod.make(CtClass.voidType, wrapperName, writeParam, null, null, clazz);
wmethod.setModifiers(mod);
wmethod.setBody("{}");
- Instrumentor.addSyntheticAttribute(wmethod);
clazz.addMethod(wmethod);
return wmethod;
Modified: tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/Instrumentor.java 2008-09-16 09:18:08 UTC (rev 78570)
+++ tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/Instrumentor.java 2008-09-16 09:28:28 UTC (rev 78571)
@@ -240,26 +240,6 @@
clazz);
newMethod.setModifiers(Modifier.PUBLIC);
clazz.addMethod(newMethod);
-
- //TODO remove this hack once we have a version of javassist that makes the _added_m$ methods synthetic
- //The following depends on javassist internals
- try
- {
- ClassFile cf = clazz.getClassFile();
- List infos = cf.getMethods();
- MethodInfo info = (MethodInfo)infos.get(infos.size() - 2);
- if (info.getName().startsWith("_added_m$"))
- {
- addSyntheticAttribute(info);
- }
- }
- catch(Exception e)
- {
- if (AspectManager.verbose)
- {
- System.out.println("Error making added wrapper method synthetic for mixin method " + newMethod.getName());
- }
- }
}
private void addMixin(CtClass clazz, InterfaceIntroduction pointcut, InterfaceIntroduction.Mixin mixin, HashMap baseMethods) throws Exception
@@ -305,7 +285,6 @@
int modifiers = Modifier.PRIVATE;
if (mixin.isTransient()) modifiers = modifiers | Modifier.TRANSIENT;
field.setModifiers(modifiers);
- addSyntheticAttribute(field);
clazz.addField(field, CtField.Initializer.byExpr(initializer));
HashSet addedMethods = new HashSet();
@@ -873,7 +852,6 @@
CtField field = new CtField(type, name, clazz);
field.setModifiers(Modifier.PRIVATE | Modifier.STATIC);
clazz.addField(field, initializer);
- addSyntheticAttribute(field);
return field;
}
@@ -896,7 +874,6 @@
{
clazz.addField(field);
}
- addSyntheticAttribute(field);
return field;
}
@@ -1097,33 +1074,6 @@
hotSwapper.hotSwap();
}
-
- public static void addSyntheticAttribute(CtMethod method)
- {
- MethodInfo info = method.getMethodInfo();
- addSyntheticAttribute(info);
- }
-
- public static void addSyntheticAttribute(MethodInfo info)
- {
- ConstPool cp = info.getConstPool();
- info.addAttribute(new SyntheticAttribute(cp));
- }
-
- public static void addSyntheticAttribute(CtConstructor ctor)
- {
- MethodInfo info = ctor.getMethodInfo();
- ConstPool cp = info.getConstPool();
- info.addAttribute(new SyntheticAttribute(cp));
- }
-
- public static void addSyntheticAttribute(CtField field)
- {
- FieldInfo info = field.getFieldInfo();
- ConstPool cp = info.getConstPool();
- info.addAttribute(new SyntheticAttribute(cp));
- }
-
protected abstract void doSetupBasics(CtClass clazz) throws CannotCompileException, NotFoundException;
/**
Modified: tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/NonOptimizedMethodExecutionTransformer.java
===================================================================
--- tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/NonOptimizedMethodExecutionTransformer.java 2008-09-16 09:18:08 UTC (rev 78570)
+++ tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/NonOptimizedMethodExecutionTransformer.java 2008-09-16 09:28:28 UTC (rev 78571)
@@ -55,7 +55,6 @@
trans.getClazz().addMethod(wmethod);
moveAnnotations(trans.getMethod(), wmethod);
trans.getMethod().setName(wrappedName);
- Instrumentor.addSyntheticAttribute(trans.getMethod());
wmethod.setName(originalName);
trans.setWMethod(wmethod, wrappedName);
Modified: tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java
===================================================================
--- tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java 2008-09-16 09:18:08 UTC (rev 78570)
+++ tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/OptimizedMethodExecutionTransformer.java 2008-09-16 09:28:28 UTC (rev 78571)
@@ -55,7 +55,6 @@
/* TODO FLAVIA COMMENTED THIS TEMPORARILY */
String originalName = trans.getOriginalName();
wmethod.setName(wrappedName);
- Instrumentor.addSyntheticAttribute(wmethod);
trans.getClazz().addMethod(wmethod);
//moveAnnotations(trans.getMethod(), wmethod);
String optimizedInvocation = OptimizedMethodInvocations.createOptimizedInvocationClass(trans.getInstrumentor(), trans.getClazz(), trans.getMethod());
Modified: tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/TransformerCommon.java
===================================================================
--- tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/TransformerCommon.java 2008-09-16 09:18:08 UTC (rev 78570)
+++ tags/JBoss_AOP_1_5_5_GA_CP02/aop/src/main/org/jboss/aop/instrument/TransformerCommon.java 2008-09-16 09:28:28 UTC (rev 78571)
@@ -119,7 +119,6 @@
CtField field = new CtField(type, infoName, addTo);
field.setModifiers(modifiers);
addTo.addField(field, init);
- Instrumentor.addSyntheticAttribute(field);
}
private static void addStrongReferenceInfoField(Instrumentor instrumentor, String infoClassName, String infoName,
More information about the jboss-cvs-commits
mailing list