[jboss-svn-commits] JBL Code SVN: r12447 - in labs/jbossrules/trunk/drools-compiler: src/main/java/org/apache/commons/jci/compilers and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jun 10 21:51:59 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-06-10 21:51:59 -0400 (Sun, 10 Jun 2007)
New Revision: 12447
Removed:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/utils/ClassUtils.java
Modified:
labs/jbossrules/trunk/drools-compiler/.classpath
labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzerTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Serializable.drl
Log:
JBRULES-914 Refactor shadow facts into core
Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath 2007-06-11 01:51:48 UTC (rev 12446)
+++ labs/jbossrules/trunk/drools-compiler/.classpath 2007-06-11 01:51:59 UTC (rev 12447)
@@ -5,16 +5,16 @@
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.0/stringtemplate-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.1.v_677_R32x/core-3.2.1.v_677_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta23/mvel14-1.2beta23.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0/antlr-3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.0/stringtemplate-3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
<classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta23/mvel14-1.2beta23.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0/antlr-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.1.v_677_R32x/core-3.2.1.v_677_R32x.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java 2007-06-11 01:51:48 UTC (rev 12446)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java 2007-06-11 01:51:59 UTC (rev 12447)
@@ -28,7 +28,7 @@
import org.apache.commons.jci.problems.CompilationProblem;
import org.apache.commons.jci.readers.ResourceReader;
import org.apache.commons.jci.stores.ResourceStore;
-import org.apache.commons.jci.utils.ClassUtils;
+import org.drools.util.ClassUtils;
import org.eclipse.jdt.core.compiler.IProblem;
import org.eclipse.jdt.internal.compiler.ClassFile;
import org.eclipse.jdt.internal.compiler.CompilationResult;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java 2007-06-11 01:51:48 UTC (rev 12446)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java 2007-06-11 01:51:59 UTC (rev 12447)
@@ -29,7 +29,6 @@
import org.apache.commons.jci.problems.CompilationProblem;
import org.apache.commons.jci.readers.ResourceReader;
import org.apache.commons.jci.stores.ResourceStore;
-import org.apache.commons.jci.utils.ClassUtils;
import org.codehaus.janino.ClassLoaderIClassLoader;
import org.codehaus.janino.CompileException;
import org.codehaus.janino.DebuggingInformation;
@@ -45,6 +44,7 @@
import org.codehaus.janino.Scanner.LocatedException;
import org.codehaus.janino.UnitCompiler.ErrorHandler;
import org.codehaus.janino.util.ClassFile;
+import org.drools.util.ClassUtils;
/**
* @author art at gramlich-net.com
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java 2007-06-11 01:51:48 UTC (rev 12446)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/compilers/JavaCompilerFactory.java 2007-06-11 01:51:59 UTC (rev 12447)
@@ -19,7 +19,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.jci.utils.ClassUtils;
+import org.drools.util.ClassUtils;
public final class JavaCompilerFactory {
Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/utils/ClassUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/utils/ClassUtils.java 2007-06-11 01:51:48 UTC (rev 12446)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/apache/commons/jci/utils/ClassUtils.java 2007-06-11 01:51:59 UTC (rev 12447)
@@ -1,62 +0,0 @@
-package org.apache.commons.jci.utils;
-
-import java.io.File;
-
-public final class ClassUtils {
-
- /**
- * Please do not use - internal
- * org/my/Class.xxx -> org.my.Class
- */
- public static String convertResourceToClassName(final String pResourceName) {
- return ClassUtils.stripExtension( pResourceName ).replace( '/',
- '.' );
- }
-
- /**
- * Please do not use - internal
- * org.my.Class -> org/my/Class.class
- */
- public static String convertClassToResourcePath(final String pName) {
- return pName.replace( '.',
- '/' ) + ".class";
- }
-
- /**
- * Please do not use - internal
- * org/my/Class.xxx -> org/my/Class
- */
- public static String stripExtension(final String pResourceName) {
- final int i = pResourceName.lastIndexOf( '.' );
- final String withoutExtension = pResourceName.substring( 0,
- i );
- return withoutExtension;
- }
-
- public static String toJavaCasing(final String pName) {
- final char[] name = pName.toLowerCase().toCharArray();
- name[0] = Character.toUpperCase( name[0] );
- return new String( name );
- }
-
- public static String clazzName(final File base,
- final File file) {
- final int rootLength = base.getAbsolutePath().length();
- final String absFileName = file.getAbsolutePath();
- final int p = absFileName.lastIndexOf( '.' );
- final String relFileName = absFileName.substring( rootLength + 1,
- p );
- final String clazzName = relFileName.replace( File.separatorChar,
- '.' );
- return clazzName;
- }
-
- public static String relative(final File base,
- final File file) {
- final int rootLength = base.getAbsolutePath().length();
- final String absFileName = file.getAbsolutePath();
- final String relFileName = absFileName.substring( rootLength + 1 );
- return relFileName;
- }
-
-}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java 2007-06-11 01:51:48 UTC (rev 12446)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java 2007-06-11 01:51:59 UTC (rev 12447)
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.jci.utils.ClassUtils;
import org.drools.RuntimeDroolsException;
import org.drools.base.ClassObjectType;
import org.drools.base.FieldFactory;
@@ -66,6 +65,7 @@
import org.drools.spi.FieldValue;
import org.drools.spi.ObjectType;
import org.drools.spi.Restriction;
+import org.drools.util.ClassUtils;
/**
* A builder for patterns
@@ -109,23 +109,7 @@
} else {
try {
final Class userProvidedClass = context.getDialect().getTypeResolver().resolveType( patternDescr.getObjectType() );
- final String shadowProxyName = ShadowProxyFactory.getProxyClassNameForClass( userProvidedClass );
- Class shadowClass = null;
- try {
- // if already loaded
- shadowClass = context.getPkg().getPackageCompilationData().getClassLoader().loadClass( shadowProxyName );
- } catch ( final ClassNotFoundException cnfe ) {
- // otherwise, create and load
- final byte[] proxyBytes = ShadowProxyFactory.getProxyBytes( userProvidedClass );
- if ( proxyBytes != null ) {
- context.getPkg().getPackageCompilationData().write( ClassUtils.convertClassToResourcePath( shadowProxyName ),
- proxyBytes );
- shadowClass = context.getPkg().getPackageCompilationData().getClassLoader().loadClass( shadowProxyName );
- }
-
- }
- objectType = new ClassObjectType( userProvidedClass,
- shadowClass );
+ objectType = new ClassObjectType( userProvidedClass );
} catch ( final ClassNotFoundException e ) {
context.getErrors().add( new RuleError( context.getRule(),
patternDescr,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzerTest.java 2007-06-11 01:51:48 UTC (rev 12446)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzerTest.java 2007-06-11 01:51:59 UTC (rev 12447)
@@ -19,6 +19,10 @@
protected void tearDown() throws Exception {
super.tearDown();
}
+
+ public void testDummy() {
+ // Added this so test does prooduce warning in eclipse
+ }
public void FIXME_testGetExpressionIdentifiers() {
try {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Serializable.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Serializable.drl 2007-06-11 01:51:48 UTC (rev 12446)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_Serializable.drl 2007-06-11 01:51:59 UTC (rev 12447)
@@ -22,7 +22,7 @@
Cheesery( cheeses contains $person )
Person( age < ( $age1 ) )
Person( $age2 : age -> ( $age1 == $age2 ) )
- eval( $age1 == $age2 )
+ eval( $age1 == $age2 )
then
list.add( $person );
$person.setStatus("match Person ok");
More information about the jboss-svn-commits
mailing list