geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1764037 - in /geronimo/xbean/trunk: ./ xbean-asm-util/src/main/java/org/apache/xbean/asm5/ xbean-asm-util/src/main/java/org/apache/xbean/asm6/ xbean-asm-util/src/main/java/org/apache/xbean/asm6/original/ xbean-asm-util/src/main/java/org/ap...
Date Mon, 10 Oct 2016 09:34:21 GMT
Author: rmannibucau
Date: Mon Oct 10 09:34:21 2016
New Revision: 1764037

URL: http://svn.apache.org/viewvc?rev=1764037&view=rev
Log:
XBEAN-296 replacing asm5 shade by asm6 one

Added:
    geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm6/
    geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm6/original/
    geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm6/original/commons/
    geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm6/original/commons/EmptyVisitor.java
      - copied, changed from r1764036, geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java
    geronimo/xbean/trunk/xbean-asm6-shaded/
      - copied from r1764036, geronimo/xbean/trunk/xbean-asm5-shaded/
Removed:
    geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/
    geronimo/xbean/trunk/xbean-asm5-shaded/
Modified:
    geronimo/xbean/trunk/pom.xml
    geronimo/xbean/trunk/xbean-asm6-shaded/pom.xml
    geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
    geronimo/xbean/trunk/xbean-finder/pom.xml
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java
    geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
    geronimo/xbean/trunk/xbean-reflect/pom.xml
    geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
    geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
    geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java

Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Mon Oct 10 09:34:21 2016
@@ -64,7 +64,7 @@
         -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <asm.version>5.0.4</asm.version>
+        <asm.version>6.0_ALPHA</asm.version>
     </properties>
 
 
@@ -224,7 +224,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-asm5-shaded</artifactId>
+                <artifactId>xbean-asm6-shaded</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -420,7 +420,7 @@
         <module>xbean-spring</module>
         <module>xbean-telnet</module>
         <module>maven-xbean-plugin</module>
-        <module>xbean-asm5-shaded</module>
+        <module>xbean-asm6-shaded</module>
         <module>xbean-finder-shaded</module>
     </modules>
 

Copied: geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm6/original/commons/EmptyVisitor.java
(from r1764036, geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java)
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm6/original/commons/EmptyVisitor.java?p2=geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm6/original/commons/EmptyVisitor.java&p1=geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java&r1=1764036&r2=1764037&rev=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java
(original)
+++ geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm6/original/commons/EmptyVisitor.java
Mon Oct 10 09:34:21 2016
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.xbean.asm5.original.commons;
+package org.apache.xbean.asm6.original.commons;
 
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Attribute;
@@ -27,7 +27,7 @@ import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.TypePath;
 
 public class EmptyVisitor extends ClassVisitor {
-    protected final AnnotationVisitor av = new AnnotationVisitor(Opcodes.ASM5) {
+    protected final AnnotationVisitor av = new AnnotationVisitor(Opcodes.ASM6) {
         @Override
         public void visit(String name, Object value) {
             EmptyVisitor.this.visit(name, value);
@@ -54,7 +54,7 @@ public class EmptyVisitor extends ClassV
         }
     };
 
-    protected final FieldVisitor fv = new FieldVisitor(Opcodes.ASM5) {
+    protected final FieldVisitor fv = new FieldVisitor(Opcodes.ASM6) {
         @Override
         public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
             return EmptyVisitor.this.visitAnnotation(desc, visible);
@@ -70,7 +70,7 @@ public class EmptyVisitor extends ClassV
             EmptyVisitor.this.visitEnd();
         }
     };
-    protected final MethodVisitor mv = new MethodVisitor(Opcodes.ASM5) {
+    protected final MethodVisitor mv = new MethodVisitor(Opcodes.ASM6) {
         @Override
         public AnnotationVisitor visitAnnotationDefault() {
             return EmptyVisitor.this.visitAnnotationDefault();
@@ -203,7 +203,7 @@ public class EmptyVisitor extends ClassV
     };
 
     public EmptyVisitor() {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM6);
     }
 
     protected AnnotationVisitor visitAnnotationDefault() {

Modified: geronimo/xbean/trunk/xbean-asm6-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm6-shaded/pom.xml?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm6-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-asm6-shaded/pom.xml Mon Oct 10 09:34:21 2016
@@ -27,11 +27,11 @@
         <groupId>org.apache.xbean</groupId>
         <version>4.6-SNAPSHOT</version>
     </parent>
-    <artifactId>xbean-asm5-shaded</artifactId>
+    <artifactId>xbean-asm6-shaded</artifactId>
     <packaging>bundle</packaging>
-    <name>Apache XBean :: ASM 5 shaded (repackaged)</name>
+    <name>Apache XBean :: ASM 6 shaded (repackaged)</name>
 
-    <description>Repackaged and shaded asm 5.x jars</description>
+    <description>Repackaged and shaded asm 6.x jars</description>
     <licenses>
         <license>
             <url>http://asm.ow2.org/license.html</url>
@@ -43,18 +43,18 @@
 
     <properties>
         <xbean.osgi.export>
-            org.apache.xbean.asm5.shade.commons;version=${asm.version},
-            org.apache.xbean.asm5;version=${asm.version},
-            org.apache.xbean.asm5.signature;version=${asm.version},
-            org.apache.xbean.asm5.commons;version=${asm.version},
-            org.apache.xbean.asm5.tree;version=${asm.version}
+            org.apache.xbean.asm6.shade.commons;version=${asm.version},
+            org.apache.xbean.asm6;version=${asm.version},
+            org.apache.xbean.asm6.signature;version=${asm.version},
+            org.apache.xbean.asm6.commons;version=${asm.version},
+            org.apache.xbean.asm6.tree;version=${asm.version}
         </xbean.osgi.export>
         <xbean.osgi.import>
-            org.apache.xbean.asm5.shade.commons;version="[${asm.version},${asm.version}]",
-            org.apache.xbean.asm5;version="[${asm.version},${asm.version}]",
-            org.apache.xbean.asm5.signature;version="[${asm.version},${asm.version}]",
-            org.apache.xbean.asm5.commons;version="[${asm.version},${asm.version}]",
-            org.apache.xbean.asm5.tree;version="[${asm.version},${asm.version}]"
+            org.apache.xbean.asm6.shade.commons;version="[${asm.version},${asm.version}]",
+            org.apache.xbean.asm6;version="[${asm.version},${asm.version}]",
+            org.apache.xbean.asm6.signature;version="[${asm.version},${asm.version}]",
+            org.apache.xbean.asm6.commons;version="[${asm.version},${asm.version}]",
+            org.apache.xbean.asm6.tree;version="[${asm.version},${asm.version}]"
         </xbean.osgi.import>
     </properties>
 
@@ -73,19 +73,19 @@
                             <createSourcesJar>true</createSourcesJar>
                             <relocations>
                                 <relocation> <!-- we need a different package because
we build against both -->
-                                    <pattern>org.apache.xbean.asm5.original.commons</pattern>
-                                    <shadedPattern>org.apache.xbean.asm5.shade.commons</shadedPattern>
+                                    <pattern>org.apache.xbean.asm6.original.commons</pattern>
+                                    <shadedPattern>org.apache.xbean.asm6.shade.commons</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.objectweb.asm</pattern>
-                                    <shadedPattern>org.apache.xbean.asm5</shadedPattern>
+                                    <shadedPattern>org.apache.xbean.asm6</shadedPattern>
                                 </relocation>
                             </relocations>
                             <transformers>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <Bundle-License>http://asm.ow2.org/license.html</Bundle-License>
-                                        <Bundle-SymbolicName>org.apache.xbean.asm5-shaded</Bundle-SymbolicName>
+                                        <Bundle-SymbolicName>org.apache.xbean.asm6-shaded</Bundle-SymbolicName>
                                         <Export-Package>${xbean.osgi.export}</Export-Package>
                                         <Import-Package>${xbean.osgi.import}</Import-Package>
                                     </manifestEntries>

Modified: geronimo/xbean/trunk/xbean-finder-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder-shaded/pom.xml?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder-shaded/pom.xml Mon Oct 10 09:34:21 2016
@@ -33,7 +33,7 @@
 
     <properties>
         <xbean.osgi.export>org.apache.xbean.finder;version=${project.version}</xbean.osgi.export>
-        <xbean.osgi.import>org.apache.xbean.finder;version=${project.version},org.apache.xbean.asm5;version=5,org.apache.xbean.asm5.shade.commons;version=5</xbean.osgi.import>
+        <xbean.osgi.import>org.apache.xbean.finder;version=${project.version},org.apache.xbean.asm6;version=6,org.apache.xbean.asm6.shade.commons;version=6</xbean.osgi.import>
     </properties>
 
     <build>
@@ -51,12 +51,12 @@
                             <createSourcesJar>true</createSourcesJar>
                             <relocations>
                                 <relocation>
-                                    <pattern>org.apache.xbean.asm5.original.commons.EmptyVisitor</pattern>
-                                    <shadedPattern>org.apache.xbean.asm5.shade.commons.EmptyVisitor</shadedPattern>
+                                    <pattern>org.apache.xbean.asm6.original.commons.EmptyVisitor</pattern>
+                                    <shadedPattern>org.apache.xbean.asm6.shade.commons.EmptyVisitor</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.objectweb.asm</pattern>
-                                    <shadedPattern>org.apache.xbean.asm5</shadedPattern>
+                                    <shadedPattern>org.apache.xbean.asm6</shadedPattern>
                                 </relocation>
                             </relocations>
                             <artifactSet>
@@ -65,7 +65,7 @@
                                 </includes>
                                 <excludes>
                                     <exclude>*:*:sources</exclude>
-                                    <exclude>org.apache.xbean:xbean-asm5-shaded</exclude>
+                                    <exclude>org.apache.xbean:xbean-asm6-shaded</exclude>
                                     <exclude>org.apache.xbean:xbean-asm-util</exclude>
                                     <exclude>junit:junit</exclude>
                                 </excludes>
@@ -101,7 +101,7 @@
                             org.apache.xbean.finder.*;version=${project.version};-noimport:=true
                         </Export-Package>
                         <Import-Package>
-                            org.apache.xbean.asm5.*;version="[5.0,6.0)",
+                            org.apache.xbean.asm6.*;version="[6.0,7.0)",
                             *
                         </Import-Package>
                         <Private-Package />
@@ -130,7 +130,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-asm5-shaded</artifactId>
+            <artifactId>xbean-asm6-shaded</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

Modified: geronimo/xbean/trunk/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/pom.xml?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder/pom.xml Mon Oct 10 09:34:21 2016
@@ -76,10 +76,10 @@
                             org.apache.xbean.finder.*;version=${project.version};-noimport:=true
                         </Export-Package>
                         <Import-Package>
-                            org.objectweb.asm*;version="[5.0,6.0)",
+                            org.objectweb.asm*;version="[6.0,7.0)",
                             *
                         </Import-Package>
-                        <Private-Package>org.apache.xbean.asm5.original.commons</Private-Package>
+                        <Private-Package>org.apache.xbean.asm6.original.commons</Private-Package>
                         <_removeheaders>
                             Ignore-Package,Private-Package,Include-Resource,Embed-Dependency
                         </_removeheaders>

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java
Mon Oct 10 09:34:21 2016
@@ -34,7 +34,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.xbean.asm5.original.commons.EmptyVisitor;
+import org.apache.xbean.asm6.original.commons.EmptyVisitor;
 import org.apache.xbean.finder.util.SingleLinkedList;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassReader;
@@ -995,11 +995,11 @@ public abstract class AbstractFinder imp
         private static boolean debug = false;
 
         public GenericAwareInfoBuildingVisitor() {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
         }
 
         public GenericAwareInfoBuildingVisitor(GenericAwareInfoBuildingVisitor.TYPE type,
Info info) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             this.type = type;
             this.info = info;
             this.state = GenericAwareInfoBuildingVisitor.STATE.BEGIN;

Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
(original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/AnnotationFinder.java
Mon Oct 10 09:34:21 2016
@@ -20,7 +20,7 @@
 
 package org.apache.xbean.finder;
 
-import org.apache.xbean.asm5.original.commons.EmptyVisitor;
+import org.apache.xbean.asm6.original.commons.EmptyVisitor;
 import org.apache.xbean.finder.archive.Archive;
 import org.apache.xbean.finder.util.Classes;
 import org.apache.xbean.finder.util.SingleLinkedList;
@@ -1897,11 +1897,11 @@ public class AnnotationFinder implements
         private static boolean debug = false;
 
         public GenericAwareInfoBuildingVisitor() {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
         }
 
         public GenericAwareInfoBuildingVisitor(GenericAwareInfoBuildingVisitor.TYPE type,
Info info) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             this.type = type;
             this.info = info;
             this.state = GenericAwareInfoBuildingVisitor.STATE.BEGIN;

Modified: geronimo/xbean/trunk/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/pom.xml?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-reflect/pom.xml Mon Oct 10 09:34:21 2016
@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-asm5-shaded</artifactId>
+            <artifactId>xbean-asm6-shaded</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
             <optional>true</optional>
@@ -85,15 +85,15 @@
                         <Import-Package>
                             org.apache.log4j;resolution:=optional,
                             org.apache.commons.logging;resolution:=optional,
-                            org.objectweb.asm;resolution:=optional;version="[5.0,6.0)",
-                            org.objectweb.asm.commons;resolution:=optional;version="[5.0,6.0)",
-                            org.apache.xbean.asm5;resolution:=optional;version="[5.0,6.0)",
-                            org.apache.xbean.asm5.commons;resolution:=optional;version="[5.0,6.0)",
-                            org.apache.xbean.asm5.shade.commons;resolution:=optional;version="[5.0,6.0)",
+                            org.objectweb.asm;resolution:=optional;version="[5.0,7.0)",
+                            org.objectweb.asm.commons;resolution:=optional;version="[5.0,7.0)",
+                            org.apache.xbean.asm6;resolution:=optional;version="[6.0,7.0)",
+                            org.apache.xbean.asm6.commons;resolution:=optional;version="[6.0,7.0)",
+                            org.apache.xbean.asm6.shade.commons;resolution:=optional;version="[6.0,7.0)",
                             javax.*
                         </Import-Package>
                         <Private-Package>
-                            org.apache.xbean.asm5.original.commons
+                            org.apache.xbean.asm6.original.commons
                         </Private-Package>
                         <_removeheaders>
                             Ignore-Package,Private-Package,Include-Resource,Embed-Dependency

Modified: geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
(original)
+++ geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
Mon Oct 10 09:34:21 2016
@@ -37,8 +37,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import static org.objectweb.asm.Opcodes.ASM5;
-
 /**
  * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the
local variable table in the
  * class byte code.
@@ -222,7 +220,7 @@ public class AsmParameterNameLoader impl
         private final Map<String,Constructor> constructorMap = new HashMap<String,Constructor>();
 
         public AllParameterNamesDiscoveringVisitor(Class type, String methodName) {
-            super(ASM5);
+            super(Opcodes.ASM6);
             this.methodName = methodName;
 
             List<Method> methods = new ArrayList<Method>(Arrays.asList(type.getMethods()));
@@ -235,7 +233,7 @@ public class AsmParameterNameLoader impl
         }
 
         public AllParameterNamesDiscoveringVisitor(Class type) {
-            super(ASM5);
+            super(Opcodes.ASM6);
             this.methodName = "<init>";
 
             List<Constructor> constructors = new ArrayList<Constructor>(Arrays.asList(type.getConstructors()));
@@ -290,7 +288,7 @@ public class AsmParameterNameLoader impl
                     isStaticMethod = Modifier.isStatic(method.getModifiers());
                 }
 
-                return new MethodVisitor(Opcodes.ASM5) {
+                return new MethodVisitor(Opcodes.ASM6) {
                     // assume static method until we get a first parameter name
                     public void visitLocalVariable(String name, String description, String
signature, Label start, Label end, int index) {
                         if (isStaticMethod) {

Modified: geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
(original)
+++ geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
Mon Oct 10 09:34:21 2016
@@ -41,12 +41,14 @@ public final class ReflectionUtil {
     private static final class ParameterLoader {
         private static ParameterNameLoader PARAMETER_NAME_LOADER;
         static {
-            if (isClassAvailable("org.apache.xbean.asm5.ClassReader")) {
+            if (isClassAvailable("org.apache.xbean.asm6.ClassReader")) {
                 PARAMETER_NAME_LOADER = new XbeanAsmParameterNameLoader();
             } else if (isClassAvailable("org.objectweb.asm.ClassReader")) {
                 PARAMETER_NAME_LOADER = new AsmParameterNameLoader();
-            } else if (isClassAvailable("org.apache.xbean.asm.ClassReader") || isClassAvailable("org.apache.xbean.asm4.ClassReader"))
{
-                throw new RuntimeException("Your xbean-asm-shade is too old, please upgrade
to xbean-asm5-shade");
+            } else if (isClassAvailable("org.apache.xbean.asm.ClassReader")
+                    || isClassAvailable("org.apache.xbean.asm4.ClassReader")
+                    || isClassAvailable("org.apache.xbean.asm5.ClassReader")) {
+                throw new RuntimeException("Your xbean-asm-shade is too old, please upgrade
to xbean-asm6-shade");
             }
         }
     }

Modified: geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java?rev=1764037&r1=1764036&r2=1764037&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
(original)
+++ geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
Mon Oct 10 09:34:21 2016
@@ -17,12 +17,12 @@
  */
 package org.apache.xbean.recipe;
 
-import org.apache.xbean.asm5.ClassReader;
-import org.apache.xbean.asm5.ClassVisitor;
-import org.apache.xbean.asm5.Label;
-import org.apache.xbean.asm5.MethodVisitor;
-import org.apache.xbean.asm5.Opcodes;
-import org.apache.xbean.asm5.Type;
+import org.apache.xbean.asm6.ClassReader;
+import org.apache.xbean.asm6.ClassVisitor;
+import org.apache.xbean.asm6.Label;
+import org.apache.xbean.asm6.MethodVisitor;
+import org.apache.xbean.asm6.Opcodes;
+import org.apache.xbean.asm6.Type;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -220,7 +220,7 @@ public class XbeanAsmParameterNameLoader
         private final Map<String,Constructor> constructorMap = new HashMap<String,Constructor>();
 
         public AllParameterNamesDiscoveringVisitor(Class type, String methodName) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             this.methodName = methodName;
 
             List<Method> methods = new ArrayList<Method>(Arrays.asList(type.getMethods()));
@@ -233,7 +233,7 @@ public class XbeanAsmParameterNameLoader
         }
 
         public AllParameterNamesDiscoveringVisitor(Class type) {
-            super(Opcodes.ASM5);
+            super(Opcodes.ASM6);
             this.methodName = "<init>";
 
             List<Constructor> constructors = new ArrayList<Constructor>(Arrays.asList(type.getConstructors()));
@@ -293,7 +293,7 @@ public class XbeanAsmParameterNameLoader
                     isStaticMethod = Modifier.isStatic(method.getModifiers());
                 }
 
-                return new MethodVisitor(Opcodes.ASM5) {
+                return new MethodVisitor(Opcodes.ASM6) {
                     // assume static method until we get a first parameter name
                     public void visitLocalVariable(String name, String description, String
signature, Label start, Label end, int index) {
                         if (isStaticMethod) {



Mime
View raw message