You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by rm...@apache.org on 2014/03/31 21:08:15 UTC
svn commit: r1583404 - in /geronimo/xbean/trunk: ./ xbean-asm-shaded/
xbean-asm-util/ xbean-asm-util/src/main/java/org/apache/xbean/asm4/
xbean-asm-util/src/main/java/org/apache/xbean/asm5/
xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/ x...
Author: rmannibucau
Date: Mon Mar 31 19:08:14 2014
New Revision: 1583404
URL: http://svn.apache.org/r1583404
Log:
XBEAN-261 XBEAN-260 making asm5 shade working and remove asm 3 and asm4 shades since xbean is only compatible with a single version of asm shade
Added:
geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/
geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/
geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/
geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java
- copied, changed from r1582001, geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java
Removed:
geronimo/xbean/trunk/xbean-asm-shaded/
geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm4/
geronimo/xbean/trunk/xbean-asm4-shaded/
geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/
Modified:
geronimo/xbean/trunk/pom.xml
geronimo/xbean/trunk/xbean-asm-util/pom.xml
geronimo/xbean/trunk/xbean-asm5-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=1583404&r1=1583403&r2=1583404&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Mon Mar 31 19:08:14 2014
@@ -63,6 +63,8 @@
- http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <asm.version>5.0.1</asm.version>
</properties>
@@ -222,7 +224,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm4-shaded</artifactId>
+ <artifactId>xbean-asm5-shaded</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -417,8 +419,6 @@
<module>xbean-spring</module>
<module>xbean-telnet</module>
<module>maven-xbean-plugin</module>
- <module>xbean-asm-shaded</module>
- <module>xbean-asm4-shaded</module>
<module>xbean-asm5-shaded</module>
<module>xbean-finder-shaded</module>
</modules>
Modified: geronimo/xbean/trunk/xbean-asm-util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm-util/pom.xml?rev=1583404&r1=1583403&r2=1583404&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm-util/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-asm-util/pom.xml Mon Mar 31 19:08:14 2014
@@ -26,21 +26,21 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>xbean-asm-util</artifactId>
- <name>Apache XBean :: ASM 4 Util</name>
+ <name>Apache XBean :: ASM 5 Util</name>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>4.1</version>
+ <version>${asm.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>4.1</version>
+ <version>${asm.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Copied: geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java (from r1582001, geronimo/xbean/trunk/xbean-asm5-shaded/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/asm5/original/commons/EmptyVisitor.java?p2=geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java&p1=geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java&r1=1582001&r2=1583404&rev=1583404&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm5-shaded/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java (original)
+++ geronimo/xbean/trunk/xbean-asm-util/src/main/java/org/apache/xbean/asm5/original/commons/EmptyVisitor.java Mon Mar 31 19:08:14 2014
@@ -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.ASM4) {
+ protected final AnnotationVisitor av = new AnnotationVisitor(Opcodes.ASM5) {
@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.ASM4) {
+ protected final FieldVisitor fv = new FieldVisitor(Opcodes.ASM5) {
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
return EmptyVisitor.this.visitAnnotation(desc, visible);
@@ -203,7 +203,7 @@ public class EmptyVisitor extends ClassV
};
public EmptyVisitor() {
- super(Opcodes.ASM4);
+ super(Opcodes.ASM5);
}
protected AnnotationVisitor visitAnnotationDefault() {
Modified: geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml?rev=1583404&r1=1583403&r2=1583404&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-asm5-shaded/pom.xml Mon Mar 31 19:08:14 2014
@@ -42,7 +42,6 @@
</licenses>
<properties>
- <asm.version>5.0.1</asm.version>
<xbean.osgi.export>
org.apache.xbean.asm5.shade.commons;version=${asm.version},
org.apache.xbean.asm5;version=${asm.version},
@@ -102,5 +101,10 @@
<artifactId>asm-commons</artifactId>
<version>${asm.version}</version>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: geronimo/xbean/trunk/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/pom.xml?rev=1583404&r1=1583403&r2=1583404&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder/pom.xml Mon Mar 31 19:08:14 2014
@@ -43,13 +43,13 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>4.1</version>
+ <version>${asm.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>4.1</version>
+ <version>${asm.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -75,8 +75,8 @@
<instructions>
<Export-Package>org.apache.xbean.finder.*;version=${project.version}</Export-Package>
<Import-Package>
- org.objectweb.asm;version=3.1,
- org.objectweb.asm.commons;version=3.1,
+ org.objectweb.asm;version=5,
+ org.objectweb.asm.commons;version=5,
*
</Import-Package>
</instructions>
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=1583404&r1=1583403&r2=1583404&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 Mar 31 19:08:14 2014
@@ -34,7 +34,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.xbean.asm4.original.commons.EmptyVisitor;
+import org.apache.xbean.asm5.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.ASM4);
+ super(Opcodes.ASM5);
}
public GenericAwareInfoBuildingVisitor(GenericAwareInfoBuildingVisitor.TYPE type, Info info) {
- super(Opcodes.ASM4);
+ super(Opcodes.ASM5);
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=1583404&r1=1583403&r2=1583404&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 Mar 31 19:08:14 2014
@@ -20,7 +20,7 @@
package org.apache.xbean.finder;
-import org.apache.xbean.asm4.original.commons.EmptyVisitor;
+import org.apache.xbean.asm5.original.commons.EmptyVisitor;
import org.apache.xbean.finder.archive.Archive;
import org.apache.xbean.finder.util.Classes;
import org.apache.xbean.finder.util.SingleLinkedList;
@@ -1822,11 +1822,11 @@ public class AnnotationFinder implements
private static boolean debug = false;
public GenericAwareInfoBuildingVisitor() {
- super(Opcodes.ASM4);
+ super(Opcodes.ASM5);
}
public GenericAwareInfoBuildingVisitor(GenericAwareInfoBuildingVisitor.TYPE type, Info info) {
- super(Opcodes.ASM4);
+ super(Opcodes.ASM5);
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=1583404&r1=1583403&r2=1583404&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-reflect/pom.xml Mon Mar 31 19:08:14 2014
@@ -35,14 +35,14 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>4.1</version>
+ <version>${asm.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>4.1</version>
+ <version>${asm.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm4-shaded</artifactId>
+ <artifactId>xbean-asm5-shaded</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<optional>true</optional>
@@ -85,7 +85,7 @@
<configuration>
<instructions>
<Export-Package>!org.apache.xbean.asm.*,org.apache.xbean.*;version=${project.version}</Export-Package>
- <Import-Package>*,org.apache.log4j;resolution:=optional,org.apache.commons.logging;resolution:=optional,org.objectweb.asm;resolution:=optional;version=3.1,org.objectweb.asm.commons;resolution:=optional;version=3.1,org.apache.xbean.asm;resolution:=optional;version=3.1,org.apache.xbean.asm.commons;resolution:=optional;version=3.1</Import-Package>
+ <Import-Package>*,org.apache.log4j;resolution:=optional,org.apache.commons.logging;resolution:=optional,org.objectweb.asm;resolution:=optional;version=5,org.objectweb.asm.commons;resolution:=optional;version=5,org.apache.xbean.asm;resolution:=optional;version=5,org.apache.xbean.asm.commons;resolution:=optional;version=5</Import-Package>
</instructions>
</configuration>
</plugin>
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=1583404&r1=1583403&r2=1583404&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 Mar 31 19:08:14 2014
@@ -17,7 +17,7 @@
*/
package org.apache.xbean.recipe;
-import org.apache.xbean.asm4.original.commons.EmptyVisitor;
+import org.apache.xbean.asm5.original.commons.EmptyVisitor;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
@@ -286,7 +286,7 @@ public class AsmParameterNameLoader impl
isStaticMethod = Modifier.isStatic(method.getModifiers());
}
- return new MethodVisitor(Opcodes.ASM4) {
+ return new MethodVisitor(Opcodes.ASM5) {
// 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=1583404&r1=1583403&r2=1583404&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 Mar 31 19:08:14 2014
@@ -41,11 +41,11 @@ public final class ReflectionUtil {
private static ParameterNameLoader parameterNamesLoader;
static {
- if (isClassAvailable("org.apache.xbean.asm4.ClassReader")) {
+ if (isClassAvailable("org.apache.xbean.asm5.ClassReader")) {
parameterNamesLoader = new XbeanAsmParameterNameLoader();
} else if (isClassAvailable("org.objectweb.asm.ClassReader")) {
parameterNamesLoader = new AsmParameterNameLoader();
- } else if (isClassAvailable("org.apache.xbean.asm.ClassReader")) {
+ } 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-asm4-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=1583404&r1=1583403&r2=1583404&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 Mar 31 19:08:14 2014
@@ -17,12 +17,12 @@
*/
package org.apache.xbean.recipe;
-import org.apache.xbean.asm4.ClassReader;
-import org.apache.xbean.asm4.Label;
-import org.apache.xbean.asm4.MethodVisitor;
-import org.apache.xbean.asm4.Opcodes;
-import org.apache.xbean.asm4.Type;
-import org.apache.xbean.asm4.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm5.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm5.ClassReader;
+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 java.io.IOException;
import java.io.InputStream;
@@ -291,7 +291,7 @@ public class XbeanAsmParameterNameLoader
isStaticMethod = Modifier.isStatic(method.getModifiers());
}
- return new MethodVisitor(Opcodes.ASM4) {
+ return new MethodVisitor(Opcodes.ASM5) {
// 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) {