You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/05/27 12:16:24 UTC
svn commit: r1486557 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-common/
arquillian/arquillian-tomee-webapp-remote/ container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/
container/openejb-core/src/main/java/org/ap...
Author: rmannibucau
Date: Mon May 27 10:16:23 2013
New Revision: 1486557
URL: http://svn.apache.org/r1486557
Log:
TOMEE-949 using asm4 shade instead of asm3
Removed:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AsmParameterNameLoader.java
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/trunk/container/openejb-core/pom.xml
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml
tomee/tomee/trunk/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/server/openejb-server/pom.xml
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml Mon May 27 10:16:23 2013
@@ -140,7 +140,7 @@
<groupId>org.apache.geronimo.javamail</groupId>
</exclusion>
<exclusion>
- <artifactId>xbean-asm-shaded</artifactId>
+ <artifactId>xbean-asm4-shaded</artifactId>
<groupId>org.apache.xbean</groupId>
</exclusion>
<exclusion>
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Mon May 27 10:16:23 2013
@@ -148,7 +148,7 @@
<groupId>org.apache.geronimo.javamail</groupId>
</exclusion>
<exclusion>
- <artifactId>xbean-asm-shaded</artifactId>
+ <artifactId>xbean-asm4-shaded</artifactId>
<groupId>org.apache.xbean</groupId>
</exclusion>
<exclusion>
Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Mon May 27 10:16:23 2013
@@ -192,8 +192,8 @@
org.apache.webbeans.util;version="[1.1,2)",
org.apache.webbeans.web.context;version="[1.1,2)",
org.apache.webbeans.xml;version="[1.1,2)",
- org.apache.xbean.asm;version="[3.1,4)",
- org.apache.xbean.asm.commons;version="[3.1,4)",
+ org.apache.xbean.asm4;version="[3.1,4)",
+ org.apache.xbean.asm4.commons;version="[3.1,4)",
org.apache.xbean.finder;version="[3.8,4)",
org.apache.xbean.finder.archive;version="[3.8,4)",
org.apache.xbean.finder.filter;version="[3.8,4)",
@@ -347,7 +347,7 @@
</manifest>
<manifestEntries>
<Class-Path>openejb-loader-${project.version}.jar openejb-client-${project.version}.jar
- xbean-finder-shaded-${xbeanVersion}.jar xbean-asm-shaded-${xbeanVersion}.jar
+ xbean-finder-shaded-${xbeanVersion}.jar xbean-asm4-shaded-${xbeanVersion}.jar
</Class-Path>
<J2EE-DeploymentFactory-Implementation-Class>
org.apache.openejb.config.VmDeploymentFactory
@@ -489,7 +489,7 @@
<!-- End: JavaMail -->
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
+ <artifactId>xbean-asm4-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -612,13 +612,6 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.openejb.patch</groupId>
- <artifactId>openjpa-asm-shaded</artifactId>
- <version>2.2.0</version>
- </dependency>
- -->
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-core</artifactId>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java Mon May 27 10:16:23 2013
@@ -20,7 +20,6 @@ import org.apache.openejb.core.ivm.namin
import org.apache.openejb.injection.FallbackPropertyInjector;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
-import org.apache.openejb.util.AsmParameterNameLoader;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.PassthroughFactory;
@@ -40,11 +39,6 @@ import java.util.Map;
import java.util.Map.Entry;
public class InjectionProcessor<T> {
-
- static {
- AsmParameterNameLoader.install();
- }
-
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, InjectionProcessor.class);
private final Class<? extends T> beanClass;
private final Collection<Injection> injections;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Mon May 27 10:16:23 2013
@@ -104,7 +104,6 @@ import org.apache.openejb.resource.jdbc.
import org.apache.openejb.spi.ApplicationServer;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.spi.SecurityService;
-import org.apache.openejb.util.AsmParameterNameLoader;
import org.apache.openejb.util.Contexts;
import org.apache.openejb.util.EventHelper;
import org.apache.openejb.util.JndiTreeBrowser;
@@ -203,7 +202,6 @@ import java.util.concurrent.locks.Reentr
public class Assembler extends AssemblerTool implements org.apache.openejb.spi.Assembler, JndiConstants {
static {
- AsmParameterNameLoader.install();
// avoid linkage error on mac
// adding just in case others run into in their tests
JULLoggerFactory.class.getName();
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/PersistenceContextAnnFactory.java Mon May 27 10:16:23 2013
@@ -18,11 +18,12 @@ package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.loader.IO;
-import org.apache.xbean.asm.AnnotationVisitor;
-import org.apache.xbean.asm.ClassReader;
-import org.apache.xbean.asm.FieldVisitor;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.commons.EmptyVisitor;
+import org.apache.xbean.asm4.AnnotationVisitor;
+import org.apache.xbean.asm4.ClassReader;
+import org.apache.xbean.asm4.FieldVisitor;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.shade.commons.EmptyVisitor;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceProperty;
@@ -35,6 +36,8 @@ import java.util.Map;
import java.util.Set;
public class PersistenceContextAnnFactory {
+ public static final AnnotationVisitor EMPTY_ANNOTATION_VISITOR = new AnnotationVisitor(Opcodes.ASM4) {
+ };
private static boolean useAsm;
static {
boolean isPersistenceContextAnnotationValid = false;
@@ -43,7 +46,8 @@ public class PersistenceContextAnnFactor
Class<?> persistenceContextClass = Class.forName("javax.persistence.PersistenceContext");
persistenceContextClass.getMethod("properties", (Class[]) null);
isPersistenceContextAnnotationValid = true;
- } catch (Exception e) {
+ } catch (final Exception e) {
+ // no-op
}
useAsm = !isPersistenceContextAnnotationValid;
}
@@ -186,28 +190,36 @@ public class PersistenceContextAnnFactor
PersistenceContextVisitor visitor = new PersistenceContextVisitor(className, currentName);
return visitor;
} else if ("Ljavax/persistence/PersistenceContexts;".equals(desc)) {
- return this;
- }
- return new EmptyVisitor();
- }
-
- public AnnotationVisitor visitParameterAnnotation(int i, String string, boolean b) {
- return new EmptyVisitor();
- }
+ return new AnnotationVisitor(Opcodes.ASM4) {
+ @Override
+ public AnnotationVisitor visitAnnotation(String name, String desc) {
+ return PersistenceContextReader.this.visitAnnotation(name, desc);
+ }
- public AnnotationVisitor visitAnnotationDefault() {
- return new EmptyVisitor();
+ @Override
+ public AnnotationVisitor visitArray(String name) {
+ return PersistenceContextReader.this.visitArray(name);
+ }
+ };
+ }
+ return EMPTY_ANNOTATION_VISITOR;
}
public AnnotationVisitor visitArray(String string) {
- return this;
+ return new AnnotationVisitor(Opcodes.ASM4) {
+ @Override
+ public AnnotationVisitor visitAnnotation(String name, String desc) {
+ return PersistenceContextReader.this.visitAnnotation(name, desc);
+ }
+ };
}
}
- private class PersistenceContextVisitor implements AnnotationVisitor {
+ private class PersistenceContextVisitor extends AnnotationVisitor {
private AsmPersistenceContext persistenceContext = new AsmPersistenceContext();
public PersistenceContextVisitor(String className, String memberName) {
+ super(Opcodes.ASM4);
persistenceContext.name = className + "/" + memberName;
}
@@ -235,7 +247,7 @@ public class PersistenceContextAnnFactor
}
public AnnotationVisitor visitArray(String string) {
- return new EmptyVisitor() {
+ return new AnnotationVisitor(Opcodes.ASM4) {
private String name;
private String value;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/TempClassLoader.java Mon May 27 10:16:23 2013
@@ -19,9 +19,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.asm.ClassReader;
-import org.apache.xbean.asm.Opcodes;
-import org.apache.xbean.asm.commons.EmptyVisitor;
+import org.apache.xbean.asm4.ClassReader;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.shade.commons.EmptyVisitor;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp1Generator.java Mon May 27 10:16:23 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.xbean.asm.ClassWriter;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Opcodes;
-import org.apache.xbean.asm.Type;
-import org.apache.xbean.asm.FieldVisitor;
+import org.apache.xbean.asm4.ClassWriter;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.Type;
+import org.apache.xbean.asm4.FieldVisitor;
/**
* Class for generating a class file that implements
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/Cmp2Generator.java Mon May 27 10:16:23 2013
@@ -29,12 +29,12 @@ import java.util.Map;
import javax.ejb.EntityContext;
import org.apache.openejb.OpenEJBRuntimeException;
-import org.apache.xbean.asm.ClassWriter;
-import org.apache.xbean.asm.FieldVisitor;
-import org.apache.xbean.asm.Label;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Opcodes;
-import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm4.ClassWriter;
+import org.apache.xbean.asm4.FieldVisitor;
+import org.apache.xbean.asm4.Label;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
+import org.apache.xbean.asm4.Type;
/**
* Code generate for CMP level 2 beans. This will
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmpField.java Mon May 27 10:16:23 2013
@@ -18,7 +18,7 @@ package org.apache.openejb.core.cmp.cmp2
import java.lang.reflect.Method;
-import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm4.Type;
public class CmpField {
private final String name;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrField.java Mon May 27 10:16:23 2013
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm4.Type;
public class CmrField {
private final String name;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/CmrStyle.java Mon May 27 10:16:23 2013
@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Collection;
import java.lang.reflect.Method;
-import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm4.Type;
public enum CmrStyle {
SINGLE(SingleValuedCmr.class, null, null),
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/cmp/cmp2/PostCreateGenerator.java Mon May 27 10:16:23 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.core.cmp.cmp2;
-import org.apache.xbean.asm.ClassWriter;
-import org.apache.xbean.asm.Type;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Opcodes;
+import org.apache.xbean.asm4.ClassWriter;
+import org.apache.xbean.asm4.Type;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java Mon May 27 10:16:23 2013
@@ -16,14 +16,14 @@
*/
package org.apache.openejb.util;
-import org.apache.openejb.config.DeploymentLoader;
import org.apache.openejb.config.DeploymentsResolver;
-import org.apache.xbean.asm.AnnotationVisitor;
-import org.apache.xbean.asm.Attribute;
-import org.apache.xbean.asm.ClassReader;
-import org.apache.xbean.asm.ClassVisitor;
-import org.apache.xbean.asm.FieldVisitor;
-import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm4.AnnotationVisitor;
+import org.apache.xbean.asm4.Attribute;
+import org.apache.xbean.asm4.ClassReader;
+import org.apache.xbean.asm4.ClassVisitor;
+import org.apache.xbean.asm4.FieldVisitor;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Opcodes;
import org.apache.xbean.finder.UrlSet;
import java.io.BufferedInputStream;
@@ -59,10 +59,10 @@ import java.util.jar.JarInputStream;
* @version $Rev$ $Date$
*/
public class AnnotationFinder {
+ private static final int ASM_FLAGS = ClassReader.SKIP_CODE + ClassReader.SKIP_DEBUG + ClassReader.SKIP_FRAMES;
private final ClassLoader classLoader;
private final List<String> classesNotLoaded = new ArrayList<String>();
- private final int ASM_FLAGS = ClassReader.SKIP_CODE + ClassReader.SKIP_DEBUG + ClassReader.SKIP_FRAMES;
private List<String> classNames;
/**
@@ -318,13 +318,14 @@ public class AnnotationFinder {
}
- public class Visitor implements ClassVisitor {
+ public class Visitor extends ClassVisitor {
private NotFoundException notFoundException;
private FoundException foundException;
private final Filter filter;
public Visitor(final Filter filter) {
+ super(Opcodes.ASM4);
this.filter = filter;
try {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java Mon May 27 10:16:23 2013
@@ -17,11 +17,11 @@
package org.apache.openejb.util.proxy;
import org.apache.openejb.util.Debug;
-import org.apache.xbean.asm.ClassWriter;
-import org.apache.xbean.asm.Label;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Opcodes;
-import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm4.ClassWriter;
+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 javax.ejb.EJBException;
import java.io.Serializable;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java Mon May 27 10:16:23 2013
@@ -20,8 +20,8 @@ import junit.framework.AssertionFailedEr
import junit.framework.TestCase;
import junit.framework.TestResult;
import org.apache.openejb.loader.IO;
-import org.apache.xbean.asm.ClassReader;
-import org.apache.xbean.asm.ClassWriter;
+import org.apache.xbean.asm4.ClassReader;
+import org.apache.xbean.asm4.ClassWriter;
import java.io.File;
import java.io.IOException;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/DependencyVisitor.java Mon May 27 10:16:23 2013
@@ -45,25 +45,26 @@
*/
package org.apache.openejb;
-import org.apache.xbean.asm.AnnotationVisitor;
-import org.apache.xbean.asm.ClassVisitor;
-import org.apache.xbean.asm.FieldVisitor;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Attribute;
-import org.apache.xbean.asm.Type;
-import org.apache.xbean.asm.Label;
-import org.apache.xbean.asm.signature.SignatureVisitor;
-import org.apache.xbean.asm.signature.SignatureReader;
+import org.apache.xbean.asm4.AnnotationVisitor;
+import org.apache.xbean.asm4.Attribute;
+import org.apache.xbean.asm4.FieldVisitor;
+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.EmptyVisitor;
+import org.apache.xbean.asm4.signature.SignatureReader;
+import org.apache.xbean.asm4.signature.SignatureVisitor;
-import java.util.Set;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.HashMap;
+import java.util.Set;
/**
* @version $Rev$ $Date$
*/
-public class DependencyVisitor implements AnnotationVisitor, SignatureVisitor, ClassVisitor, FieldVisitor, MethodVisitor {
+public class DependencyVisitor extends EmptyVisitor {
Set<String> packages = new HashSet<String>();
Map<String, Map<String, Integer>> groups = new HashMap<String, Map<String, Integer>>();
@@ -112,7 +113,7 @@ public class DependencyVisitor implement
final String desc,
final boolean visible) {
addDesc(desc);
- return this;
+ return super.visitAnnotation(desc, visible);
}
public void visitAttribute(final Attribute attr) {
@@ -132,7 +133,7 @@ public class DependencyVisitor implement
if (value instanceof Type) {
addType((Type) value);
}
- return this;
+ return super.visitField(access, name, desc, signature, value);
}
public MethodVisitor visitMethod(
@@ -147,10 +148,7 @@ public class DependencyVisitor implement
addSignature(signature);
}
addNames(exceptions);
- return this;
- }
-
- public void visitSource(final String source, final String debug) {
+ return super.visitMethod(access, name, desc, signature, exceptions);
}
public void visitInnerClass(
@@ -177,7 +175,7 @@ public class DependencyVisitor implement
final String desc,
final boolean visible) {
addDesc(desc);
- return this;
+ return super.visitParameterAnnotation(parameter, desc, visible);
}
public void visitTypeInsn(final int opcode, final String desc) {
@@ -226,10 +224,6 @@ public class DependencyVisitor implement
addTypeSignature(signature);
}
- public AnnotationVisitor visitAnnotationDefault() {
- return this;
- }
-
public void visitCode() {
}
@@ -305,46 +299,11 @@ public class DependencyVisitor implement
final String name,
final String desc) {
addDesc(desc);
- return this;
- }
-
- public AnnotationVisitor visitArray(final String name) {
- return this;
+ return super.visitAnnotation(name, desc);
}
// SignatureVisitor
- public void visitFormalTypeParameter(final String name) {
- }
-
- public SignatureVisitor visitClassBound() {
- return this;
- }
-
- public SignatureVisitor visitInterfaceBound() {
- return this;
- }
-
- public SignatureVisitor visitSuperclass() {
- return this;
- }
-
- public SignatureVisitor visitInterface() {
- return this;
- }
-
- public SignatureVisitor visitParameterType() {
- return this;
- }
-
- public SignatureVisitor visitReturnType() {
- return this;
- }
-
- public SignatureVisitor visitExceptionType() {
- return this;
- }
-
public void visitBaseType(final char descriptor) {
}
@@ -352,10 +311,6 @@ public class DependencyVisitor implement
// TODO verify
}
- public SignatureVisitor visitArrayType() {
- return this;
- }
-
public void visitClassType(final String name) {
addName(name);
}
@@ -367,15 +322,6 @@ public class DependencyVisitor implement
public void visitTypeArgument() {
}
- public SignatureVisitor visitTypeArgument(final char wildcard) {
- return this;
- }
-
- // common
-
- public void visitEnd() {
- }
-
// ---------------------------------------------
private String getGroupKey(String name) {
@@ -431,13 +377,102 @@ public class DependencyVisitor implement
private void addSignature(final String signature) {
if (signature != null) {
- new SignatureReader(signature).accept(this);
+ new SignatureReader(signature).accept(new SignatureAdapter(this));
}
}
private void addTypeSignature(final String signature) {
if (signature != null) {
- new SignatureReader(signature).acceptType(this);
+ new SignatureReader(signature).acceptType(new SignatureAdapter(this));
+ }
+ }
+
+ private class SignatureAdapter extends SignatureVisitor {
+ private final DependencyVisitor delegate;
+
+ public SignatureAdapter(final DependencyVisitor dependencyVisitor) {
+ super(Opcodes.ASM4);
+ delegate = dependencyVisitor;
+ }
+
+ @Override
+ public void visitFormalTypeParameter(String name) {
+ //delegate.visitFormalTypeParameter(name);
+ }
+
+ @Override
+ public SignatureVisitor visitClassBound() {
+ return this; //delegate.visitClassBound();
+ }
+
+ @Override
+ public SignatureVisitor visitInterfaceBound() {
+ return this; //delegate.visitInterfaceBound();
+ }
+
+ @Override
+ public SignatureVisitor visitSuperclass() {
+ return this; //delegate.visitSuperclass();
+ }
+
+ @Override
+ public SignatureVisitor visitInterface() {
+ return this; //delegate.visitInterface();
+ }
+
+ @Override
+ public SignatureVisitor visitParameterType() {
+ return this; //delegate.visitParameterType();
+ }
+
+ @Override
+ public SignatureVisitor visitReturnType() {
+ return this; //delegate.visitReturnType();
+ }
+
+ @Override
+ public SignatureVisitor visitExceptionType() {
+ return this; //delegate.visitExceptionType();
+ }
+
+ @Override
+ public void visitBaseType(char descriptor) {
+ delegate.visitBaseType(descriptor);
+ }
+
+ @Override
+ public void visitTypeVariable(String name) {
+ delegate.visitTypeVariable(name);
+ }
+
+ @Override
+ public SignatureVisitor visitArrayType() {
+ return this; //delegate.visitArrayType();
+ }
+
+ @Override
+ public void visitClassType(String name) {
+ delegate.visitClassType(name);
+ }
+
+ @Override
+ public void visitInnerClassType(String name) {
+ delegate.visitInnerClassType(name);
+ }
+
+ @Override
+ public void visitTypeArgument() {
+ delegate.visitTypeArgument();
+ }
+
+ @Override
+ public SignatureVisitor visitTypeArgument(char wildcard) {
+ return this; //delegate.visitTypeArgument(wildcard);
+ }
+
+ @Override
+ public void visitEnd() {
+ delegate.visitEnd();
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/KeysAnnotationVisitor.java Mon May 27 10:16:23 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.config.rules;
-import org.apache.xbean.asm.AnnotationVisitor;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Type;
-import org.apache.xbean.asm.commons.EmptyVisitor;
+import org.apache.xbean.asm4.AnnotationVisitor;
+import org.apache.xbean.asm4.MethodVisitor;
+import org.apache.xbean.asm4.Type;
+import org.apache.xbean.asm4.shade.EmptyVisitor;
import java.util.HashSet;
@@ -36,10 +36,10 @@ public class KeysAnnotationVisitor exten
@Override
public AnnotationVisitor visitAnnotation(final String desc, final boolean arg1) {
if (desc.contains("RunWith"))
- return this;
+ return super.visitAnnotation(desc, arg1);
if (desc.contains("Keys")) {
current.methuds.add(currentMethod);
- return this;
+ return super.visitAnnotation(desc, arg1);
}
return null;
}
@@ -47,7 +47,7 @@ public class KeysAnnotationVisitor exten
@Override
public MethodVisitor visitMethod(final int access, final String name, final String desc, final String signature, final String[] exceptions) {
currentMethod = new MethodInfo(name);
- return this;
+ return super.visitMethod(access, name, desc, signature, exceptions);
}
@Override
@@ -72,14 +72,14 @@ public class KeysAnnotationVisitor exten
@Override
public AnnotationVisitor visitAnnotation(final String name, final String desc) {
if (desc.contains("Key")) {
- return this;
+ return super.visitAnnotation(name, desc);
}
return null;
}
@Override
public AnnotationVisitor visitArray(final String arg0) {
- return this;
+ return super.visitArray(arg0);
}
static class ClassInfo {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationKeysAuditorTest.java Mon May 27 10:16:23 2013
@@ -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.asm.ClassReader;
-import org.apache.xbean.asm.ClassWriter;
+import org.apache.xbean.asm4.ClassReader;
+import org.apache.xbean.asm4.ClassWriter;
import org.codehaus.swizzle.confluence.Confluence;
import org.codehaus.swizzle.confluence.Page;
import org.junit.BeforeClass;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTest.java Mon May 27 10:16:23 2013
@@ -47,13 +47,13 @@ import org.apache.openejb.persistence.Pe
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.asm4.Opcodes;
import org.apache.xbean.naming.context.ImmutableContext;
-import org.apache.xbean.asm.ClassAdapter;
-import org.apache.xbean.asm.ClassReader;
-import org.apache.xbean.asm.ClassVisitor;
-import org.apache.xbean.asm.ClassWriter;
-import static org.apache.xbean.asm.Opcodes.ACC_PRIVATE;
-import static org.apache.xbean.asm.Opcodes.ACC_TRANSIENT;
+import org.apache.xbean.asm4.ClassReader;
+import org.apache.xbean.asm4.ClassVisitor;
+import org.apache.xbean.asm4.ClassWriter;
+import static org.apache.xbean.asm4.Opcodes.ACC_PRIVATE;
+import static org.apache.xbean.asm4.Opcodes.ACC_TRANSIENT;
public class JpaTest extends TestCase {
// private static final String PERSISTENCE_PROVIDER = "org.apache.cayenne.jpa.Provider";
@@ -349,13 +349,12 @@ public class JpaTest extends TestCase {
ClassReader classReader = new ClassReader(origBytes);
classReader.accept(visitor, 0);
- byte[] newBytes = classWriter.toByteArray();
- return newBytes;
+ return classWriter.toByteArray();
}
- public static class FieldAdderClassVisitor extends ClassAdapter {
+ public static class FieldAdderClassVisitor extends ClassVisitor {
public FieldAdderClassVisitor(ClassVisitor classVisitor) {
- super(classVisitor);
+ super(Opcodes.ASM4, classVisitor);
}
public void visitEnd() {
Modified: tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-jpa-integration/pom.xml Mon May 27 10:16:23 2013
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
+ <artifactId>xbean-asm4-shaded</artifactId>
<version>${xbeanVersion}</version>
<scope>provided</scope>
</dependency>
Modified: tomee/tomee/trunk/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java (original)
+++ tomee/tomee/trunk/container/openejb-jpa-integration/src/main/java/org/apache/openejb/jpa/integration/MakeTxLookup.java Mon May 27 10:16:23 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.jpa.integration;
-import org.apache.xbean.asm.ClassWriter;
-import org.apache.xbean.asm.Label;
-import org.apache.xbean.asm.MethodVisitor;
-import org.apache.xbean.asm.Opcodes;
-import org.apache.xbean.asm.Type;
+import org.apache.xbean.asm4.ClassWriter;
+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 java.io.File;
import java.io.FileOutputStream;
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon May 27 10:16:23 2013
@@ -143,7 +143,7 @@
<junit.version>4.11</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
<scannotation.version>1.0.2</scannotation.version>
- <org.apache.openwebbeans.version>1.2.0</org.apache.openwebbeans.version>
+ <org.apache.openwebbeans.version>1.2.1-SNAPSHOT</org.apache.openwebbeans.version>
<geronimo.connector.version>3.1.1</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
@@ -1309,7 +1309,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
+ <artifactId>xbean-asm4-shaded</artifactId>
<version>${xbeanVersion}</version>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/pom.xml?rev=1486557&r1=1486556&r2=1486557&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-server/pom.xml Mon May 27 10:16:23 2013
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm-shaded</artifactId>
+ <artifactId>xbean-asm4-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -264,8 +264,8 @@
org.apache.webbeans.util;version="[1.1,2)",
org.apache.webbeans.web.context;version="[1.1,2)",
org.apache.webbeans.xml;version="[1.1,2)",
- org.apache.xbean.asm;version="[3.1,4)",
- org.apache.xbean.asm.commons;version="[3.1,4)",
+ org.apache.xbean.asm4;version="[3.1,4)",
+ org.apache.xbean.asm4.commons;version="[3.1,4)",
org.apache.xbean.finder;version="[3.8,4)",
org.apache.xbean.finder.archive;version="[3.8,4)",
org.apache.xbean.finder.filter;version="[3.8,4)",