From 9695710180c00d9a80059bcd4e4162615065ce20 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Feb 05 2015 08:48:34 +0000 Subject: Fix patch unshading ASM --- diff --git a/0001-Unshade-ASM.patch b/0001-Unshade-ASM.patch index d9d07e5..05fbe42 100644 --- a/0001-Unshade-ASM.patch +++ b/0001-Unshade-ASM.patch @@ -1,4 +1,4 @@ -From 8d151d56250e13e5bdc21bc0df1e2f334010f268 Mon Sep 17 00:00:00 2001 +From e62e47e891b9f14c612b0176d735b2a66b0217dc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 21 Nov 2014 09:39:00 +0100 Subject: [PATCH 1/4] Unshade ASM @@ -6,13 +6,13 @@ Subject: [PATCH 1/4] Unshade ASM --- pom.xml | 23 ------------ xbean-finder/pom.xml | 5 --- - .../org/apache/xbean/finder/AbstractFinder.java | 30 ++++++++------- + .../org/apache/xbean/finder/AbstractFinder.java | 31 ++++++++-------- .../org/apache/xbean/finder/AnnotationFinder.java | 43 +++++++++++----------- xbean-reflect/pom.xml | 13 ------- .../xbean/recipe/AsmParameterNameLoader.java | 6 ++- .../org/apache/xbean/recipe/ReflectionUtil.java | 8 +--- .../xbean/recipe/XbeanAsmParameterNameLoader.java | 18 +++++---- - 8 files changed, 53 insertions(+), 93 deletions(-) + 8 files changed, 53 insertions(+), 94 deletions(-) diff --git a/pom.xml b/pom.xml index dd4d7ee..0c17645 100644 @@ -79,7 +79,7 @@ index 6048ac3..4f20b5f 100644 diff --git a/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java b/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java -index 8beb72b..164a490 100644 +index 8beb72b..3639bee 100644 --- a/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java +++ b/xbean-finder/src/main/java/org/apache/xbean/finder/AbstractFinder.java @@ -34,10 +34,10 @@ import java.util.HashMap; @@ -122,7 +122,7 @@ index 8beb72b..164a490 100644 } @Override -@@ -957,7 +959,7 @@ public abstract class AbstractFinder implements IAnnotationFinder { +@@ -957,24 +959,23 @@ public abstract class AbstractFinder implements IAnnotationFinder { ClassInfo classInfo = ((ClassInfo) info); FieldInfo fieldInfo = new FieldInfo(classInfo, name, desc); classInfo.getFields().add(fieldInfo); @@ -131,9 +131,10 @@ index 8beb72b..164a490 100644 } @Override -@@ -965,16 +967,16 @@ public abstract class AbstractFinder implements IAnnotationFinder { + public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { ClassInfo classInfo = ((ClassInfo) info); - MethodInfo methodInfo = new MethodInfo(classInfo, name, desc); +- MethodInfo methodInfo = new MethodInfo(classInfo, name, desc); ++ final MethodInfo methodInfo = new MethodInfo(classInfo, name, desc); classInfo.getMethods().add(methodInfo); - return new InfoBuildingVisitor(methodInfo).methodVisitor(); - } @@ -148,7 +149,6 @@ index 8beb72b..164a490 100644 + return new MethodVisitor(Opcodes.ASM5) { + @Override + public AnnotationVisitor visitParameterAnnotation(int param, String desc, boolean visible) { -+ MethodInfo methodInfo = ((MethodInfo) info); + List annotationInfos = methodInfo.getParameterAnnotations(param); + AnnotationInfo annotationInfo = new AnnotationInfo(desc); + annotationInfos.add(annotationInfo); @@ -397,5 +397,5 @@ index 4a89c44..6242dd3 100644 \ No newline at end of file +} -- -1.9.3 +2.1.0 diff --git a/0002-Port-to-Eclipse-Luna-OSGi.patch b/0002-Port-to-Eclipse-Luna-OSGi.patch index dcf1dd6..0f14e77 100644 --- a/0002-Port-to-Eclipse-Luna-OSGi.patch +++ b/0002-Port-to-Eclipse-Luna-OSGi.patch @@ -1,4 +1,4 @@ -From e310ab2bb5e5b34472a0fc6e368082897f140afa Mon Sep 17 00:00:00 2001 +From 82b34a42835d82896c88bf3d3c7ea5f44fb76c39 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 21 Nov 2014 10:05:05 +0100 Subject: [PATCH 2/4] Port to Eclipse Luna OSGi @@ -58,5 +58,5 @@ index f4e876d..ea353ef 100644 } -- -1.9.3 +2.1.0 diff --git a/0003-Port-to-QDox-2.0.patch b/0003-Port-to-QDox-2.0.patch index 3f30f24..791cae4 100644 --- a/0003-Port-to-QDox-2.0.patch +++ b/0003-Port-to-QDox-2.0.patch @@ -1,4 +1,4 @@ -From 0e20f1b48db827a457800c6f96bc413feeee115f Mon Sep 17 00:00:00 2001 +From a0749b244a47ca9433df9070767b13c2118244dd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 21 Nov 2014 10:51:38 +0100 Subject: [PATCH 3/4] Port to QDox 2.0 @@ -651,5 +651,5 @@ index 94bd7a1..ae55819 100644 for (Enumeration entries = jarFile.entries(); entries.hasMoreElements(); ) { JarEntry entry = (JarEntry) entries.nextElement(); -- -1.9.3 +2.1.0 diff --git a/0004-Port-to-Groovy-2.3.7.patch b/0004-Port-to-Groovy-2.3.7.patch index 79bbed1..7ea103d 100644 --- a/0004-Port-to-Groovy-2.3.7.patch +++ b/0004-Port-to-Groovy-2.3.7.patch @@ -1,4 +1,4 @@ -From dbf7384e63d75bd33a919d6dfbfb1a75630acdae Mon Sep 17 00:00:00 2001 +From 7103c99bd97f40d5282c1701b30e23fea11d8a60 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 21 Nov 2014 11:43:56 +0100 Subject: [PATCH 4/4] Port to Groovy 2.3.7 @@ -61,5 +61,5 @@ index 2ccb8eb..b7208fe 100755 out.println("================"); out.println("Version: " + version + " JVM: " + System.getProperty("java.vm.version")); -- -1.9.3 +2.1.0 diff --git a/xbean.spec b/xbean.spec index 8c6c764..9c6a906 100644 --- a/xbean.spec +++ b/xbean.spec @@ -7,7 +7,7 @@ Name: xbean Version: 4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java plugin based web server License: ASL 2.0 URL: http://geronimo.apache.org/xbean/ @@ -188,6 +188,9 @@ sed -i "s|||" xbean-blueprint/pom.xml %doc LICENSE NOTICE %changelog +* Thu Feb 5 2015 Mikolaj Izdebski - 4.1-2 +- Fix patch unshading ASM + * Fri Nov 21 2014 Mikolaj Izdebski - 4.1-1 - Update to upstream version 4.1