You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/02/23 14:55:11 UTC
[1/2] tomee git commit: Revert "some forgotten ASM upgrades"
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 4401c5142 -> 7e5626151
Revert "some forgotten ASM upgrades"
This reverts commit 11b99595be7ffc52e299fc9ac8dc9efe7d4b9996.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e9023cf4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e9023cf4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e9023cf4
Branch: refs/heads/tomee-1.7.x
Commit: e9023cf43b835768f5ed93ce028e47a7ef5416a7
Parents: 4401c51
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Fri Feb 23 14:54:06 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Fri Feb 23 14:54:06 2018 +0000
----------------------------------------------------------------------
.../apache/openejb/config/PersistenceContextAnnFactory.java | 2 +-
.../src/main/java/org/apache/openejb/dyni/DynamicSubclass.java | 6 +++---
.../main/java/org/apache/openejb/util/AnnotationFinder.java | 2 +-
.../src/test/java/org/apache/openejb/DependencyVisitor.java | 2 +-
.../src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e9023cf4/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
index a6e012f..644d190 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
@@ -236,7 +236,7 @@ public class PersistenceContextAnnFactory {
private final AsmPersistenceContext persistenceContext = new AsmPersistenceContext();
public PersistenceContextVisitor(final String className, final String memberName, final Map<String, AsmPersistenceContext> contexts) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM5);
this.contexts = contexts;
persistenceContext.name = className + "/" + memberName;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/e9023cf4/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
index 3eaa9f4..da6d617 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
@@ -297,7 +297,7 @@ public class DynamicSubclass implements Opcodes {
private final MethodVisitor newMethod;
public MoveAnnotationsVisitor(final MethodVisitor movedMethod, final MethodVisitor newMethod) {
- super(Opcodes.ASM6, movedMethod);
+ super(Opcodes.ASM5, movedMethod);
this.newMethod = newMethod;
}
@@ -323,7 +323,7 @@ public class DynamicSubclass implements Opcodes {
private final ClassVisitor newClass;
public CopyClassAnnotations(final ClassVisitor newClass) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM5);
this.newClass = newClass;
}
@@ -337,7 +337,7 @@ public class DynamicSubclass implements Opcodes {
private final Map<String, MethodVisitor> visitors;
public CopyMethodAnnotations(final Map<String, MethodVisitor> visitors) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM5);
this.visitors = visitors;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/e9023cf4/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
index 6833ff5..b271574 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
@@ -327,7 +327,7 @@ public class AnnotationFinder {
private final Filter filter;
public Visitor(final Filter filter) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM5);
this.filter = filter;
try {
http://git-wip-us.apache.org/repos/asf/tomee/blob/e9023cf4/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
index 6f8a215..fcaa6f8 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
@@ -401,7 +401,7 @@ public class DependencyVisitor extends EmptyVisitor {
private final DependencyVisitor delegate;
public SignatureAdapter(final DependencyVisitor dependencyVisitor) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM5);
delegate = dependencyVisitor;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/e9023cf4/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
index 5ea8aa4..61c4ce6 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
@@ -371,7 +371,7 @@ public class JpaTest extends TestCase {
public static class FieldAdderClassVisitor extends ClassVisitor {
public FieldAdderClassVisitor(final ClassVisitor classVisitor) {
- super(Opcodes.ASM6, classVisitor);
+ super(Opcodes.ASM5, classVisitor);
}
public void visitEnd() {
[2/2] tomee git commit: Revert "move to asm6"
Posted by jg...@apache.org.
Revert "move to asm6"
This reverts commit 61ff2ea53e46a3b5dc22c785e1a4a91b520a58b4.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7e562615
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7e562615
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7e562615
Branch: refs/heads/tomee-1.7.x
Commit: 7e5626151f4502f7e3463f87e19f0d2784dea6e5
Parents: e9023cf
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Fri Feb 23 14:54:13 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Fri Feb 23 14:54:13 2018 +0000
----------------------------------------------------------------------
arquillian/arquillian-tomee-common/pom.xml | 2 +-
.../arquillian-tomee-webapp-remote/pom.xml | 2 +-
container/openejb-core/pom.xml | 4 ++--
.../config/PersistenceContextAnnFactory.java | 12 ++++++------
.../apache/openejb/core/TempClassLoader.java | 6 +++---
.../openejb/core/cmp/cmp2/Cmp1Generator.java | 10 +++++-----
.../openejb/core/cmp/cmp2/Cmp2Generator.java | 12 ++++++------
.../apache/openejb/core/cmp/cmp2/CmpField.java | 2 +-
.../apache/openejb/core/cmp/cmp2/CmrField.java | 2 +-
.../apache/openejb/core/cmp/cmp2/CmrStyle.java | 2 +-
.../core/cmp/cmp2/PostCreateGenerator.java | 8 ++++----
.../apache/openejb/dyni/DynamicSubclass.java | 14 +++++++-------
.../apache/openejb/util/AnnotationFinder.java | 14 +++++++-------
.../util/proxy/LocalBeanProxyFactory.java | 10 +++++-----
.../openejb/DependenceValidationTest.java | 4 ++--
.../org/apache/openejb/DependencyVisitor.java | 20 ++++++++++----------
.../openejb/config/ServiceClasspathTest.java | 6 +++---
.../config/rules/KeysAnnotationVisitor.java | 8 ++++----
.../config/rules/ValidationKeysAuditorTest.java | 4 ++--
.../apache/openejb/core/cmp/jpa/JpaTest.java | 8 ++++----
container/openejb-jpa-integration/pom.xml | 2 +-
.../openejb/jpa/integration/MakeTxLookup.java | 10 +++++-----
pom.xml | 4 ++--
server/openejb-server/pom.xml | 2 +-
24 files changed, 84 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/arquillian/arquillian-tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index 8c18d16..ebec3f8 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -150,7 +150,7 @@
<groupId>org.apache.geronimo.javamail</groupId>
</exclusion>
<exclusion>
- <artifactId>xbean-asm6-shaded</artifactId>
+ <artifactId>xbean-asm5-shaded</artifactId>
<groupId>org.apache.xbean</groupId>
</exclusion>
<exclusion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/arquillian/arquillian-tomee-webapp-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index 9fc8b9a..cbd96c8 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -169,7 +169,7 @@
<groupId>org.apache.geronimo.javamail</groupId>
</exclusion>
<exclusion>
- <artifactId>xbean-asm6-shaded</artifactId>
+ <artifactId>xbean-asm5-shaded</artifactId>
<groupId>org.apache.xbean</groupId>
</exclusion>
<exclusion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index e40caf2..df3cc96 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -384,7 +384,7 @@
</manifest>
<manifestEntries>
<Class-Path>openejb-loader-${project.version}.jar openejb-client-${project.version}.jar
- xbean-finder-shaded-${xbeanVersion}.jar xbean-asm6-shaded-${xbeanVersion}.jar
+ xbean-finder-shaded-${xbeanVersion}.jar xbean-asm5-shaded-${xbeanVersion}.jar
</Class-Path>
<J2EE-DeploymentFactory-Implementation-Class>
org.apache.openejb.config.VmDeploymentFactory
@@ -536,7 +536,7 @@
<!-- End: JavaMail -->
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm6-shaded</artifactId>
+ <artifactId>xbean-asm5-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
index 644d190..4133070 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
@@ -19,12 +19,12 @@ package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.loader.IO;
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.FieldVisitor;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm5.AnnotationVisitor;
+import org.apache.xbean.asm5.ClassReader;
+import org.apache.xbean.asm5.FieldVisitor;
+import org.apache.xbean.asm5.MethodVisitor;
+import org.apache.xbean.asm5.Opcodes;
+import org.apache.xbean.asm5.shade.commons.EmptyVisitor;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceProperty;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
index 3c1e9d4..ea7df2b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
@@ -20,9 +20,9 @@ package org.apache.openejb.core;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.classloader.URLClassLoaderFirst;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm5.ClassReader;
+import org.apache.xbean.asm5.Opcodes;
+import org.apache.xbean.asm5.shade.commons.EmptyVisitor;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
index 4e44a3a..3af5d9d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
@@ -17,11 +17,11 @@
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.FieldVisitor;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm5.ClassWriter;
+import org.apache.xbean.asm5.FieldVisitor;
+import org.apache.xbean.asm5.MethodVisitor;
+import org.apache.xbean.asm5.Opcodes;
+import org.apache.xbean.asm5.Type;
/**
* Class for generating a class file that implements
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
index 866017e..29005e3 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
@@ -18,12 +18,12 @@
package org.apache.openejb.core.cmp.cmp2;
import org.apache.openejb.OpenEJBRuntimeException;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.FieldVisitor;
-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 org.apache.xbean.asm5.ClassWriter;
+import org.apache.xbean.asm5.FieldVisitor;
+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 javax.ejb.EntityContext;
import java.lang.reflect.Field;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
index 133316e..246c70e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
@@ -17,7 +17,7 @@
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm5.Type;
import java.lang.reflect.Method;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
index 0021cd0..113eb8c 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
@@ -17,7 +17,7 @@
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm5.Type;
public class CmrField {
private final String name;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
index 5be1425..a33f424 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
@@ -17,7 +17,7 @@
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm5.Type;
import java.lang.reflect.Method;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
index eab5aa1..d5872d8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
@@ -17,10 +17,10 @@
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm5.ClassWriter;
+import org.apache.xbean.asm5.MethodVisitor;
+import org.apache.xbean.asm5.Opcodes;
+import org.apache.xbean.asm5.Type;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
index da6d617..507d80d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/dyni/DynamicSubclass.java
@@ -21,13 +21,13 @@ import org.apache.openejb.loader.IO;
import org.apache.openejb.util.Debug;
import org.apache.openejb.util.proxy.LocalBeanProxyFactory;
import org.apache.openejb.util.proxy.ProxyGenerationException;
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassVisitor;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
-import org.apache.xbean.asm6.Type;
+import org.apache.xbean.asm5.AnnotationVisitor;
+import org.apache.xbean.asm5.ClassReader;
+import org.apache.xbean.asm5.ClassVisitor;
+import org.apache.xbean.asm5.ClassWriter;
+import org.apache.xbean.asm5.MethodVisitor;
+import org.apache.xbean.asm5.Opcodes;
+import org.apache.xbean.asm5.Type;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
index b271574..1595ba2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
@@ -18,13 +18,13 @@
package org.apache.openejb.util;
import org.apache.openejb.config.DeploymentsResolver;
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.Attribute;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassVisitor;
-import org.apache.xbean.asm6.FieldVisitor;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
+import org.apache.xbean.asm5.AnnotationVisitor;
+import org.apache.xbean.asm5.Attribute;
+import org.apache.xbean.asm5.ClassReader;
+import org.apache.xbean.asm5.ClassVisitor;
+import org.apache.xbean.asm5.FieldVisitor;
+import org.apache.xbean.asm5.MethodVisitor;
+import org.apache.xbean.asm5.Opcodes;
import org.apache.xbean.finder.UrlSet;
import java.io.BufferedInputStream;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
index 624fc3d..5934a38 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
@@ -18,11 +18,11 @@
package org.apache.openejb.util.proxy;
import org.apache.openejb.util.Debug;
-import org.apache.xbean.asm6.ClassWriter;
-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 org.apache.xbean.asm5.ClassWriter;
+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 javax.ejb.EJBException;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
index 8357a52..72c742e 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
@@ -20,8 +20,8 @@ import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import junit.framework.TestResult;
import org.apache.openejb.loader.IO;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassWriter;
+import org.apache.xbean.asm5.ClassReader;
+import org.apache.xbean.asm5.ClassWriter;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
index fcaa6f8..3e3a199 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
@@ -45,16 +45,16 @@
*/
package org.apache.openejb;
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.Attribute;
-import org.apache.xbean.asm6.FieldVisitor;
-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 org.apache.xbean.asm6.shade.commons.EmptyVisitor;
-import org.apache.xbean.asm6.signature.SignatureReader;
-import org.apache.xbean.asm6.signature.SignatureVisitor;
+import org.apache.xbean.asm5.AnnotationVisitor;
+import org.apache.xbean.asm5.Attribute;
+import org.apache.xbean.asm5.FieldVisitor;
+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.asm5.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm5.signature.SignatureReader;
+import org.apache.xbean.asm5.signature.SignatureVisitor;
import java.util.HashMap;
import java.util.HashSet;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
index 4d124f3..a09e18d 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/ServiceClasspathTest.java
@@ -28,9 +28,9 @@ import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.Join;
import org.apache.openejb.util.PropertyPlaceHolderHelper;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Opcodes;
+import org.apache.xbean.asm5.ClassWriter;
+import org.apache.xbean.asm5.MethodVisitor;
+import org.apache.xbean.asm5.Opcodes;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
index 57d1160..ef7ae42 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.config.rules;
-import org.apache.xbean.asm6.AnnotationVisitor;
-import org.apache.xbean.asm6.MethodVisitor;
-import org.apache.xbean.asm6.Type;
-import org.apache.xbean.asm6.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm5.AnnotationVisitor;
+import org.apache.xbean.asm5.MethodVisitor;
+import org.apache.xbean.asm5.Type;
+import org.apache.xbean.asm5.shade.commons.EmptyVisitor;
import java.util.HashSet;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
index dca0df0..4732338 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
@@ -19,8 +19,8 @@ package org.apache.openejb.config.rules;
import org.apache.openejb.config.rules.KeysAnnotationVisitor.ClassInfo;
import org.apache.openejb.config.rules.KeysAnnotationVisitor.MethodInfo;
import org.apache.openejb.loader.IO;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassWriter;
+import org.apache.xbean.asm5.ClassReader;
+import org.apache.xbean.asm5.ClassWriter;
import org.codehaus.swizzle.confluence.Confluence;
import org.codehaus.swizzle.confluence.Page;
import org.junit.BeforeClass;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
index 61c4ce6..b8ba0f4 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
@@ -26,10 +26,10 @@ import org.apache.openejb.persistence.PersistenceClassLoaderHandler;
import org.apache.openejb.persistence.PersistenceUnitInfoImpl;
import org.apache.openejb.resource.jdbc.dbcp.BasicDataSource;
import org.apache.openejb.resource.jdbc.dbcp.BasicManagedDataSource;
-import org.apache.xbean.asm6.ClassReader;
-import org.apache.xbean.asm6.ClassVisitor;
-import org.apache.xbean.asm6.ClassWriter;
-import org.apache.xbean.asm6.Opcodes;
+import org.apache.xbean.asm5.ClassReader;
+import org.apache.xbean.asm5.ClassVisitor;
+import org.apache.xbean.asm5.ClassWriter;
+import org.apache.xbean.asm5.Opcodes;
import org.apache.xbean.naming.context.ImmutableContext;
import javax.naming.Context;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-jpa-integration/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index c324685..92fd78d 100644
--- a/container/openejb-jpa-integration/pom.xml
+++ b/container/openejb-jpa-integration/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm6-shaded</artifactId>
+ <artifactId>xbean-asm5-shaded</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
index 0ed550c..b03ec92 100644
--- a/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
+++ b/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.jpa.integration;
-import org.apache.xbean.asm6.ClassWriter;
-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 org.apache.xbean.asm5.ClassWriter;
+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.File;
import java.io.FileOutputStream;
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2203c01..2dec88f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
<maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
<!-- This is used by a manifest classpath entry -->
- <xbeanVersion>4.6</xbeanVersion>
+ <xbeanVersion>4.2</xbeanVersion>
<!-- OSGi bundles properties -->
<openejb.bundle.activator/>
@@ -1630,7 +1630,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm6-shaded</artifactId>
+ <artifactId>xbean-asm5-shaded</artifactId>
<version>${xbeanVersion}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/7e562615/server/openejb-server/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index fd48006..c9f943e 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm6-shaded</artifactId>
+ <artifactId>xbean-asm5-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>