geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r777727 - in /geronimo/xbean/trunk/xbean-reflect: pom.xml src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
Date Fri, 22 May 2009 22:07:47 GMT
Author: jlaskowski
Date: Fri May 22 22:07:46 2009
New Revision: 777727

URL: http://svn.apache.org/viewvc?rev=777727&view=rev
Log:
XBEAN-129 Upgrade xbean-reflect to asm 3.1

Modified:
    geronimo/xbean/trunk/xbean-reflect/pom.xml
    geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java

Modified: geronimo/xbean/trunk/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/pom.xml?rev=777727&r1=777726&r2=777727&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-reflect/pom.xml Fri May 22 22:07:46 2009
@@ -34,16 +34,9 @@
   <name>Apache XBean :: Reflect</name>
   <dependencies>
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>2.2.3</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>2.2.3</version>
-      <optional>true</optional>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-asm-shaded</artifactId>
+      <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

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=777727&r1=777726&r2=777727&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
Fri May 22 22:07:46 2009
@@ -30,11 +30,11 @@
 import java.util.WeakHashMap;
 import java.util.Arrays;
 
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.commons.EmptyVisitor;
+import org.apache.xbean.asm.ClassReader;
+import org.apache.xbean.asm.Label;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm.commons.EmptyVisitor;
 
 /**
  * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the
local variable table in the
@@ -111,7 +111,7 @@
             ClassReader reader = AsmParameterNameLoader.createClassReader(clazz);
 
             AsmParameterNameLoader.AllParameterNamesDiscoveringVisitor visitor = new AsmParameterNameLoader.AllParameterNamesDiscoveringVisitor(clazz);
-            reader.accept(visitor, false);
+            reader.accept(visitor, 0);
 
             Map exceptions = visitor.getExceptions();
             if (exceptions.size() == 1) {
@@ -160,7 +160,7 @@
             ClassReader reader = AsmParameterNameLoader.createClassReader(clazz);
 
             AsmParameterNameLoader.AllParameterNamesDiscoveringVisitor visitor = new AsmParameterNameLoader.AllParameterNamesDiscoveringVisitor(clazz,
methodName);
-            reader.accept(visitor, false);
+            reader.accept(visitor, 0);
 
             Map exceptions = visitor.getExceptions();
             if (exceptions.size() == 1) {



Mime
View raw message