[jboss-svn-commits] JBL Code SVN: r25422 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 25 15:29:20 EST 2009
Author: tirelli
Date: 2009-02-25 15:29:20 -0500 (Wed, 25 Feb 2009)
New Revision: 25422
Removed:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/asm/
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/ClassBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/asm/ClassFieldInspector.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/asm/MethodComparator.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/asm/MethodComparerTest.java
Log:
Removing ASM classes from Drools. Using ASM that is inlined in MVEL.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel 2009-02-25 14:54:36 UTC (rev 25421)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel 2009-02-25 20:29:20 UTC (rev 25422)
@@ -18,9 +18,9 @@
throw new org.drools.RuntimeDroolsException("Unable getResourceAsStream for Class '@{ruleClassName}' ");
}
- org.drools.asm.ClassReader classReader = new org.drools.asm.ClassReader( bos.toByteArray() );
- classReader.accept( visit, true );
- org.drools.asm.util.TraceMethodVisitor trace = visit.getTrace();
+ org.mvel2.asm.ClassReader classReader = new org.mvel2.asm.ClassReader( bos.toByteArray() );
+ classReader.accept( visit, org.mvel2.asm.ClassReader.SKIP_DEBUG );
+ org.mvel2.asm.util.TraceMethodVisitor trace = visit.getTrace();
return trace.getText();
}
@end{}
@@ -181,8 +181,8 @@
@declare{"accumulateInvoker"}
package @{package};
-import org.drools.asm.ClassReader;
-import org.drools.asm.util.TraceMethodVisitor;
+import org.mvel2.asm.ClassReader;
+import org.mvel2.asm.util.TraceMethodVisitor;
import org.drools.util.asm.MethodComparator.Tracer;
import java.util.Collections;
public class @{invokerClassName} implements org.drools.spi.Accumulator, org.drools.spi.CompiledInvoker
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorFactory.java 2009-02-25 14:54:36 UTC (rev 25421)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorFactory.java 2009-02-25 20:29:20 UTC (rev 25422)
@@ -23,11 +23,6 @@
import java.util.Map;
import org.drools.RuntimeDroolsException;
-import org.drools.asm.ClassWriter;
-import org.drools.asm.Label;
-import org.drools.asm.MethodVisitor;
-import org.drools.asm.Opcodes;
-import org.drools.asm.Type;
import org.drools.base.ClassFieldAccessorCache.ByteArrayClassLoader;
import org.drools.base.ClassFieldAccessorCache.CacheEntry;
import org.drools.base.extractors.BaseBooleanClassFieldReader;
@@ -52,6 +47,11 @@
import org.drools.base.extractors.SelfReferenceClassFieldReader;
import org.drools.common.InternalWorkingMemory;
import org.drools.util.asm.ClassFieldInspector;
+import org.mvel2.asm.ClassWriter;
+import org.mvel2.asm.Label;
+import org.mvel2.asm.MethodVisitor;
+import org.mvel2.asm.Opcodes;
+import org.mvel2.asm.Type;
/**
* This generates subclasses of BaseClassFieldExtractor to provide field extractors.
@@ -205,7 +205,7 @@
final Class< ? > fieldType,
final boolean isInterface) throws Exception {
- final ClassWriter cw = new ClassWriter( true );
+ final ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS );
final Class< ? > superClass = getReaderSuperClassFor( fieldType );
buildClassHeader( superClass,
@@ -237,7 +237,7 @@
final Class< ? > fieldType,
final boolean isInterface) throws Exception {
- final ClassWriter cw = new ClassWriter( true );
+ final ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS );
final Class< ? > superClass = getWriterSuperClassFor( fieldType );
buildClassHeader( superClass,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/ClassBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/ClassBuilder.java 2009-02-25 14:54:36 UTC (rev 25421)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/ClassBuilder.java 2009-02-25 20:29:20 UTC (rev 25422)
@@ -20,12 +20,12 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
-import org.drools.asm.ClassWriter;
-import org.drools.asm.FieldVisitor;
-import org.drools.asm.Label;
-import org.drools.asm.MethodVisitor;
-import org.drools.asm.Opcodes;
-import org.drools.asm.Type;
+import org.mvel2.asm.ClassWriter;
+import org.mvel2.asm.FieldVisitor;
+import org.mvel2.asm.Label;
+import org.mvel2.asm.MethodVisitor;
+import org.mvel2.asm.Opcodes;
+import org.mvel2.asm.Type;
/**
* A builder to dynamically build simple Javabean(TM) classes
@@ -139,7 +139,7 @@
InstantiationException,
NoSuchFieldException {
- ClassWriter cw = new ClassWriter( true );
+ ClassWriter cw = new ClassWriter( ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS );
this.buildClassHeader( cw,
classDef );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/asm/ClassFieldInspector.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/asm/ClassFieldInspector.java 2009-02-25 14:54:36 UTC (rev 25421)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/asm/ClassFieldInspector.java 2009-02-25 20:29:20 UTC (rev 25422)
@@ -27,14 +27,14 @@
import java.util.Set;
import org.drools.RuntimeDroolsException;
-import org.drools.asm.AnnotationVisitor;
-import org.drools.asm.Attribute;
-import org.drools.asm.ClassReader;
-import org.drools.asm.ClassVisitor;
-import org.drools.asm.FieldVisitor;
-import org.drools.asm.MethodVisitor;
-import org.drools.asm.Opcodes;
-import org.drools.asm.Type;
+import org.mvel2.asm.AnnotationVisitor;
+import org.mvel2.asm.Attribute;
+import org.mvel2.asm.ClassReader;
+import org.mvel2.asm.ClassVisitor;
+import org.mvel2.asm.FieldVisitor;
+import org.mvel2.asm.MethodVisitor;
+import org.mvel2.asm.Opcodes;
+import org.mvel2.asm.Type;
/**
* Visit a POJO user class, and extract the property getter methods that are public, in the
@@ -91,7 +91,7 @@
includeFinalMethods,
this );
reader.accept( visitor,
- false );
+ 0 );
if ( clazz.getSuperclass() != null ) {
final String name = getResourcePath( clazz.getSuperclass() );
final InputStream parentStream = clazz.getResourceAsStream( name );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/asm/MethodComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/asm/MethodComparator.java 2009-02-25 14:54:36 UTC (rev 25421)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/asm/MethodComparator.java 2009-02-25 20:29:20 UTC (rev 25422)
@@ -2,13 +2,13 @@
import java.util.List;
-import org.drools.asm.AnnotationVisitor;
-import org.drools.asm.Attribute;
-import org.drools.asm.ClassReader;
-import org.drools.asm.ClassVisitor;
-import org.drools.asm.FieldVisitor;
-import org.drools.asm.MethodVisitor;
-import org.drools.asm.util.TraceMethodVisitor;
+import org.mvel2.asm.AnnotationVisitor;
+import org.mvel2.asm.Attribute;
+import org.mvel2.asm.ClassReader;
+import org.mvel2.asm.ClassVisitor;
+import org.mvel2.asm.FieldVisitor;
+import org.mvel2.asm.MethodVisitor;
+import org.mvel2.asm.util.TraceMethodVisitor;
/**
* The purpose of this utility it to check if 2 method implementations are equivalent, by comparing the bytecode.
@@ -46,7 +46,7 @@
final ClassReader classReader) {
final Tracer visit = new Tracer( methodName );
classReader.accept( visit,
- true );
+ ClassReader.SKIP_DEBUG );
final TraceMethodVisitor trace = visit.getTrace();
return trace.getText();
}
@@ -60,7 +60,7 @@
final Tracer visit = new Tracer( methodName );
final ClassReader classReader = new ClassReader( bytes );
classReader.accept( visit,
- true );
+ ClassReader.SKIP_DEBUG );
final TraceMethodVisitor trace = visit.getTrace();
return trace.getText();
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/asm/MethodComparerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/asm/MethodComparerTest.java 2009-02-25 14:54:36 UTC (rev 25421)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/asm/MethodComparerTest.java 2009-02-25 20:29:20 UTC (rev 25422)
@@ -4,7 +4,7 @@
import junit.framework.TestCase;
-import org.drools.asm.ClassReader;
+import org.mvel2.asm.ClassReader;
public class MethodComparerTest extends TestCase {
More information about the jboss-svn-commits
mailing list