343 lines
18 KiB
Diff
343 lines
18 KiB
Diff
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/ASMByteCodeVisitor.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/ASMByteCodeVisitor.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/ASMByteCodeVisitor.java 2012-02-11 11:08:06.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/ASMByteCodeVisitor.java 2012-02-11 19:32:21.919666997 +0100
|
|
@@ -45,7 +45,7 @@
|
|
|
|
import java.util.Map ;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.ClassWriter ;
|
|
+import org.objectweb.asm.ClassWriter ;
|
|
|
|
import org.glassfish.pfl.dynamic.codegen.spi.Type ;
|
|
import org.glassfish.pfl.dynamic.codegen.spi.Variable ;
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/ASMUtil.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/ASMUtil.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/ASMUtil.java 2012-02-11 11:08:06.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/ASMUtil.java 2012-02-11 19:32:21.947666996 +0100
|
|
@@ -49,15 +49,15 @@
|
|
import java.io.FileOutputStream ;
|
|
import java.io.File ;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.ClassWriter ;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassVisitor ;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor ;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassAdapter ;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodAdapter ;
|
|
+import org.objectweb.asm.ClassWriter ;
|
|
+import org.objectweb.asm.ClassVisitor ;
|
|
+import org.objectweb.asm.MethodVisitor ;
|
|
+import org.objectweb.asm.ClassAdapter ;
|
|
+import org.objectweb.asm.MethodAdapter ;
|
|
|
|
// Imports for verify method
|
|
-import org.glassfish.pfl.objectweb.asm.ClassReader ;
|
|
-import org.glassfish.pfl.objectweb.asm.util.CheckClassAdapter ;
|
|
+import org.objectweb.asm.ClassReader ;
|
|
+import org.objectweb.asm.util.CheckClassAdapter ;
|
|
// end of verify method imports
|
|
|
|
import org.glassfish.pfl.dynamic.codegen.spi.ImportList ;
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/ByteCodeUtility.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/ByteCodeUtility.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/ByteCodeUtility.java 2012-02-11 11:08:06.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/ByteCodeUtility.java 2012-02-11 19:32:21.928666997 +0100
|
|
@@ -57,13 +57,13 @@
|
|
import org.glassfish.pfl.dynamic.codegen.spi.ClassInfo ;
|
|
import org.glassfish.pfl.dynamic.codegen.spi.MethodInfo ;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor ;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassWriter ;
|
|
-import org.glassfish.pfl.objectweb.asm.Label ;
|
|
-import org.glassfish.pfl.objectweb.asm.util.TraceMethodVisitor ;
|
|
+import org.objectweb.asm.MethodVisitor ;
|
|
+import org.objectweb.asm.ClassWriter ;
|
|
+import org.objectweb.asm.Label ;
|
|
+import org.objectweb.asm.util.TraceMethodVisitor ;
|
|
|
|
import static java.lang.reflect.Modifier.* ;
|
|
-import static org.glassfish.pfl.objectweb.asm.Opcodes.* ;
|
|
+import static org.objectweb.asm.Opcodes.* ;
|
|
|
|
/** Class that is responsible for low-level bytecode generation using ASM.
|
|
* It provides methods that directly generate bytecode in a MethodVisitor.
|
|
@@ -305,8 +305,8 @@
|
|
} else if (type.equals(Type._Class())) {
|
|
// value is a Type, so get a corresponding ASM type.
|
|
Type vtype = Type.class.cast( value ) ;
|
|
- org.glassfish.pfl.objectweb.asm.Type atype =
|
|
- org.glassfish.pfl.objectweb.asm.Type.getType( vtype.signature() ) ;
|
|
+ org.objectweb.asm.Type atype =
|
|
+ org.objectweb.asm.Type.getType( vtype.signature() ) ;
|
|
mv.visitLdcInsn( atype ) ;
|
|
} else if (type.equals( Type._String())) {
|
|
mv.visitLdcInsn( value ) ;
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/EmitterFactory.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/EmitterFactory.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/EmitterFactory.java 2012-02-11 11:08:06.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/EmitterFactory.java 2012-02-11 19:32:21.940666995 +0100
|
|
@@ -51,9 +51,9 @@
|
|
import org.glassfish.pfl.dynamic.codegen.spi.ClassInfo ;
|
|
import org.glassfish.pfl.dynamic.codegen.spi.FieldInfo ;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor ;
|
|
+import org.objectweb.asm.MethodVisitor ;
|
|
|
|
-import static org.glassfish.pfl.objectweb.asm.Opcodes.* ;
|
|
+import static org.objectweb.asm.Opcodes.* ;
|
|
|
|
/** This class provides methods that allow the construction of an
|
|
* object that can later be used to emit a bytecode. This is useful
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/MyLabel.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/MyLabel.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/dynamic/codegen/impl/MyLabel.java 2012-02-11 11:08:06.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/dynamic/codegen/impl/MyLabel.java 2012-02-11 19:32:21.932666997 +0100
|
|
@@ -40,7 +40,7 @@
|
|
|
|
package org.glassfish.pfl.dynamic.codegen.impl;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.Label ;
|
|
+import org.objectweb.asm.Label ;
|
|
|
|
/** This trivial class exists only to give a slightly
|
|
* more readable toString method for ASM labels.
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/spi/EnhancedClassDataASMImpl.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/spi/EnhancedClassDataASMImpl.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/spi/EnhancedClassDataASMImpl.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/spi/EnhancedClassDataASMImpl.java 2012-02-11 19:32:21.957666996 +0100
|
|
@@ -48,11 +48,11 @@
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
-import org.glassfish.pfl.objectweb.asm.Opcodes;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.AnnotationNode;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.ClassNode;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.MethodNode;
|
|
+import org.objectweb.asm.Opcodes;
|
|
+import org.objectweb.asm.Type;
|
|
+import org.objectweb.asm.tree.AnnotationNode;
|
|
+import org.objectweb.asm.tree.ClassNode;
|
|
+import org.objectweb.asm.tree.MethodNode;
|
|
|
|
public class EnhancedClassDataASMImpl extends EnhancedClassDataBase {
|
|
private final ClassNode currentClass ;
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/spi/EnhancedClassData.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/spi/EnhancedClassData.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/spi/EnhancedClassData.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/spi/EnhancedClassData.java 2012-02-11 19:32:21.951666996 +0100
|
|
@@ -46,7 +46,7 @@
|
|
import org.glassfish.pfl.basic.contain.SynchronizedHolder;
|
|
import org.glassfish.pfl.tf.spi.annotation.InfoMethod;
|
|
import org.glassfish.pfl.tf.spi.annotation.Description;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
+import org.objectweb.asm.Type;
|
|
|
|
/**
|
|
*
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/spi/EnhancedClassDataReflectiveImpl.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/spi/EnhancedClassDataReflectiveImpl.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/spi/EnhancedClassDataReflectiveImpl.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/spi/EnhancedClassDataReflectiveImpl.java 2012-02-11 19:32:21.978666995 +0100
|
|
@@ -51,7 +51,7 @@
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
+import org.objectweb.asm.Type;
|
|
|
|
public class EnhancedClassDataReflectiveImpl extends EnhancedClassDataBase {
|
|
private final Class<?> currentClass ;
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/spi/Util.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/spi/Util.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/spi/Util.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/spi/Util.java 2012-02-11 19:32:21.963666995 +0100
|
|
@@ -43,18 +43,18 @@
|
|
|
|
import java.io.PrintWriter;
|
|
import org.glassfish.pfl.basic.func.UnaryFunction;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassAdapter;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassReader;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassWriter;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Opcodes;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.LocalVariableNode;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.MethodInsnNode;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.MethodNode;
|
|
-import org.glassfish.pfl.objectweb.asm.util.AbstractVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.util.CheckClassAdapter;
|
|
+import org.objectweb.asm.ClassAdapter;
|
|
+import org.objectweb.asm.ClassReader;
|
|
+import org.objectweb.asm.ClassVisitor;
|
|
+import org.objectweb.asm.ClassWriter;
|
|
+import org.objectweb.asm.MethodVisitor;
|
|
+import org.objectweb.asm.Opcodes;
|
|
+import org.objectweb.asm.Type;
|
|
+import org.objectweb.asm.tree.LocalVariableNode;
|
|
+import org.objectweb.asm.tree.MethodInsnNode;
|
|
+import org.objectweb.asm.tree.MethodNode;
|
|
+import org.objectweb.asm.util.AbstractVisitor;
|
|
+import org.objectweb.asm.util.CheckClassAdapter;
|
|
|
|
/** Some useful utilities for generating code using ASM. Nothing in here
|
|
* should be specific to the classfile enhancer for tracing.
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/AnnotationScannerAction.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/AnnotationScannerAction.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/AnnotationScannerAction.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/AnnotationScannerAction.java 2012-02-11 19:32:21.982666995 +0100
|
|
@@ -53,15 +53,15 @@
|
|
import org.glassfish.pfl.tf.timer.spi.TimingInfoProcessor;
|
|
import org.glassfish.pfl.tf.spi.Util;
|
|
import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup;
|
|
-import org.glassfish.pfl.objectweb.asm.AnnotationVisitor;
|
|
+import org.objectweb.asm.AnnotationVisitor;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.ClassReader;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.FieldVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Opcodes;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
-import org.glassfish.pfl.objectweb.asm.commons.EmptyVisitor;
|
|
+import org.objectweb.asm.ClassReader;
|
|
+import org.objectweb.asm.ClassVisitor;
|
|
+import org.objectweb.asm.FieldVisitor;
|
|
+import org.objectweb.asm.MethodVisitor;
|
|
+import org.objectweb.asm.Opcodes;
|
|
+import org.objectweb.asm.Type;
|
|
+import org.objectweb.asm.commons.EmptyVisitor;
|
|
|
|
/** Scan all classes looking for annotations annotated with @MethodMonitorGroup,
|
|
* and saves the internal names of any such annotations.
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/ClassEnhancer.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/ClassEnhancer.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/ClassEnhancer.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/ClassEnhancer.java 2012-02-11 19:32:21.988666995 +0100
|
|
@@ -40,13 +40,13 @@
|
|
|
|
package org.glassfish.pfl.tf.tools.enhancer;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.ClassVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Label;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodAdapter;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Opcodes;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
-import org.glassfish.pfl.objectweb.asm.commons.GeneratorAdapter;
|
|
+import org.objectweb.asm.ClassVisitor;
|
|
+import org.objectweb.asm.Label;
|
|
+import org.objectweb.asm.MethodAdapter;
|
|
+import org.objectweb.asm.MethodVisitor;
|
|
+import org.objectweb.asm.Opcodes;
|
|
+import org.objectweb.asm.Type;
|
|
+import org.objectweb.asm.commons.GeneratorAdapter;
|
|
|
|
import org.glassfish.pfl.basic.contain.SynchronizedHolder ;
|
|
import org.glassfish.pfl.tf.spi.EnhancedClassData;
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/ClassTracer.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/ClassTracer.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/ClassTracer.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/ClassTracer.java 2012-02-11 19:32:22.003666993 +0100
|
|
@@ -47,15 +47,15 @@
|
|
import org.glassfish.pfl.tf.spi.MethodMonitor;
|
|
import org.glassfish.pfl.tf.spi.Util;
|
|
import org.glassfish.pfl.tf.spi.annotation.TraceEnhanceLevel;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Label;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Opcodes;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.LabelNode;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.LocalVariableNode;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodAdapter;
|
|
-import org.glassfish.pfl.objectweb.asm.commons.LocalVariablesSorter;
|
|
+import org.objectweb.asm.ClassVisitor;
|
|
+import org.objectweb.asm.Label;
|
|
+import org.objectweb.asm.MethodVisitor;
|
|
+import org.objectweb.asm.Opcodes;
|
|
+import org.objectweb.asm.Type;
|
|
+import org.objectweb.asm.tree.LabelNode;
|
|
+import org.objectweb.asm.tree.LocalVariableNode;
|
|
+import org.objectweb.asm.MethodAdapter;
|
|
+import org.objectweb.asm.commons.LocalVariablesSorter;
|
|
|
|
public class ClassTracer extends TFEnhanceAdapter {
|
|
// Worst case: call to MethodMonitor.info requires 4 words on the stack.
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/SimpleMethodTracer.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/SimpleMethodTracer.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/SimpleMethodTracer.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/SimpleMethodTracer.java 2012-02-11 19:32:22.008666996 +0100
|
|
@@ -44,11 +44,11 @@
|
|
import java.util.HashSet;
|
|
import java.util.Set;
|
|
import org.glassfish.pfl.tf.spi.Util;
|
|
-import org.glassfish.pfl.objectweb.asm.AnnotationVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Attribute;
|
|
-import org.glassfish.pfl.objectweb.asm.Label;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Opcodes;
|
|
+import org.objectweb.asm.AnnotationVisitor;
|
|
+import org.objectweb.asm.Attribute;
|
|
+import org.objectweb.asm.Label;
|
|
+import org.objectweb.asm.MethodVisitor;
|
|
+import org.objectweb.asm.Opcodes;
|
|
|
|
/**
|
|
*
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/StaticInitVisitor.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/StaticInitVisitor.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/StaticInitVisitor.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/StaticInitVisitor.java 2012-02-11 19:32:22.012666995 +0100
|
|
@@ -50,14 +50,14 @@
|
|
import org.glassfish.pfl.tf.spi.EnhancedClassData;
|
|
import org.glassfish.pfl.tf.spi.MethodMonitorRegistry;
|
|
import org.glassfish.pfl.tf.spi.Util;
|
|
-import org.glassfish.pfl.objectweb.asm.Label;
|
|
+import org.objectweb.asm.Label;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Opcodes;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
-import org.glassfish.pfl.objectweb.asm.commons.LocalVariablesSorter;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.LabelNode;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.LocalVariableNode;
|
|
+import org.objectweb.asm.MethodVisitor;
|
|
+import org.objectweb.asm.Opcodes;
|
|
+import org.objectweb.asm.Type;
|
|
+import org.objectweb.asm.commons.LocalVariablesSorter;
|
|
+import org.objectweb.asm.tree.LabelNode;
|
|
+import org.objectweb.asm.tree.LocalVariableNode;
|
|
|
|
/**
|
|
*
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/TFEnhanceAdapter.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/TFEnhanceAdapter.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/TFEnhanceAdapter.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/TFEnhanceAdapter.java 2012-02-11 19:32:22.016666995 +0100
|
|
@@ -44,12 +44,12 @@
|
|
import org.glassfish.pfl.tf.spi.TraceEnhancementException;
|
|
import org.glassfish.pfl.tf.spi.annotation.TFEnhanced;
|
|
import org.glassfish.pfl.tf.spi.annotation.TraceEnhanceLevel;
|
|
-import org.glassfish.pfl.objectweb.asm.AnnotationVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassAdapter;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.FieldVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.MethodVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Type;
|
|
+import org.objectweb.asm.AnnotationVisitor;
|
|
+import org.objectweb.asm.ClassAdapter;
|
|
+import org.objectweb.asm.ClassVisitor;
|
|
+import org.objectweb.asm.FieldVisitor;
|
|
+import org.objectweb.asm.MethodVisitor;
|
|
+import org.objectweb.asm.Type;
|
|
|
|
/**
|
|
*
|
|
diff -Nru glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/Transformer.java glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/Transformer.java
|
|
--- glassfish-pfl-3.2.0-b001/src/org/glassfish/pfl/tf/tools/enhancer/Transformer.java 2012-02-11 11:08:07.000000000 +0100
|
|
+++ glassfish-pfl-3.2.0-b001-gil/src/org/glassfish/pfl/tf/tools/enhancer/Transformer.java 2012-02-11 19:32:22.021666994 +0100
|
|
@@ -51,11 +51,11 @@
|
|
import org.glassfish.pfl.tf.spi.TraceEnhancementException;
|
|
import org.glassfish.pfl.tf.spi.Util;
|
|
|
|
-import org.glassfish.pfl.objectweb.asm.ClassAdapter;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassReader;
|
|
-import org.glassfish.pfl.objectweb.asm.ClassVisitor;
|
|
-import org.glassfish.pfl.objectweb.asm.Opcodes;
|
|
-import org.glassfish.pfl.objectweb.asm.tree.ClassNode;
|
|
+import org.objectweb.asm.ClassAdapter;
|
|
+import org.objectweb.asm.ClassReader;
|
|
+import org.objectweb.asm.ClassVisitor;
|
|
+import org.objectweb.asm.Opcodes;
|
|
+import org.objectweb.asm.tree.ClassNode;
|
|
|
|
/** ClassFile enhancer for the tracing facility. This modifies the bytecode
|
|
* for an applicable class, then returns the updated bytecode.
|