[pkg-java] r18260 - in trunk/mvel/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-07-16 15:44:54 +0000 (Wed, 16 Jul 2014)
New Revision: 18260

Modified:
   trunk/mvel/debian/changelog
   trunk/mvel/debian/patches/use_system_asm.diff
Log:
Fixed the OptimizerFactory class and the unit tests to work with the system version of ASM



Modified: trunk/mvel/debian/changelog
===================================================================
--- trunk/mvel/debian/changelog	2014-07-16 13:24:24 UTC (rev 18259)
+++ trunk/mvel/debian/changelog	2014-07-16 15:44:54 UTC (rev 18260)
@@ -2,9 +2,11 @@
 
   * Team upload.
   * Fixed a compilation error with Java 8
+  * Fixed the OptimizerFactory class and the unit tests to work
+    with the system version of ASM
   * debian/watch: Updated to watch the release tags on Github
 
- -- Emmanuel Bourg <ebourg at apache.org>  Wed, 14 May 2014 00:45:07 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 16 Jul 2014 17:43:57 +0200
 
 mvel (2.0.18-3) unstable; urgency=low
 

Modified: trunk/mvel/debian/patches/use_system_asm.diff
===================================================================
--- trunk/mvel/debian/patches/use_system_asm.diff	2014-07-16 13:24:24 UTC (rev 18259)
+++ trunk/mvel/debian/patches/use_system_asm.diff	2014-07-16 15:44:54 UTC (rev 18260)
@@ -44,3 +44,48 @@
  import org.mvel2.integration.VariableResolverFactory;
  
  /**
+--- a/src/test/java/org/mvel2/tests/core/res/SampleBeanAccessor.java
++++ b/src/test/java/org/mvel2/tests/core/res/SampleBeanAccessor.java
+@@ -1,8 +1,8 @@
+ package org.mvel2.tests.core.res;
+ 
+-import org.mvel2.asm.MethodVisitor;
+-import static org.mvel2.asm.Opcodes.CHECKCAST;
+-import static org.mvel2.asm.Opcodes.INVOKEVIRTUAL;
++import org.objectweb.asm.MethodVisitor;
++import static org.objectweb.asm.Opcodes.CHECKCAST;
++import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+ import org.mvel2.integration.PropertyHandler;
+ import org.mvel2.integration.VariableResolverFactory;
+ import org.mvel2.optimizers.impl.asm.ProducesBytecode;
+--- a/src/test/java/org/mvel2/tests/core/PropertyHandlerTests.java
++++ b/src/test/java/org/mvel2/tests/core/PropertyHandlerTests.java
+@@ -3,8 +3,8 @@
+ import junit.framework.TestCase;
+ import org.mvel2.MVEL;
+ import org.mvel2.PropertyAccessor;
+-import org.mvel2.asm.MethodVisitor;
+-import static org.mvel2.asm.Opcodes.*;
++import org.objectweb.asm.MethodVisitor;
++import static org.objectweb.asm.Opcodes.*;
+ import org.mvel2.integration.*;
+ import org.mvel2.optimizers.OptimizerFactory;
+ import org.mvel2.optimizers.impl.asm.ProducesBytecode;
+@@ -387,4 +387,4 @@
+ 
+         assertEquals("foobie", wo.getFieldValue("foo"));
+     }
+-}
+\ No newline at end of file
++}
+--- a/src/main/java/org/mvel2/optimizers/OptimizerFactory.java
++++ b/src/main/java/org/mvel2/optimizers/OptimizerFactory.java
+@@ -44,7 +44,7 @@
+          * By default, activate the JIT if ASM is present in the classpath
+          */
+         try {
+-            currentThread().getContextClassLoader().loadClass("org.mvel2.asm.ClassWriter");
++            currentThread().getContextClassLoader().loadClass("org.objectweb.asm.ClassWriter");
+             accessorCompilers.put("ASM", new ASMAccessorOptimizer());
+         }
+