cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1332391 - in /cxf/trunk: api/ api/src/main/java/org/apache/cxf/common/jaxb/ api/src/main/java/org/apache/cxf/common/util/ distribution/ distribution/manifest/ integration/jca/ parent/ rt/bindings/corba/ rt/bindings/corba/src/main/java/org/...
Date Mon, 30 Apr 2012 21:03:45 GMT
Author: dkulp
Date: Mon Apr 30 21:03:44 2012
New Revision: 1332391

URL: http://svn.apache.org/viewvc?rev=1332391&view=rev
Log:
[CXF-4246] Wrapper all the ASM things with locally defined interfaces
and allow loading of a couple different ASM implementations.   Make sure
only ASM reference is in cxf-api.  Add ability to test with different
ASM impls and versions. Update things to work with  ASM 2.x, 3.x, and
4.0.

Modified:
    cxf/trunk/api/pom.xml
    cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
    cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
    cxf/trunk/distribution/manifest/pom.xml
    cxf/trunk/distribution/pom.xml
    cxf/trunk/integration/jca/pom.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/bindings/corba/pom.xml
    cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
    cxf/trunk/rt/databinding/jaxb/pom.xml
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
    cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
    cxf/trunk/rt/frontend/jaxws/pom.xml
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
    cxf/trunk/systests/transport-jms/pom.xml
    cxf/trunk/systests/transports/pom.xml
    cxf/trunk/systests/uncategorized/pom.xml
    cxf/trunk/systests/ws-rm/pom.xml
    cxf/trunk/systests/ws-security-examples/pom.xml
    cxf/trunk/systests/ws-security/pom.xml
    cxf/trunk/systests/ws-specs/pom.xml
    cxf/trunk/tools/common/pom.xml
    cxf/trunk/tools/javato/ws/pom.xml
    cxf/trunk/tools/validator/pom.xml
    cxf/trunk/tools/wsdlto/core/pom.xml
    cxf/trunk/tools/wsdlto/misc/pom.xml

Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Mon Apr 30 21:03:44 2012
@@ -68,8 +68,8 @@
         </dependency>
 
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java Mon Apr 30 21:03:44 2012
@@ -70,6 +70,11 @@ import org.xml.sax.InputSource;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ASMHelper;
+import org.apache.cxf.common.util.ASMHelper.ClassWriter;
+import org.apache.cxf.common.util.ASMHelper.FieldVisitor;
+import org.apache.cxf.common.util.ASMHelper.Label;
+import org.apache.cxf.common.util.ASMHelper.MethodVisitor;
+import org.apache.cxf.common.util.ASMHelper.Opcodes;
 import org.apache.cxf.common.util.CachedClass;
 import org.apache.cxf.common.util.PackageUtils;
 import org.apache.cxf.common.util.ReflectionInvokationHandler;
@@ -78,11 +83,6 @@ import org.apache.cxf.common.util.Reflec
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.common.util.SystemPropertyAction;
 import org.apache.cxf.helpers.JavaUtils;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
 
 public final class JAXBUtils {
@@ -1064,24 +1064,24 @@ public final class JAXBUtils {
                             "(Ljava/util/Map;)V", 
                             "(Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)V", null);
         mv.visitCode();
-        Label l0 = new Label();
+        Label l0 = helper.createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(30, l0);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
         mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
                            "com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper", "<init>", "()V");
-        Label l1 = new Label();
+        Label l1 = helper.createLabel();
         mv.visitLabel(l1);
         mv.visitLineNumber(31, l1);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
         mv.visitVarInsn(Opcodes.ALOAD, 1);
         mv.visitFieldInsn(Opcodes.PUTFIELD, "org/apache/cxf/jaxb/NamespaceMapperInternal",
                           "nspref", "Ljava/util/Map;");
-        Label l2 = new Label();
+        Label l2 = helper.createLabel();
         mv.visitLabel(l2);
         mv.visitLineNumber(32, l2);
         mv.visitInsn(Opcodes.RETURN);
-        Label l3 = new Label();
+        Label l3 = helper.createLabel();
         mv.visitLabel(l3);
         mv.visitLocalVariable("this", "Lorg/apache/cxf/jaxb/NamespaceMapperInternal;", null, l0, l3, 0);
         mv.visitLocalVariable("nspref", "Ljava/util/Map;",
@@ -1094,7 +1094,7 @@ public final class JAXBUtils {
                             "(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;",
                             null, null);
         mv.visitCode();
-        l0 = new Label();
+        l0 = helper.createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(38, l0);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -1106,13 +1106,13 @@ public final class JAXBUtils {
                            "get", "(Ljava/lang/Object;)Ljava/lang/Object;");
         mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/String");
         mv.visitVarInsn(Opcodes.ASTORE, 4);
-        l1 = new Label();
+        l1 = helper.createLabel();
         mv.visitLabel(l1);
         mv.visitLineNumber(39, l1);
         mv.visitVarInsn(Opcodes.ALOAD, 4);
-        l2 = new Label();
+        l2 = helper.createLabel();
         mv.visitJumpInsn(Opcodes.IFNULL, l2);
-        l3 = new Label();
+        l3 = helper.createLabel();
         mv.visitLabel(l3);
         mv.visitLineNumber(40, l3);
         mv.visitVarInsn(Opcodes.ALOAD, 4);
@@ -1121,7 +1121,7 @@ public final class JAXBUtils {
         mv.visitLineNumber(42, l2);
         mv.visitVarInsn(Opcodes.ALOAD, 2);
         mv.visitInsn(Opcodes.ARETURN);
-        Label l4 = new Label();
+        Label l4 = helper.createLabel();
         mv.visitLabel(l4);
         mv.visitLocalVariable("this", "Lorg/apache/cxf/jaxb/NamespaceMapperInternal;", null, l0, l4, 0);
         mv.visitLocalVariable("namespaceUri", "Ljava/lang/String;", null, l0, l4, 1);

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ASMHelper.java Mon Apr 30 21:03:44 2012
@@ -21,17 +21,19 @@ package org.apache.cxf.common.util;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.lang.reflect.WildcardType;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.objectweb.asm.ClassWriter;
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.util.ReflectionInvokationHandler.UnwrapParam;
+import org.apache.cxf.common.util.ReflectionInvokationHandler.WrapReturn;
 
 public class ASMHelper {
     protected static final Map<Class<?>, String> PRIMITIVE_MAP = new HashMap<Class<?>, String>();
@@ -40,7 +42,8 @@ public class ASMHelper {
     protected static final Map<Class<?>, WeakReference<TypeHelperClassLoader>> LOADER_MAP 
         = new WeakIdentityHashMap<Class<?>, WeakReference<TypeHelperClassLoader>>();
     
-    protected static boolean oldASM;
+    protected static boolean badASM;
+    private static Class<?> cwClass;
     
     static {
         PRIMITIVE_MAP.put(Byte.TYPE, "B");
@@ -62,6 +65,82 @@ public class ASMHelper {
         NONPRIMITIVE_MAP.put(Double.TYPE, Double.class.getName().replaceAll("\\.", "/"));
     }
     
+    private static void tryClass(String s) {
+        if (cwClass == null) {
+            try {
+                cwClass = ClassLoaderUtils.loadClass(s, ASMHelper.class);
+            } catch (Throwable t) {
+                //ignore
+            }
+        }
+    }
+    private static Class<?> getASMClassWriterClass() {
+        //force this to make sure the proper OSGi import is generated
+        return org.objectweb.asm.ClassWriter.class;
+    }
+    
+    private static synchronized Class<?> getASMClass() throws ClassNotFoundException {
+        if (cwClass == null) {
+            //try the "real" asm first, then the others
+            tryClass("org.objectweb.asm.ClassWriter"); 
+            tryClass("org.apache.xbean.asm.ClassWriter"); 
+            tryClass("org.springframework.asm.ClassWriter");
+            if (cwClass == null) {
+                cwClass = getASMClassWriterClass();
+            }
+        }
+        return cwClass;
+    }
+    
+    public static class Opcodes {
+        //CHECKSTYLE:OFF
+        //Will use reflection to set these based on the package name and such
+        //so we don't want them "final" or the compiler will optimize them out 
+        //to just "0" which we really don't want
+        public static int ARETURN = 0;
+        public static int ALOAD = 0;
+        public static int IFNULL = 0;
+        public static int CHECKCAST = 0;
+        public static int INVOKEINTERFACE = 0;
+        public static int GETFIELD = 0;
+        public static int ASTORE = 0;
+        public static int PUTFIELD = 0;
+        public static int RETURN = 0;
+        public static int INVOKESPECIAL = 0;
+        public static int ACC_PUBLIC = 0;
+        public static int ACC_FINAL = 0;
+        public static int ACC_SUPER = 0;
+        public static int ACC_PRIVATE = 0;
+        public static int V1_5 = 0;
+        public static int ACC_ABSTRACT = 0;
+        public static int ACC_INTERFACE = 0;
+        public static int ILOAD = 0;
+        public static int IRETURN = 0;
+        public static int NEW = 0;
+        public static int DUP = 0;
+        public static int ATHROW = 0;
+        public static int INVOKEVIRTUAL = 0;
+        public static int GOTO = 0;
+        public static int POP = 0;
+        public static int ACONST_NULL = 0;
+        public static int IFNONNULL = 0;
+        public static int SIPUSH = 0;
+        public static int INVOKESTATIC = 0;
+        //CHECKSTYLE:ON
+        static {
+            try {
+                Class<?> cls = getASMClass();
+                cls = ClassLoaderUtils.loadClass(cls.getPackage().getName() + ".Opcodes", cls);
+                for (Field f1 : Opcodes.class.getDeclaredFields()) {
+                    Field f = cls.getDeclaredField(f1.getName());
+                    ReflectionUtil.setAccessible(f1).set(null, ReflectionUtil.setAccessible(f).get(null));
+                }
+            } catch (Throwable e) {
+                //ignore
+            }
+        }
+    }
+    
     protected static String getMethodSignature(Method m) {
         StringBuilder buf = new StringBuilder("(");
         for (Class<?> cl : m.getParameterTypes()) {
@@ -96,7 +175,7 @@ public class ASMHelper {
         }
         return "L" + periodToSlashes(cl.getName()) + ";";
     }
-    public static String getClassCode(Type type) {
+    public static String getClassCode(java.lang.reflect.Type type) {
         if (type instanceof Class) {
             return getClassCode((Class<?>)type);
         } else if (type instanceof GenericArrayType) {
@@ -104,7 +183,7 @@ public class ASMHelper {
             return "[" + getClassCode(at.getGenericComponentType());
         } else if (type instanceof TypeVariable) {
             TypeVariable<?> tv = (TypeVariable<?>)type;
-            Type[] bounds = tv.getBounds();
+            java.lang.reflect.Type[] bounds = tv.getBounds();
             if (bounds != null && bounds.length == 1) {
                 return getClassCode(bounds[0]);
             } else {
@@ -115,7 +194,7 @@ public class ASMHelper {
             StringBuilder a = new StringBuilder(getClassCode(pt.getRawType()));
             a.setLength(a.length() - 1);
             a.append('<');
-            for (Type t : pt.getActualTypeArguments()) {
+            for (java.lang.reflect.Type t : pt.getActualTypeArguments()) {
                 a.append(getClassCode(t));  
             }
             a.append(">;");
@@ -123,13 +202,13 @@ public class ASMHelper {
         } else if (type instanceof WildcardType) {
             WildcardType wt = (WildcardType)type;
             StringBuilder a = new StringBuilder();
-            Type[] lowBounds = wt.getLowerBounds();
-            Type[] upBounds = wt.getUpperBounds();
-            for (Type t : upBounds) {
+            java.lang.reflect.Type[] lowBounds = wt.getLowerBounds();
+            java.lang.reflect.Type[] upBounds = wt.getUpperBounds();
+            for (java.lang.reflect.Type t : upBounds) {
                 a.append("+");
                 a.append(getClassCode(t));
             }
-            for (Type t : lowBounds) {
+            for (java.lang.reflect.Type t : lowBounds) {
                 a.append("-");
                 a.append(getClassCode(t));
             }
@@ -137,47 +216,53 @@ public class ASMHelper {
         }
         return null;
     }
-    
+
     
     public ClassWriter createClassWriter() {
-        ClassWriter newCw = null;
-        if (!oldASM) {
-            Class<ClassWriter> cls;
-            try {
-                cls = ClassWriter.class;
-            } catch (NoClassDefFoundError error) {
-                throw new RuntimeException("No ASM ClassWriterFound", error);
+        Object newCw = null;
+        if (!badASM) {
+            if (cwClass == null) {
+                try {
+                    cwClass = getASMClass();
+                } catch (Throwable error) {
+                    badASM = true;
+                    throw new RuntimeException("No ASM ClassWriterFound", error);
+                }
             }
             try {
                 // ASM 1.5.x/2.x
-                Constructor<ClassWriter> cons = cls.getConstructor(new Class<?>[] {Boolean.TYPE});
+                Constructor<?> cons 
+                    = cwClass.getConstructor(new Class<?>[] {Boolean.TYPE});
                 
                 try {
                     // got constructor, now check if it's 1.x which is very
                     // different from 2.x and 3.x
-                    cls.getMethod("newConstInt", new Class<?>[] {Integer.TYPE});               
+                    cwClass.getMethod("newConstInt", new Class<?>[] {Integer.TYPE});               
                     // newConstInt was removed in 2.x, if we get this far, we're
                     // using 1.5.x,
                     // set to null so we don't attempt to use it.
-                    oldASM = true;
+                    badASM = true;
                 } catch (Throwable t) {
                     newCw = cons.newInstance(new Object[] {Boolean.TRUE});
                 }
                 
             } catch (Throwable e) {
-                // ASM 3.x
+                // ASM 3.x/4.x
                 try {
-                    Constructor<ClassWriter> cons = cls.getConstructor(new Class<?>[] {Integer.TYPE});
-                    int i = cls.getField("COMPUTE_MAXS").getInt(null);
-                    i |= cls.getField("COMPUTE_FRAMES").getInt(null);
+                    Constructor<?> cons 
+                        = cwClass.getConstructor(new Class<?>[] {Integer.TYPE});
+                    int i = cwClass.getField("COMPUTE_MAXS").getInt(null);
+                    i |= cwClass.getField("COMPUTE_FRAMES").getInt(null);
                     newCw = cons.newInstance(new Object[] {Integer.valueOf(i)});
                 } catch (Throwable e1) {
                     // ignore
                 }
-                
             }
         }
-        return newCw;
+        if (newCw != null) {
+            return ReflectionInvokationHandler.createProxyWrapper(newCw, ClassWriter.class);
+        }
+        return null;
     }
     
     
@@ -242,5 +327,116 @@ public class ASMHelper {
             return ret;
         }
     }
+    public ASMType getType(final String type) {
+        try {
+            final Class<?> cls = ClassLoaderUtils.loadClass(cwClass.getPackage().getName() + ".Type", cwClass);
+            final Method m = cls.getMethod("getType", String.class);
+            final Method m2 = cls.getMethod("getOpcode", Integer.TYPE);
+            @SuppressWarnings("unused")
+            ASMType t = new ASMType() {
+                Object tp = ReflectionUtil.setAccessible(m).invoke(null, type);
+                public Object getValue() {
+                    return tp;
+                }
+                public Class<?> realType() {
+                    return cls;
+                }
+                public int getOpcode(int ireturn) {
+                    try {
+                        return (Integer)ReflectionUtil.setAccessible(m2).invoke(tp, ireturn);
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            };
+            return t;
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+    public interface ASMType {
+        int getOpcode(int ireturn);
+    }
+    public Label createLabel() {
+        try {
+            final Class<?> cls = ClassLoaderUtils.loadClass(cwClass.getPackage().getName() + ".Label",
+                                                      cwClass);
+            @SuppressWarnings("unused")
+            Label l = new Label() {
+                Object l = cls.newInstance();
+                public Object getValue() {
+                    return l;
+                }
+                public Class<?> realType() {
+                    return cls;
+                }
+            };
+            return l;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+    
+    public interface ClassWriter {
+        @WrapReturn(AnnotationVisitor.class)
+        AnnotationVisitor visitAnnotation(String cls, boolean t);
+        
+        @WrapReturn(FieldVisitor.class)
+        FieldVisitor visitField(int accPrivate, String fieldName, String classCode,
+                                String fieldDescriptor, Object object);
+        
+        void visitEnd();
+        byte[] toByteArray();
+        
+        @WrapReturn(MethodVisitor.class)        
+        MethodVisitor visitMethod(int accPublic, String string, String string2, 
+                                  String s3,
+                                  String[] s4);
+        void visit(int v15, int i, String newClassName, String object, String string, String[] object2);
+        void visitSource(String arg0, String arg1);
+    }
+    
+    public interface Label {
+    }
+    
+    public interface FieldVisitor {
+        @WrapReturn(AnnotationVisitor.class)
+        AnnotationVisitor visitAnnotation(String cls, boolean b);
+        void visitEnd();
+    }
+    public interface MethodVisitor {
+        void visitEnd();
+        void visitLabel(@UnwrapParam(typeMethodName = "realType") Label l1);
+        void visitMaxs(int i, int j);
+        void visitLineNumber(int i, @UnwrapParam(typeMethodName = "realType") Label l0);
+        void visitInsn(int return1);
+        void visitVarInsn(int aload, int i);
+        void visitCode();
+        void visitLdcInsn(String sig);
+        void visitLocalVariable(String string, 
+                                String string2,
+                                String string3, 
+                                @UnwrapParam(typeMethodName = "realType") Label lBegin,
+                                @UnwrapParam(typeMethodName = "realType") Label lEnd,
+                                int i);
+        void visitTypeInsn(int checkcast, String string);
+        void visitMethodInsn(int invokevirtual, String periodToSlashes,
+                             String name, String methodSignature);
+        void visitIntInsn(int sipush, int x);
+        void visitFieldInsn(int getfield, String periodToSlashes,
+                            String string, String string2);
+        void visitJumpInsn(int ifnonnull, @UnwrapParam(typeMethodName = "realType") Label nonNullLabel);
+    }
+    public interface AnnotationVisitor {
+        void visit(String arg0, @UnwrapParam(typeMethodName = "realType") ASMType arg1);
+        void visit(String arg0, Object arg1);
+        @WrapReturn(AnnotationVisitor.class)
+        AnnotationVisitor visitAnnotation(String arg0, String arg1);
+        @WrapReturn(AnnotationVisitor.class)
+        AnnotationVisitor visitArray(String arg0);
+        void visitEnd();
+        void visitEnum(String arg0, String arg1, String arg2);
+    }
+                                                            
     
 }

Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Mon Apr 30 21:03:44 2012
@@ -335,8 +335,8 @@
             <artifactId>jettison</artifactId>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Mon Apr 30 21:03:44 2012
@@ -379,8 +379,8 @@
             <artifactId>jettison</artifactId>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: cxf/trunk/integration/jca/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/integration/jca/pom.xml (original)
+++ cxf/trunk/integration/jca/pom.xml Mon Apr 30 21:03:44 2012
@@ -46,8 +46,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
             <scope>test</scope>
         </dependency>
 

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Apr 30 21:03:44 2012
@@ -54,6 +54,13 @@
         <extra.saaj.dep.artifactId>${cxf.saaj.impl.artifactId}</extra.saaj.dep.artifactId>
         <extra.saaj.dep.version>${cxf.saaj.impl.version}</extra.saaj.dep.version>
 
+        <!-- stuff related to ASM -->
+        <cxf.asm.groupId>asm</cxf.asm.groupId>
+        <cxf.asm.artifactId>asm</cxf.asm.artifactId>
+        <cxf.asm.version>3.3.1</cxf.asm.version>
+        <cxf.asm.bundle.version>3.3.1_1</cxf.asm.bundle.version>
+        <cxf.osgi.asm.version>[2.0,5)</cxf.osgi.asm.version>
+
         <!-- OSGi related properties -->
         <cxf.fragment.host />
         <cxf.bundle.activator />
@@ -64,7 +71,6 @@
         </cxf.osgi.export>
         <cxf.osgi.dynamic.import />
         <cxf.osgi.spring.version>[2.5,4)</cxf.osgi.spring.version>
-        <cxf.osgi.asm.version>[2.0,4)</cxf.osgi.asm.version>
         <cxf.osgi.commons.lang.version>[2.4,3)</cxf.osgi.commons.lang.version>
         <cxf.osgi.slf4j.version>[1.5,2)</cxf.osgi.slf4j.version>
         <cxf.osgi.javax.annotation.version>[0.0,2)</cxf.osgi.javax.annotation.version>
@@ -166,7 +172,6 @@
         <cxf.javax.mail.version>1.4.4</cxf.javax.mail.version>
         <cxf.jaxb.bundle.version>2.2.1.1_2</cxf.jaxb.bundle.version>
         <cxf.saaj-impl.bundle.version>1.3.18_1</cxf.saaj-impl.bundle.version>
-        <cxf.asm.bundle.version>3.3.1_1</cxf.asm.bundle.version>
         <cxf.wsdl4j.bundle.version>1.6.2_6</cxf.wsdl4j.bundle.version>
         <cxf.xmlsec.bundle.version>1.5.1</cxf.xmlsec.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
@@ -1146,9 +1151,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>3.3.1</version>
+                <groupId>${cxf.asm.groupId}</groupId>
+                <artifactId>${cxf.asm.artifactId}</artifactId>
+                <version>${cxf.asm.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>

Modified: cxf/trunk/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/pom.xml (original)
+++ cxf/trunk/rt/bindings/corba/pom.xml Mon Apr 30 21:03:44 2012
@@ -47,8 +47,8 @@
         </dependency>
 
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java Mon Apr 30 21:03:44 2012
@@ -31,11 +31,11 @@ import org.apache.cxf.binding.corba.type
 import org.apache.cxf.binding.corba.wsdl.CorbaConstants;
 import org.apache.cxf.binding.corba.wsdl.W3CConstants;
 import org.apache.cxf.common.util.ASMHelper;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.apache.cxf.common.util.ASMHelper.ClassWriter;
+import org.apache.cxf.common.util.ASMHelper.FieldVisitor;
+import org.apache.cxf.common.util.ASMHelper.Label;
+import org.apache.cxf.common.util.ASMHelper.MethodVisitor;
+import org.apache.cxf.common.util.ASMHelper.Opcodes;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
@@ -298,11 +298,11 @@ public final class CorbaAnyHelper {
 
         fv = cw.visitField(0, "obj", "Lorg/omg/CORBA/portable/Streamable;", null, null);
         fv.visitEnd();
-        addFixedAnyConstructor(cw);
-        addInsertOverride(cw);
-        addExtractOverride(cw);
-        addReadOverride(cw);
-        addWriteOverride(cw);
+        addFixedAnyConstructor(helper, cw);
+        addInsertOverride(helper, cw);
+        addExtractOverride(helper, cw);
+        addReadOverride(helper, cw);
+        addWriteOverride(helper, cw);
         
         cw.visitEnd();
 
@@ -316,20 +316,20 @@ public final class CorbaAnyHelper {
         }
     }
 
-    private static void addReadOverride(ClassWriter cw) {
+    private static void addReadOverride(ASMHelper helper, ClassWriter cw) {
         MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "read_value", 
                             "(Lorg/omg/CORBA/portable/InputStream;Lorg/omg/CORBA/TypeCode;)V", 
                             null, null);
         mv.visitCode();
-        Label l0 = new Label();
+        Label l0 = helper.createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(54, l0);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
         mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
                           "obj", "Lorg/omg/CORBA/portable/Streamable;");
-        Label l1 = new Label();
+        Label l1 = helper.createLabel();
         mv.visitJumpInsn(Opcodes.IFNULL, l1);
-        Label l2 = new Label();
+        Label l2 = helper.createLabel();
         mv.visitLabel(l2);
         mv.visitLineNumber(55, l2);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -338,7 +338,7 @@ public final class CorbaAnyHelper {
         mv.visitVarInsn(Opcodes.ALOAD, 1);
         mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable", 
                            "_read", "(Lorg/omg/CORBA/portable/InputStream;)V");
-        Label l3 = new Label();
+        Label l3 = helper.createLabel();
         mv.visitJumpInsn(Opcodes.GOTO, l3);
         mv.visitLabel(l1);
         mv.visitLineNumber(57, l1);
@@ -351,7 +351,7 @@ public final class CorbaAnyHelper {
         mv.visitLabel(l3);
         mv.visitLineNumber(59, l3);
         mv.visitInsn(Opcodes.RETURN);
-        Label l4 = new Label();
+        Label l4 = helper.createLabel();
         mv.visitLabel(l4);
         mv.visitLocalVariable("this", "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;",
                               null, l0, l4, 0);
@@ -361,19 +361,19 @@ public final class CorbaAnyHelper {
         mv.visitEnd();
     }
         
-    private static void addWriteOverride(ClassWriter cw) {
+    private static void addWriteOverride(ASMHelper helper, ClassWriter cw) {
         MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "write_value", 
                             "(Lorg/omg/CORBA/portable/OutputStream;)V", null, null);
         mv.visitCode();
-        Label l0 = new Label();
+        Label l0 = helper.createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(61, l0);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
         mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
                           "obj", "Lorg/omg/CORBA/portable/Streamable;");
-        Label l1 = new Label();
+        Label l1 = helper.createLabel();
         mv.visitJumpInsn(Opcodes.IFNULL, l1);
-        Label l2 = new Label();
+        Label l2 = helper.createLabel();
         mv.visitLabel(l2);
         mv.visitLineNumber(62, l2);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -382,7 +382,7 @@ public final class CorbaAnyHelper {
         mv.visitVarInsn(Opcodes.ALOAD, 1);
         mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable",
                            "_write", "(Lorg/omg/CORBA/portable/OutputStream;)V");
-        Label l3 = new Label();
+        Label l3 = helper.createLabel();
         mv.visitJumpInsn(Opcodes.GOTO, l3);
         mv.visitLabel(l1);
         mv.visitLineNumber(64, l1);
@@ -393,7 +393,7 @@ public final class CorbaAnyHelper {
         mv.visitLabel(l3);
         mv.visitLineNumber(66, l3);
         mv.visitInsn(Opcodes.RETURN);
-        Label l4 = new Label();
+        Label l4 = helper.createLabel();
         mv.visitLabel(l4);
         mv.visitLocalVariable("this", "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;",
                               null, l0, l4, 0);
@@ -403,20 +403,20 @@ public final class CorbaAnyHelper {
         
     }
 
-    private static void addExtractOverride(ClassWriter cw) {
+    private static void addExtractOverride(ASMHelper helper, ClassWriter cw) {
         // TODO Auto-generated method stub
         MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "extract_Streamable",
                             "()Lorg/omg/CORBA/portable/Streamable;", null, null);
         mv.visitCode();
-        Label l0 = new Label();
+        Label l0 = helper.createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(47, l0);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
         mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl", 
                           "obj", "Lorg/omg/CORBA/portable/Streamable;");
-        Label l1 = new Label();
+        Label l1 = helper.createLabel();
         mv.visitJumpInsn(Opcodes.IFNULL, l1);
-        Label l2 = new Label();
+        Label l2 = helper.createLabel();
         mv.visitLabel(l2);
         mv.visitLineNumber(48, l2);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -429,7 +429,7 @@ public final class CorbaAnyHelper {
         mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "com/sun/corba/se/impl/corba/AnyImpl",
                            "extract_Streamable", "()Lorg/omg/CORBA/portable/Streamable;");
         mv.visitInsn(Opcodes.ARETURN);
-        Label l3 = new Label();
+        Label l3 = helper.createLabel();
         mv.visitLabel(l3);
         mv.visitLocalVariable("this", "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;", null, l0, l3, 0);
         mv.visitMaxs(1, 1);
@@ -437,12 +437,12 @@ public final class CorbaAnyHelper {
         
     }
 
-    private static void addInsertOverride(ClassWriter cw) {
+    private static void addInsertOverride(ASMHelper helper, ClassWriter cw) {
         MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
                             "insert_Streamable", 
                             "(Lorg/omg/CORBA/portable/Streamable;)V", null, null);
         mv.visitCode();
-        Label l0 = new Label();
+        Label l0 = helper.createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(43, l0);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -451,7 +451,7 @@ public final class CorbaAnyHelper {
                            "com/sun/corba/se/impl/corba/AnyImpl", 
                            "insert_Streamable", 
                            "(Lorg/omg/CORBA/portable/Streamable;)V");
-        Label l1 = new Label();
+        Label l1 = helper.createLabel();
         mv.visitLabel(l1);
         mv.visitLineNumber(44, l1);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -459,11 +459,11 @@ public final class CorbaAnyHelper {
         mv.visitFieldInsn(Opcodes.PUTFIELD, 
                           "org/apache/cxf/binding/corba/utils/FixedAnyImpl", "obj", 
                           "Lorg/omg/CORBA/portable/Streamable;");
-        Label l2 = new Label();
+        Label l2 = helper.createLabel();
         mv.visitLabel(l2);
         mv.visitLineNumber(45, l2);
         mv.visitInsn(Opcodes.RETURN);
-        Label l3 = new Label();
+        Label l3 = helper.createLabel();
         mv.visitLabel(l3);
         mv.visitLocalVariable("this", "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;",
                               null, l0, l3, 0);
@@ -472,10 +472,10 @@ public final class CorbaAnyHelper {
         mv.visitEnd();
     }
 
-    private static void addFixedAnyConstructor(ClassWriter cw) {
+    private static void addFixedAnyConstructor(ASMHelper helper, ClassWriter cw) {
         MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "(Lorg/omg/CORBA/ORB;)V", null, null);
         mv.visitCode();
-        Label l0 = new Label();
+        Label l0 = helper.createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(36, l0);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -484,11 +484,11 @@ public final class CorbaAnyHelper {
         mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
                            "com/sun/corba/se/impl/corba/AnyImpl",
                            "<init>", "(Lcom/sun/corba/se/spi/orb/ORB;)V");
-        Label l1 = new Label();
+        Label l1 = helper.createLabel();
         mv.visitLabel(l1);
         mv.visitLineNumber(37, l1);
         mv.visitInsn(Opcodes.RETURN);
-        Label l2 = new Label();
+        Label l2 = helper.createLabel();
         mv.visitLabel(l2);
         mv.visitLocalVariable("this",
                               "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;", 
@@ -502,7 +502,7 @@ public final class CorbaAnyHelper {
                             "(Lorg/omg/CORBA/ORB;Lorg/omg/CORBA/Any;)V",
                             null, null);
         mv.visitCode();
-        l0 = new Label();
+        l0 = helper.createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(39, l0);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -513,11 +513,11 @@ public final class CorbaAnyHelper {
                            "com/sun/corba/se/impl/corba/AnyImpl",
                            "<init>",
                            "(Lcom/sun/corba/se/spi/orb/ORB;Lorg/omg/CORBA/Any;)V");
-        l1 = new Label();
+        l1 = helper.createLabel();
         mv.visitLabel(l1);
         mv.visitLineNumber(40, l1);
         mv.visitInsn(Opcodes.RETURN);
-        l2 = new Label();
+        l2 = helper.createLabel();
         mv.visitLabel(l2);
         mv.visitLocalVariable("this", "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;",
                               null, l0, l2, 0);

Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Mon Apr 30 21:03:44 2012
@@ -35,7 +35,6 @@
             javax.activation;version="${cxf.osgi.javax.activation.version}",
             javax.xml.bind*;version="${cxf.osgi.javax.bind.version}",
             javax.xml.stream*;version="${cxf.osgi.javax.stream.version}",
-            org.objectweb.asm*;resolution:=optional;version="${cxf.osgi.asm.version}",
         </cxf.osgi.import>
     </properties>
     <build>
@@ -120,8 +119,8 @@
             <artifactId>jaxb-xjc</artifactId>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
             <optional>true</optional>
         </dependency>
     </dependencies>

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/TypeClassInitializer.java Mon Apr 30 21:03:44 2012
@@ -41,11 +41,6 @@ import org.apache.cxf.service.model.Oper
 import org.apache.cxf.service.model.ServiceInfo;
 import org.apache.cxf.service.model.UnwrappedOperationInfo;
 import org.apache.ws.commons.schema.XmlSchemaElement;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
 public class TypeClassInitializer extends ServiceModelVisitor {
     private static final Logger LOG = LogUtils.getL7dLogger(TypeClassInitializer.class);
@@ -215,29 +210,29 @@ public class TypeClassInitializer extend
                 mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>",
                                     "(Ljava/lang/String;" + beanClassCode + ")V", null, null);
                 mv.visitCode();
-                mv.visitLabel(new Label());
+                mv.visitLabel(createLabel());
                 mv.visitVarInsn(Opcodes.ALOAD, 0);
                 mv.visitVarInsn(Opcodes.ALOAD, 1);
                 mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Exception",
                                    "<init>", "(Ljava/lang/String;)V");
-                mv.visitLabel(new Label());
+                mv.visitLabel(createLabel());
                 mv.visitVarInsn(Opcodes.ALOAD, 0);
                 mv.visitVarInsn(Opcodes.ALOAD, 2);
                 mv.visitFieldInsn(Opcodes.PUTFIELD, newClassName, "faultInfo", beanClassCode);
-                mv.visitLabel(new Label());
+                mv.visitLabel(createLabel());
                 mv.visitInsn(Opcodes.RETURN);
-                mv.visitLabel(new Label());
+                mv.visitLabel(createLabel());
                 mv.visitMaxs(2, 3);
                 mv.visitEnd();
 
                 mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "getFaultInfo", 
                                     "()" + beanClassCode, null, null);
                 mv.visitCode();
-                mv.visitLabel(new Label());
+                mv.visitLabel(createLabel());
                 mv.visitVarInsn(Opcodes.ALOAD, 0);
                 mv.visitFieldInsn(Opcodes.GETFIELD, newClassName, "faultInfo", beanClassCode);
                 mv.visitInsn(Opcodes.ARETURN);
-                mv.visitLabel(new Label());
+                mv.visitLabel(createLabel());
                 mv.visitMaxs(1, 1);
                 mv.visitEnd();
 

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Mon Apr 30 21:03:44 2012
@@ -796,14 +796,8 @@ public class JAXBDataBinding extends Abs
     private static WrapperHelper compileWrapperHelper(Class<?> wrapperType, Method setMethods[],
                                                       Method getMethods[], Method jaxbMethods[],
                                                       Field fields[], Object objectFactory) {
-        try {
-            Class.forName("org.objectweb.asm.ClassWriter");
-            return WrapperHelperCompiler.compileWrapperHelper(wrapperType, setMethods, getMethods,
-                                                              jaxbMethods, fields, objectFactory);
-        } catch (ClassNotFoundException e) {
-            // ASM not found, just use reflection based stuff
-        }
-        return null;
+        return WrapperHelperCompiler.compileWrapperHelper(wrapperType, setMethods, getMethods,
+                                                          jaxbMethods, fields, objectFactory);
     }
 
     public List<Interceptor<? extends Message>> getOutFaultInterceptors() {

Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java (original)
+++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java Mon Apr 30 21:03:44 2012
@@ -26,11 +26,6 @@ import javax.xml.bind.JAXBElement;
 
 import org.apache.cxf.common.util.ASMHelper;
 import org.apache.cxf.databinding.WrapperHelper;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
 final class WrapperHelperCompiler extends ASMHelper {
   
@@ -119,15 +114,14 @@ final class WrapperHelperCompiler extend
                  "java/lang/Object",
                  new String[] {periodToSlashes(WrapperHelper.class.getName())});
         
-        addConstructor(newClassName, cw, objectFactory == null ? null : objectFactory.getClass());
+        addConstructor(newClassName, objectFactory == null ? null : objectFactory.getClass());
         boolean b = addSignature();
         if (b) {
             b = addCreateWrapperObject(newClassName,
                                        objectFactory == null ? null : objectFactory.getClass());
         }
         if (b) {
-            b = addGetWrapperParts(newClassName, wrapperType,
-                           getMethods, fields, cw);
+            b = addGetWrapperParts(newClassName, wrapperType);
         }
                                                                           
         try {
@@ -167,7 +161,7 @@ final class WrapperHelperCompiler extend
                                           "getSignature", "()Ljava/lang/String;", null, null);
         mv.visitCode();
         mv.visitLdcInsn(sig);
-        Label l0 = new Label();
+        Label l0 = createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(100, l0);
         mv.visitInsn(Opcodes.ARETURN);
@@ -176,10 +170,11 @@ final class WrapperHelperCompiler extend
         return true;
     }
 
-    private static void addConstructor(String newClassName, ClassWriter cw,  Class<?> objectFactory) {
+    private void addConstructor(String newClassName, 
+                                Class<?> objectFactoryCls) {
         
-        if (objectFactory != null) {
-            String ofName = "L" + periodToSlashes(objectFactory.getName()) + ";";
+        if (objectFactoryCls != null) {
+            String ofName = "L" + periodToSlashes(objectFactoryCls.getName()) + ";";
             FieldVisitor fv = cw.visitField(0, "factory",
                                             ofName,
                                             null, null);
@@ -188,7 +183,7 @@ final class WrapperHelperCompiler extend
         
         MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
         mv.visitCode();
-        Label l0 = new Label();
+        Label l0 = createLabel();
         mv.visitLabel(l0);
         mv.visitLineNumber(102, l0);
         
@@ -197,20 +192,20 @@ final class WrapperHelperCompiler extend
                            "java/lang/Object",
                            "<init>",
                            "()V");
-        if (objectFactory != null) {
+        if (objectFactoryCls != null) {
             mv.visitVarInsn(Opcodes.ALOAD, 0);
-            mv.visitTypeInsn(Opcodes.NEW, periodToSlashes(objectFactory.getName()));
+            mv.visitTypeInsn(Opcodes.NEW, periodToSlashes(objectFactoryCls.getName()));
             mv.visitInsn(Opcodes.DUP);
             mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
-                               periodToSlashes(objectFactory.getName()),
+                               periodToSlashes(objectFactoryCls.getName()),
                                "<init>", "()V");
             mv.visitFieldInsn(Opcodes.PUTFIELD, periodToSlashes(newClassName),
-                              "factory", "L" + periodToSlashes(objectFactory.getName()) + ";");
+                              "factory", "L" + periodToSlashes(objectFactoryCls.getName()) + ";");
         } 
         
         mv.visitInsn(Opcodes.RETURN);
     
-        Label l1 = new Label();
+        Label l1 = createLabel();
         mv.visitLabel(l1);
         mv.visitLineNumber(103, l0);
 
@@ -230,7 +225,7 @@ final class WrapperHelperCompiler extend
                                               "org/apache/cxf/interceptor/Fault"
                                           });
         mv.visitCode();
-        Label lBegin = new Label();
+        Label lBegin = createLabel();
         mv.visitLabel(lBegin);
         mv.visitLineNumber(104, lBegin);
 
@@ -290,7 +285,7 @@ final class WrapperHelperCompiler extend
         mv.visitVarInsn(Opcodes.ALOAD, 2);
         mv.visitInsn(Opcodes.ARETURN);
     
-        Label lEnd = new Label();
+        Label lEnd = createLabel();
         mv.visitLabel(lEnd);
         mv.visitLocalVariable("this", "L" + newClassName + ";", null, lBegin, lEnd, 0);
         mv.visitLocalVariable("lst", "Ljava/util/List;", "Ljava/util/List<*>;", lBegin, lEnd, 1);
@@ -310,7 +305,7 @@ final class WrapperHelperCompiler extend
         // aVal.addAll(newA);
         // }
         
-        Label l3 = new Label();
+        Label l3 = createLabel();
         mv.visitLabel(l3);
         mv.visitLineNumber(114, l3);
 
@@ -326,7 +321,7 @@ final class WrapperHelperCompiler extend
         mv.visitTypeInsn(Opcodes.CHECKCAST, "java/util/List");
         mv.visitVarInsn(Opcodes.ASTORE, 4);
         mv.visitVarInsn(Opcodes.ALOAD, 3);
-        Label nonNullLabel = new Label();
+        Label nonNullLabel = createLabel();
         mv.visitJumpInsn(Opcodes.IFNONNULL, nonNullLabel);
 
         if (setMethods[x] == null) {
@@ -347,7 +342,7 @@ final class WrapperHelperCompiler extend
                                setMethods[x].getName(),
                                getMethodSignature(setMethods[x]));
         }
-        Label jumpOverLabel = new Label();
+        Label jumpOverLabel = createLabel();
         mv.visitJumpInsn(Opcodes.GOTO, jumpOverLabel);
         mv.visitLabel(nonNullLabel);
         mv.visitLineNumber(106, nonNullLabel);
@@ -363,11 +358,8 @@ final class WrapperHelperCompiler extend
         mv.visitLineNumber(107, jumpOverLabel);
     }
     
-    private static boolean addGetWrapperParts(String newClassName,
-                                           Class<?> wrapperClass,
-                                           Method getMethods[],
-                                           Field fields[],
-                                           ClassWriter cw) {
+    private boolean addGetWrapperParts(String newClassName,
+                                       Class<?> wrapperClass) {
         MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
                                           "getWrapperParts",
                                           "(Ljava/lang/Object;)Ljava/util/List;",
@@ -376,7 +368,7 @@ final class WrapperHelperCompiler extend
                                               "org/apache/cxf/interceptor/Fault" 
                                           });
         mv.visitCode();
-        Label lBegin = new Label();
+        Label lBegin = createLabel();
         mv.visitLabel(lBegin);
         mv.visitLineNumber(108, lBegin);
                
@@ -399,7 +391,7 @@ final class WrapperHelperCompiler extend
             }
             
             if (method == null) {
-                Label l3 = new Label();
+                Label l3 = createLabel();
                 mv.visitLabel(l3);
                 mv.visitLineNumber(200 + x, l3);
 
@@ -409,7 +401,7 @@ final class WrapperHelperCompiler extend
                                    "add", "(Ljava/lang/Object;)Z");
                 mv.visitInsn(Opcodes.POP);
             } else {
-                Label l3 = new Label();
+                Label l3 = createLabel();
                 mv.visitLabel(l3);
                 mv.visitLineNumber(250 + x, l3);
                 
@@ -424,7 +416,7 @@ final class WrapperHelperCompiler extend
                     createObjectWrapper(mv, method.getReturnType());
                 }
                 if (JAXBElement.class.isAssignableFrom(method.getReturnType())) {
-                    Label jumpOverLabel = new Label();
+                    Label jumpOverLabel = createLabel();
                     mv.visitInsn(Opcodes.DUP);
                     mv.visitJumpInsn(Opcodes.IFNULL, jumpOverLabel);
 
@@ -440,14 +432,14 @@ final class WrapperHelperCompiler extend
         }
         
         // return the list
-        Label l2 = new Label();
+        Label l2 = createLabel();
         mv.visitLabel(l2);
         mv.visitLineNumber(108, l2);
         mv.visitVarInsn(Opcodes.ALOAD, 2);
         mv.visitInsn(Opcodes.ARETURN);
         
         
-        Label lEnd = new Label();
+        Label lEnd = createLabel();
         mv.visitLabel(lEnd);
         mv.visitLocalVariable("this", "L" + newClassName + ";", null, lBegin, lEnd, 0);
         mv.visitLocalVariable("o", "Ljava/lang/Object;", null, lBegin, lEnd, 1);

Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Mon Apr 30 21:03:44 2012
@@ -37,7 +37,6 @@
         <cxf.spi-dir>spi-2.1</cxf.spi-dir>
         <cxf.osgi.import>
             javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
-            org.objectweb.asm*;resolution:=optional;version="${cxf.osgi.asm.version}",
         </cxf.osgi.import>
     </properties>
     <dependencies>
@@ -72,8 +71,8 @@
         </dependency>
 
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Mon Apr 30 21:03:44 2012
@@ -55,12 +55,6 @@ import org.apache.cxf.service.model.Mess
 import org.apache.cxf.service.model.MessagePartInfo;
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.SchemaInfo;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
 public final class WrapperClassGenerator extends ASMHelper {
     public static final String DEFAULT_PACKAGE_NAME = "defaultnamespace";
@@ -225,12 +219,12 @@ public final class WrapperClassGenerator
         // add constructor
         MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
         mv.visitCode();
-        Label lbegin = new Label();
+        Label lbegin = createLabel();
         mv.visitLabel(lbegin);
         mv.visitVarInsn(Opcodes.ALOAD, 0);
         mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
         mv.visitInsn(Opcodes.RETURN);
-        Label lend = new Label();
+        Label lend = createLabel();
         mv.visitLabel(lend);
         mv.visitLocalVariable("this", "L" + classFileName + ";", null, lbegin, lend, 0);
         mv.visitMaxs(1, 1);
@@ -268,13 +262,11 @@ public final class WrapperClassGenerator
         if (clz.getPackage() != null && clz.getPackage().getAnnotations() != null) {
             for (Annotation ann : clz.getPackage().getAnnotations()) {
                 if (ann instanceof XmlJavaTypeAdapters) {
-                    av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapters;",
-                                             true);
+                    av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapters;", true);
                     generateXmlJavaTypeAdapters(av0, (XmlJavaTypeAdapters)ann);
                     av0.visitEnd();
                 } else if (ann instanceof XmlJavaTypeAdapter) {
-                    av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;",
-                                             true);
+                    av0 = cw.visitAnnotation("Ljavax/xml/bind/annotation/adapters/XmlJavaTypeAdapter;", true);
                     generateXmlJavaTypeAdapter(av0, (XmlJavaTypeAdapter)ann);
                     av0.visitEnd();
                 }
@@ -298,14 +290,15 @@ public final class WrapperClassGenerator
     }
     private void generateXmlJavaTypeAdapter(AnnotationVisitor av, XmlJavaTypeAdapter adapter) {
         if (adapter.value() != null) {
-            av.visit("value", org.objectweb.asm.Type.getType(getClassCode(adapter.value())));
+            av.visit("value", getType(getClassCode(adapter.value())));
         }
         if (adapter.type() != javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter.DEFAULT.class) {
-            av.visit("type", org.objectweb.asm.Type.getType(getClassCode(adapter.type())));
+            av.visit("type", getType(getClassCode(adapter.type())));
         }
     }
     
-    private void generateMessagePart(ClassWriter cw, MessagePartInfo mpi, Method method, String className) {
+    private void generateMessagePart(ClassWriter cw, MessagePartInfo mpi,
+                                     Method method, String className) {
         if (Boolean.TRUE.equals(mpi.getProperty(ReflectionServiceFactoryBean.HEADER))) {
             return;
         }
@@ -331,7 +324,7 @@ public final class WrapperClassGenerator
             if (Collection.class.isAssignableFrom(clz) || clz.isArray()) {
                 ParameterizedType ptype = (ParameterizedType)genericType;
 
-                Type[] types = ptype.getActualTypeArguments();
+                java.lang.reflect.Type[] types = ptype.getActualTypeArguments();
                 // TODO: more complex Parameterized type
                 if (types.length > 0) {
                     if (types[0] instanceof Class) {
@@ -383,7 +376,7 @@ public final class WrapperClassGenerator
 
         mv.visitVarInsn(Opcodes.ALOAD, 0);
         mv.visitFieldInsn(Opcodes.GETFIELD, classFileName, fieldName, classCode);
-        mv.visitInsn(org.objectweb.asm.Type.getType(classCode).getOpcode(Opcodes.IRETURN));
+        mv.visitInsn(getType(classCode).getOpcode(Opcodes.IRETURN));
         mv.visitMaxs(0, 0);
         mv.visitEnd();
         
@@ -392,7 +385,7 @@ public final class WrapperClassGenerator
                             fieldDescriptor == null ? null : "(" + fieldDescriptor + ")V", null);
         mv.visitCode();
         mv.visitVarInsn(Opcodes.ALOAD, 0);
-        org.objectweb.asm.Type setType = org.objectweb.asm.Type.getType(classCode);
+        ASMType setType = getType(classCode);
         mv.visitVarInsn(setType.getOpcode(Opcodes.ILOAD), 1);
         mv.visitFieldInsn(Opcodes.PUTFIELD, className, fieldName, classCode);       
         mv.visitInsn(Opcodes.RETURN);

Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java Mon Apr 30 21:03:44 2012
@@ -409,7 +409,7 @@ public class ClientServerMiscTest extend
     }
 
     private void setASM(boolean b) throws Exception {
-        Field f = ASMHelper.class.getDeclaredField("oldASM");
+        Field f = ASMHelper.class.getDeclaredField("badASM");
         f.setAccessible(true);
         f.set(null, !b);
     }

Modified: cxf/trunk/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/pom.xml (original)
+++ cxf/trunk/systests/transport-jms/pom.xml Mon Apr 30 21:03:44 2012
@@ -251,8 +251,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>httpunit</groupId>

Modified: cxf/trunk/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/systests/transports/pom.xml (original)
+++ cxf/trunk/systests/transports/pom.xml Mon Apr 30 21:03:44 2012
@@ -227,8 +227,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>httpunit</groupId>

Modified: cxf/trunk/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/uncategorized/pom.xml Mon Apr 30 21:03:44 2012
@@ -261,8 +261,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>httpunit</groupId>

Modified: cxf/trunk/systests/ws-rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-rm/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/systests/ws-rm/pom.xml (original)
+++ cxf/trunk/systests/ws-rm/pom.xml Mon Apr 30 21:03:44 2012
@@ -99,8 +99,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/trunk/systests/ws-security-examples/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security-examples/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security-examples/pom.xml (original)
+++ cxf/trunk/systests/ws-security-examples/pom.xml Mon Apr 30 21:03:44 2012
@@ -176,8 +176,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/trunk/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/pom.xml (original)
+++ cxf/trunk/systests/ws-security/pom.xml Mon Apr 30 21:03:44 2012
@@ -161,8 +161,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/trunk/systests/ws-specs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/pom.xml (original)
+++ cxf/trunk/systests/ws-specs/pom.xml Mon Apr 30 21:03:44 2012
@@ -156,8 +156,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/trunk/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/tools/common/pom.xml (original)
+++ cxf/trunk/tools/common/pom.xml Mon Apr 30 21:03:44 2012
@@ -41,8 +41,8 @@
 	    <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/trunk/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/pom.xml (original)
+++ cxf/trunk/tools/javato/ws/pom.xml Mon Apr 30 21:03:44 2012
@@ -93,8 +93,8 @@
 
 
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
             <scope>test</scope>
         </dependency>
 

Modified: cxf/trunk/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/tools/validator/pom.xml (original)
+++ cxf/trunk/tools/validator/pom.xml Mon Apr 30 21:03:44 2012
@@ -45,8 +45,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/trunk/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/core/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/core/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/core/pom.xml Mon Apr 30 21:03:44 2012
@@ -63,8 +63,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
             <scope>test</scope>
         </dependency>
 

Modified: cxf/trunk/tools/wsdlto/misc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/pom.xml?rev=1332391&r1=1332390&r2=1332391&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/pom.xml (original)
+++ cxf/trunk/tools/wsdlto/misc/pom.xml Mon Apr 30 21:03:44 2012
@@ -40,8 +40,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>${cxf.asm.groupId}</groupId>
+            <artifactId>${cxf.asm.artifactId}</artifactId>
             <scope>test</scope>
         </dependency>
 



Mime
View raw message