You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2019/05/29 08:14:54 UTC
[tomee] 04/05: PR from Salomon Mayengue
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit c7ba5b6400703d04d787816c76930963b21efa2b
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Wed May 29 10:13:59 2019 +0200
PR from Salomon Mayengue
---
.../config/PersistenceContextAnnFactory.java | 14 +++++++-------
.../org/apache/openejb/core/TempClassLoader.java | 6 +++---
.../openejb/core/cmp/cmp2/Cmp1Generator.java | 10 +++++-----
.../openejb/core/cmp/cmp2/Cmp2Generator.java | 12 ++++++------
.../org/apache/openejb/core/cmp/cmp2/CmpField.java | 2 +-
.../org/apache/openejb/core/cmp/cmp2/CmrField.java | 2 +-
.../org/apache/openejb/core/cmp/cmp2/CmrStyle.java | 2 +-
.../openejb/core/cmp/cmp2/PostCreateGenerator.java | 8 ++++----
.../org/apache/openejb/dyni/DynamicSubclass.java | 20 ++++++++++----------
.../org/apache/openejb/util/AnnotationFinder.java | 16 ++++++++--------
.../apache/openejb/DependenceValidationTest.java | 4 ++--
.../java/org/apache/openejb/DependencyVisitor.java | 22 +++++++++++-----------
.../openejb/config/ServiceClasspathTest.java | 16 ++++++++--------
.../config/rules/KeysAnnotationVisitor.java | 8 ++++----
.../config/rules/ValidationKeysAuditorTest.java | 4 ++--
.../org/apache/openejb/core/cmp/jpa/JpaTest.java | 14 +++++++-------
16 files changed, 80 insertions(+), 80 deletions(-)
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 66e2361..5671df4 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.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceProperty;
@@ -248,7 +248,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.ASM7);
this.contexts = contexts;
persistenceContext.name = className + "/" + memberName;
}
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 782bd89..393bfe6 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.asm7.ClassReader;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
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 d8ec702..36d6fb1 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.asm7.ClassWriter;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
/**
* Class for generating a class file that implements
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 1842310..80d447a 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.asm7.ClassWriter;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.Label;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
import javax.ejb.EntityContext;
import java.lang.reflect.Field;
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..76065b9 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.asm7.Type;
import java.lang.reflect.Method;
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..12c03d1 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.asm7.Type;
public class CmrField {
private final String name;
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..56ee29a 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.asm7.Type;
import java.lang.reflect.Method;
import java.util.Collection;
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..97e602d 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.asm7.ClassWriter;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
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 c9dd53b..7cc0284 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.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassVisitor;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -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.ASM7, 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.ASM7);
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.ASM7);
this.visitors = visitors;
}
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 3f29b3a..c3c4f94 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.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.Attribute;
+import org.apache.xbean.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassVisitor;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
import org.apache.xbean.finder.UrlSet;
import java.io.BufferedInputStream;
@@ -327,7 +327,7 @@ public class AnnotationFinder {
private final Filter filter;
public Visitor(final Filter filter) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.filter = filter;
try {
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 2436960..965c77b 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.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassWriter;
import java.io.File;
import java.io.IOException;
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..5898626 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.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.Attribute;
+import org.apache.xbean.asm7.FieldVisitor;
+import org.apache.xbean.asm7.Label;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
+import org.apache.xbean.asm7.Type;
+import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
+import org.apache.xbean.asm7.signature.SignatureReader;
+import org.apache.xbean.asm7.signature.SignatureVisitor;
import java.util.HashMap;
import java.util.HashSet;
@@ -401,7 +401,7 @@ public class DependencyVisitor extends EmptyVisitor {
private final DependencyVisitor delegate;
public SignatureAdapter(final DependencyVisitor dependencyVisitor) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
delegate = dependencyVisitor;
}
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 51fd351..f7d8189 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
@@ -29,9 +29,9 @@ import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.loader.provisining.ProvisioningResolver;
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.asm7.ClassWriter;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Opcodes;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -53,11 +53,11 @@ import java.util.Properties;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import static org.apache.xbean.asm6.Opcodes.ACC_PUBLIC;
-import static org.apache.xbean.asm6.Opcodes.ACC_SUPER;
-import static org.apache.xbean.asm6.Opcodes.ALOAD;
-import static org.apache.xbean.asm6.Opcodes.INVOKESPECIAL;
-import static org.apache.xbean.asm6.Opcodes.RETURN;
+import static org.apache.xbean.asm7.Opcodes.ACC_PUBLIC;
+import static org.apache.xbean.asm7.Opcodes.ACC_SUPER;
+import static org.apache.xbean.asm7.Opcodes.ALOAD;
+import static org.apache.xbean.asm7.Opcodes.INVOKESPECIAL;
+import static org.apache.xbean.asm7.Opcodes.RETURN;
/**
* @version $Rev$ $Date$
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..736d7e2 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.asm7.AnnotationVisitor;
+import org.apache.xbean.asm7.MethodVisitor;
+import org.apache.xbean.asm7.Type;
+import org.apache.xbean.asm7.shade.commons.EmptyVisitor;
import java.util.HashSet;
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..e5d3e1f 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.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassWriter;
import org.codehaus.swizzle.confluence.Confluence;
import org.codehaus.swizzle.confluence.Page;
import org.junit.BeforeClass;
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 ad38935..f813202 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.asm7.ClassReader;
+import org.apache.xbean.asm7.ClassVisitor;
+import org.apache.xbean.asm7.ClassWriter;
+import org.apache.xbean.asm7.Opcodes;
import org.apache.xbean.naming.context.ImmutableContext;
import javax.naming.Context;
@@ -54,8 +54,8 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
-import static org.apache.xbean.asm6.Opcodes.ACC_PRIVATE;
-import static org.apache.xbean.asm6.Opcodes.ACC_TRANSIENT;
+import static org.apache.xbean.asm7.Opcodes.ACC_PRIVATE;
+import static org.apache.xbean.asm7.Opcodes.ACC_TRANSIENT;
public class JpaTest extends TestCase {
static {
@@ -367,7 +367,7 @@ public class JpaTest extends TestCase {
public static class FieldAdderClassVisitor extends ClassVisitor {
public FieldAdderClassVisitor(final ClassVisitor classVisitor) {
- super(Opcodes.ASM6, classVisitor);
+ super(Opcodes.ASM7, classVisitor);
}
public void visitEnd() {