[libspring-java] 07/19: Removed the ASM patches (ASM 5 is now used)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 3 15:39:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libspring-java.
commit 934f7ecff720b6bd73bb62ba2cdc909b729dd2e6
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Nov 26 16:54:57 2014 +0100
Removed the ASM patches (ASM 5 is now used)
---
debian/patches/0001_use_debian_asm3.diff | 254 -------------------------
debian/patches/0012_use_debian_asm4.patch | 299 ------------------------------
debian/patches/series | 2 -
3 files changed, 555 deletions(-)
diff --git a/debian/patches/0001_use_debian_asm3.diff b/debian/patches/0001_use_debian_asm3.diff
deleted file mode 100644
index b453755..0000000
--- a/debian/patches/0001_use_debian_asm3.diff
+++ /dev/null
@@ -1,254 +0,0 @@
-Description: Use ASM 3.x debian package instead of CGLIB-nodep:
- - change imports to org.objectweb.*
- - small fix to API usage
- - disable build of org.springframework.asm module
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-08-20
-Forwarded: no
---- a/projects/build-spring-framework/build.xml
-+++ b/projects/build-spring-framework/build.xml
-@@ -25,7 +25,6 @@
-
- <path id="bundles">
- <pathelement location="../org.springframework.spring-parent"/>
-- <pathelement location="../org.springframework.asm"/>
- <path refid="unit.test.bundles" />
- <pathelement location="../org.springframework.integration-tests"/>
- <pathelement location="../org.springframework.spring-library"/>
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
-@@ -28,12 +28,12 @@
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
-
--import org.springframework.asm.ClassReader;
--import org.springframework.asm.Label;
--import org.springframework.asm.MethodVisitor;
--import org.springframework.asm.Opcodes;
--import org.springframework.asm.Type;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.util.ClassUtils;
-
- /**
-@@ -111,7 +111,7 @@
- try {
- ClassReader classReader = new ClassReader(is);
- Map<Member, String[]> map = new ConcurrentHashMap<Member, String[]>();
-- classReader.accept(new ParameterNameDiscoveringVisitor(clazz, map), false);
-+ classReader.accept(new ParameterNameDiscoveringVisitor(clazz, map), 0);
- return map;
- }
- catch (IOException ex) {
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
-@@ -16,13 +16,13 @@
-
- package org.springframework.core.type.classreading;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.Attribute;
--import org.springframework.asm.ClassVisitor;
--import org.springframework.asm.FieldVisitor;
--import org.springframework.asm.MethodVisitor;
--import org.springframework.asm.Opcodes;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.Attribute;
-+import org.objectweb.asm.ClassVisitor;
-+import org.objectweb.asm.FieldVisitor;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.core.type.ClassMetadata;
- import org.springframework.util.ClassUtils;
-
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
-@@ -25,9 +25,9 @@
- import java.util.Map;
- import java.util.Set;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.Type;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.core.annotation.AnnotationUtils;
- import org.springframework.util.ObjectUtils;
- import org.springframework.util.ReflectionUtils;
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitor.java
-@@ -23,9 +23,9 @@
- import java.util.Map;
- import java.util.Set;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.MethodVisitor;
--import org.springframework.asm.Type;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.MethodVisitor;
-+import org.objectweb.asm.Type;
- import org.springframework.core.type.AnnotationMetadata;
- import org.springframework.core.type.MethodMetadata;
- import org.springframework.util.CollectionUtils;
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
-@@ -19,11 +19,11 @@
- import java.util.LinkedHashMap;
- import java.util.Map;
-
--import org.springframework.asm.AnnotationVisitor;
--import org.springframework.asm.MethodAdapter;
--import org.springframework.asm.Opcodes;
--import org.springframework.asm.Type;
--import org.springframework.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.AnnotationVisitor;
-+import org.objectweb.asm.MethodAdapter;
-+import org.objectweb.asm.Opcodes;
-+import org.objectweb.asm.Type;
-+import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.core.type.MethodMetadata;
- import org.springframework.util.MultiValueMap;
-
-@@ -95,4 +95,4 @@
- public String getDeclaringClassName() {
- return this.declaringClassName;
- }
--}
-\ No newline at end of file
-+}
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/SimpleMetadataReader.java
-@@ -19,7 +19,7 @@
- import java.io.IOException;
- import java.io.InputStream;
-
--import org.springframework.asm.ClassReader;
-+import org.objectweb.asm.ClassReader;
- import org.springframework.core.io.Resource;
- import org.springframework.core.type.AnnotationMetadata;
- import org.springframework.core.type.ClassMetadata;
-@@ -51,7 +51,7 @@
- }
-
- AnnotationMetadataReadingVisitor visitor = new AnnotationMetadataReadingVisitor(classLoader);
-- classReader.accept(visitor, true);
-+ classReader.accept(visitor, ClassReader.SKIP_DEBUG);
-
- this.annotationMetadata = visitor;
- // (since AnnotationMetadataReader extends ClassMetadataReadingVisitor)
-@@ -70,4 +70,4 @@
- public AnnotationMetadata getAnnotationMetadata() {
- return this.annotationMetadata;
- }
--}
-\ No newline at end of file
-+}
---- a/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
-+++ b/projects/org.springframework.context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
-@@ -20,7 +20,7 @@
- import java.util.Iterator;
- import java.util.Map;
-
--import net.sf.cglib.asm.Type;
-+import org.objectweb.asm.Type;
- import net.sf.cglib.core.Signature;
- import net.sf.cglib.proxy.InterfaceMaker;
- import org.apache.commons.logging.Log;
---- a/projects/org.springframework.aop/ivy.xml
-+++ b/projects/org.springframework.aop/ivy.xml
-@@ -38,7 +38,7 @@
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.beans/ivy.xml
-+++ b/projects/org.springframework.beans/ivy.xml
-@@ -32,7 +32,7 @@
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
-+ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
- </dependencies>
-
- </ivy-module>
---- a/projects/org.springframework.context/ivy.xml
-+++ b/projects/org.springframework.context/ivy.xml
-@@ -51,7 +51,7 @@
- <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.1.0.GA" conf="optional->compile"/>
- <dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/>
- <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, jruby->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.core/ivy.xml
-+++ b/projects/org.springframework.core/ivy.xml
-@@ -28,7 +28,7 @@
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
-+ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>-->
- <!-- test dependencies -->
- <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
---- a/projects/org.springframework.integration-tests/ivy.xml
-+++ b/projects/org.springframework.integration-tests/ivy.xml
-@@ -75,7 +75,7 @@
- <dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
- <dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
- <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->compile"/>
---- a/projects/org.springframework.spring-library/ivy.xml
-+++ b/projects/org.springframework.spring-library/ivy.xml
-@@ -21,7 +21,7 @@
-
- <dependencies>
- <dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>-->
- <dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="compile->compile"/>
---- a/projects/org.springframework.web.portlet/ivy.xml
-+++ b/projects/org.springframework.web.portlet/ivy.xml
-@@ -35,7 +35,7 @@
- <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
-+ <!--<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>-->
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
- </dependencies>
---- a/projects/org.springframework.web.servlet/ivy.xml
-+++ b/projects/org.springframework.web.servlet/ivy.xml
-@@ -84,8 +84,8 @@
- <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0"
- conf="test->compile"/>
-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration"
-- conf="test->compile"/>
-+<!-- <dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration"
-+ conf="test->compile"/>-->
- <dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0"
- conf="test->compile"/>
- <dependency org="org.dom4j" name="com.springsource.org.dom4j" rev="1.6.1" conf="test->compile"/>
diff --git a/debian/patches/0012_use_debian_asm4.patch b/debian/patches/0012_use_debian_asm4.patch
deleted file mode 100644
index 6f1cf0a..0000000
--- a/debian/patches/0012_use_debian_asm4.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-Description: Upgrade from ASM 3 to ASM 4. This patch can be dropped after upgrading to Spring 3.2 or later
-Origin: backport, https://github.com/spring-projects/spring-framework/commit/c16f18a5
-Bug: https://jira.spring.io/browse/SPR-9669
---- /dev/null
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/asm/SpringAsmInfo.java
-@@ -0,0 +1,38 @@
-+/*
-+ * Copyright 2002-2012 the original author or authors.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package org.springframework.asm;
-+
-+/**
-+ * Utility class exposing constants related to Spring's internal repackaging of the ASM
-+ * bytecode manipulation library.
-+ *
-+ * <p>See <a href="package-summary.html">package-level Javadoc</a> for more
-+ * information on {@code org.springframework.asm}.
-+ *
-+ * @author Chris Beams
-+ * @since 3.2
-+ */
-+public final class SpringAsmInfo {
-+
-+ /**
-+ * The ASM version used internally throughout the framework.
-+ *
-+ * @see Opcodes#ASM4
-+ */
-+ public static final int ASM_VERSION = org.objectweb.asm.Opcodes.ASM4;
-+
-+}
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/LocalVariableTableParameterNameDiscoverer.java
-@@ -29,11 +29,12 @@
- import org.apache.commons.logging.LogFactory;
-
- import org.objectweb.asm.ClassReader;
-+import org.objectweb.asm.ClassVisitor;
- import org.objectweb.asm.Label;
- import org.objectweb.asm.MethodVisitor;
- import org.objectweb.asm.Opcodes;
- import org.objectweb.asm.Type;
--import org.objectweb.asm.commons.EmptyVisitor;
-+import org.springframework.asm.SpringAsmInfo;
- import org.springframework.util.ClassUtils;
-
- /**
-@@ -78,7 +79,7 @@
- }
-
- @SuppressWarnings("unchecked")
-- public String[] getParameterNames(Constructor ctor) {
-+ public String[] getParameterNames(Constructor<?> ctor) {
- Class<?> declaringClass = ctor.getDeclaringClass();
- Map<Member, String[]> map = this.parameterNamesCache.get(declaringClass);
- if (map == null) {
-@@ -136,7 +137,7 @@
- * Helper class that inspects all methods (constructor included) and then
- * attempts to find the parameter names for that member.
- */
-- private static class ParameterNameDiscoveringVisitor extends EmptyVisitor {
-+ private static class ParameterNameDiscoveringVisitor extends ClassVisitor {
-
- private static final String STATIC_CLASS_INIT = "<clinit>";
-
-@@ -144,6 +145,7 @@
- private final Map<Member, String[]> memberMap;
-
- public ParameterNameDiscoveringVisitor(Class<?> clazz, Map<Member, String[]> memberMap) {
-+ super(SpringAsmInfo.ASM_VERSION);
- this.clazz = clazz;
- this.memberMap = memberMap;
- }
-@@ -167,7 +169,7 @@
- }
-
-
-- private static class LocalVariableTableVisitor extends EmptyVisitor {
-+ private static class LocalVariableTableVisitor extends MethodVisitor {
-
- private static final String CONSTRUCTOR = "<init>";
-
-@@ -188,6 +190,7 @@
-
- public LocalVariableTableVisitor(Class<?> clazz, Map<Member, String[]> map, String name, String desc,
- boolean isStatic) {
-+ super(SpringAsmInfo.ASM_VERSION);
- this.clazz = clazz;
- this.memberMap = map;
- this.name = name;
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/ParameterNameDiscoverer.java
-@@ -49,6 +49,6 @@
- * @return an array of parameter names if the names can be resolved,
- * or <code>null</code> if they cannot
- */
-- String[] getParameterNames(Constructor ctor);
-+ String[] getParameterNames(Constructor<?> ctor);
-
- }
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
-@@ -27,7 +27,6 @@
-
- import org.objectweb.asm.AnnotationVisitor;
- import org.objectweb.asm.Type;
--import org.objectweb.asm.commons.EmptyVisitor;
- import org.springframework.core.annotation.AnnotationUtils;
- import org.springframework.util.ObjectUtils;
- import org.springframework.util.ReflectionUtils;
-@@ -38,7 +37,7 @@
- * @author Juergen Hoeller
- * @since 3.0
- */
--final class AnnotationAttributesReadingVisitor implements AnnotationVisitor {
-+final class AnnotationAttributesReadingVisitor extends AnnotationVisitor {
-
- private final String annotationType;
-
-@@ -54,7 +53,7 @@
- public AnnotationAttributesReadingVisitor(
- String annotationType, Map<String, Map<String, Object>> attributesMap,
- Map<String, Set<String>> metaAnnotationMap, ClassLoader classLoader) {
--
-+ super(org.springframework.asm.SpringAsmInfo.ASM_VERSION);
- this.annotationType = annotationType;
- this.attributesMap = attributesMap;
- this.metaAnnotationMap = metaAnnotationMap;
-@@ -82,11 +81,11 @@
- }
-
- public AnnotationVisitor visitAnnotation(String name, String desc) {
-- return new EmptyVisitor();
-+ return new EmptyAnnotationVisitor();
- }
-
- public AnnotationVisitor visitArray(final String attrName) {
-- return new AnnotationVisitor() {
-+ return new AnnotationVisitor(org.springframework.asm.SpringAsmInfo.ASM_VERSION) {
- public void visit(String name, Object value) {
- Object newValue = value;
- Object existingValue = localAttributes.get(attrName);
-@@ -103,10 +102,10 @@
- public void visitEnum(String name, String desc, String value) {
- }
- public AnnotationVisitor visitAnnotation(String name, String desc) {
-- return new EmptyVisitor();
-+ return new EmptyAnnotationVisitor();
- }
- public AnnotationVisitor visitArray(String name) {
-- return new EmptyVisitor();
-+ return new EmptyAnnotationVisitor();
- }
- public void visitEnd() {
- }
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/ClassMetadataReadingVisitor.java
-@@ -22,7 +22,7 @@
- import org.objectweb.asm.FieldVisitor;
- import org.objectweb.asm.MethodVisitor;
- import org.objectweb.asm.Opcodes;
--import org.objectweb.asm.commons.EmptyVisitor;
-+import org.springframework.asm.SpringAsmInfo;
- import org.springframework.core.type.ClassMetadata;
- import org.springframework.util.ClassUtils;
-
-@@ -35,9 +35,10 @@
- * @author Costin Leau
- * @author Mark Fisher
- * @author Ramnivas Laddad
-+ * @author Chris Beams
- * @since 2.5
- */
--class ClassMetadataReadingVisitor implements ClassVisitor, ClassMetadata {
-+class ClassMetadataReadingVisitor extends ClassVisitor implements ClassMetadata {
-
- private String className;
-
-@@ -56,6 +57,11 @@
- private String[] interfaces;
-
-
-+ public ClassMetadataReadingVisitor() {
-+ super(SpringAsmInfo.ASM_VERSION);
-+ }
-+
-+
- public void visit(int version, int access, String name, String signature, String supername, String[] interfaces) {
- this.className = ClassUtils.convertResourcePathToClassName(name);
- this.isInterface = ((access & Opcodes.ACC_INTERFACE) != 0);
-@@ -87,7 +93,7 @@
-
- public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
- // no-op
-- return new EmptyVisitor();
-+ return new EmptyAnnotationVisitor();
- }
-
- public void visitAttribute(Attribute attr) {
-@@ -96,12 +102,12 @@
-
- public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
- // no-op
-- return new EmptyVisitor();
-+ return new EmptyFieldVisitor();
- }
-
- public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
- // no-op
-- return new EmptyVisitor();
-+ return new EmptyMethodVisitor();
- }
-
- public void visitEnd() {
-@@ -154,3 +160,38 @@
- }
-
- }
-+
-+
-+class EmptyAnnotationVisitor extends AnnotationVisitor {
-+
-+ public EmptyAnnotationVisitor() {
-+ super(SpringAsmInfo.ASM_VERSION);
-+ }
-+
-+ @Override
-+ public AnnotationVisitor visitAnnotation(String name, String desc) {
-+ return this;
-+ }
-+
-+ @Override
-+ public AnnotationVisitor visitArray(String name) {
-+ return this;
-+ }
-+}
-+
-+
-+class EmptyMethodVisitor extends MethodVisitor {
-+
-+ public EmptyMethodVisitor() {
-+ super(SpringAsmInfo.ASM_VERSION);
-+ }
-+}
-+
-+
-+class EmptyFieldVisitor extends FieldVisitor {
-+
-+ public EmptyFieldVisitor() {
-+ super(SpringAsmInfo.ASM_VERSION);
-+ }
-+
-+}
---- a/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
-+++ b/projects/org.springframework.core/src/main/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitor.java
-@@ -20,10 +20,10 @@
- import java.util.Map;
-
- import org.objectweb.asm.AnnotationVisitor;
--import org.objectweb.asm.MethodAdapter;
-+import org.objectweb.asm.MethodVisitor;
- import org.objectweb.asm.Opcodes;
- import org.objectweb.asm.Type;
--import org.objectweb.asm.commons.EmptyVisitor;
-+import org.springframework.asm.SpringAsmInfo;
- import org.springframework.core.type.MethodMetadata;
- import org.springframework.util.MultiValueMap;
-
-@@ -37,7 +37,7 @@
- * @author Costin Leau
- * @since 3.0
- */
--final class MethodMetadataReadingVisitor extends MethodAdapter implements MethodMetadata {
-+final class MethodMetadataReadingVisitor extends MethodVisitor implements MethodMetadata {
-
- private final String name;
-
-@@ -53,7 +53,7 @@
-
- public MethodMetadataReadingVisitor(String name, int access, String declaringClassName, ClassLoader classLoader,
- MultiValueMap<String, MethodMetadata> methodMetadataMap) {
-- super(new EmptyVisitor());
-+ super(SpringAsmInfo.ASM_VERSION);
- this.name = name;
- this.access = access;
- this.declaringClassName = declaringClassName;
diff --git a/debian/patches/series b/debian/patches/series
index 8997c92..240f0e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001_use_debian_asm3.diff
0002_ivy_dependencies.diff
0003_no_ibm_websphere.diff
0005_commonj.diff
@@ -7,4 +6,3 @@
0008_jpa_20_api.diff
0009_hibernate_validator_41.diff
0010_velocity_17.diff
-0012_use_debian_asm4.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git
More information about the pkg-java-commits
mailing list