[jboss-svn-commits] JBL Code SVN: r14795 - in labs/jbossrules/trunk: drools-ant and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Sep 1 21:22:07 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-09-01 21:22:07 -0400 (Sat, 01 Sep 2007)
New Revision: 14795
Added:
labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc6/
labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.jar
labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.pom
Removed:
labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc4rv913/
Modified:
labs/jbossrules/trunk/drools-ant/.classpath
labs/jbossrules/trunk/drools-compiler/.classpath
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_mvel.drl
labs/jbossrules/trunk/drools-core/.classpath
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectInputStream.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
labs/jbossrules/trunk/drools-decisiontables/.classpath
labs/jbossrules/trunk/drools-jbrms/.classpath
labs/jbossrules/trunk/drools-jbrms/.project
labs/jbossrules/trunk/drools-jsr94/.classpath
labs/jbossrules/trunk/drools-jsr94/.project
labs/jbossrules/trunk/pom.xml
Log:
updated to mvel14-1.2rc6.jar
Modified: labs/jbossrules/trunk/drools-ant/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-ant/.classpath 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-ant/.classpath 2007-09-02 01:22:07 UTC (rev 14795)
@@ -4,17 +4,17 @@
<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/org/mvel/mvel14/1.2rc4rv913/mvel14-1.2rc4rv913.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.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/mvel/mvel14/1.2rc6/mvel14-1.2rc6.jar"/>
<classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.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/janino/janino/2.5.7/janino-2.5.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
<classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/.classpath 2007-09-02 01:22:07 UTC (rev 14795)
@@ -5,14 +5,14 @@
<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/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.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/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.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.2rc6/mvel14-1.2rc6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-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/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc4rv913/mvel14-1.2rc4rv913.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.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/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="src" path="/drools-core"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -266,20 +266,31 @@
addFactTemplate( (FactTemplateDescr) it.next() );
}
- // add static imports for all functions
- for ( final Iterator it = packageDescr.getFunctions().iterator(); it.hasNext(); ) {
- FunctionDescr functionDescr = (FunctionDescr) it.next();
- final String functionClassName = this.pkg.getName() + "." + ucFirst( functionDescr.getName() );
- functionDescr.setClassName( functionClassName );
- this.pkg.addStaticImport( functionClassName + "." + functionDescr.getName() );
+ if ( !packageDescr.getFunctions().isEmpty() ) {
+ // add static imports for all functions
+ for ( final Iterator it = packageDescr.getFunctions().iterator(); it.hasNext(); ) {
+ FunctionDescr functionDescr = (FunctionDescr) it.next();
+ final String functionClassName = this.pkg.getName() + "." + ucFirst( functionDescr.getName() );
+ functionDescr.setClassName( functionClassName );
+ this.pkg.addStaticImport( functionClassName + "." + functionDescr.getName() );
+ }
+
+ // iterate and compile
+ for ( final Iterator it = packageDescr.getFunctions().iterator(); it.hasNext(); ) {
+ addFunction( (FunctionDescr) it.next() );
+ }
+
+ // We need to compile all the functions, so scripting languages like mvel can find them
+ this.configuration.getDialectRegistry().compileAll();
+
+ for ( final Iterator it = packageDescr.getFunctions().iterator(); it.hasNext(); ) {
+ FunctionDescr functionDescr = (FunctionDescr) it.next();
+ final String functionClassName = this.pkg.getName() + "." + ucFirst( functionDescr.getName() );
+ this.configuration.getDialectRegistry().addStaticImport(functionClassName + "." + functionDescr.getName());
+ }
}
// iterate and compile
- for ( final Iterator it = packageDescr.getFunctions().iterator(); it.hasNext(); ) {
- addFunction( (FunctionDescr) it.next() );
- }
-
- // iterate and compile
for ( final Iterator it = packageDescr.getRules().iterator(); it.hasNext(); ) {
addRule( (RuleDescr) it.next() );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -77,7 +77,6 @@
final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
sourcePattern.getOuterDeclarations(),
context.getPkg().getGlobals() );
- factory.setNextFactory( dialect.getStaticMethodImportResolverFactory() );
Accumulator accumulator = null;
Declaration[] declarations = null;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -79,9 +79,7 @@
final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
null,
context.getPkg().getGlobals(),
- analysis.getBoundIdentifiers() );
-
- factory.setNextFactory( dialect.getStaticMethodImportResolverFactory() );
+ analysis.getBoundIdentifiers() );
context.getRule().setConsequence( new MVELConsequence( expr,
factory ) );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -66,6 +66,7 @@
import org.mvel.integration.impl.ClassImportResolverFactory;
import org.mvel.integration.impl.StaticMethodImportResolverFactory;
import org.mvel.optimizers.OptimizerFactory;
+import org.mvel.util.MethodStub;
import org.mvel.util.ParseTools;
public class MVELDialect
@@ -107,8 +108,6 @@
private Map imports;
private Map packageImports;
- private StaticMethodImportResolverFactory staticImportFactory;
-// private ClassImportResolverFactory importFactory;
private boolean strictMode;
@@ -150,11 +149,8 @@
this.interceptors.put( "Modify",
new ModifyInterceptor() );
-// this.importFactory = new ClassImportResolverFactory();
this.imports = new HashMap();
this.packageImports = new HashMap();
- this.staticImportFactory = new StaticMethodImportResolverFactory();
-// this.importFactory.setNextFactory( this.staticImportFactory );
}
public void initBuilder() {
@@ -269,16 +265,13 @@
int index = staticImportEntry.lastIndexOf( '.' );
String className = staticImportEntry.substring( 0,
index );
- String methodName = staticImportEntry.substring( 0,
- index + 1 );
+ String methodName = staticImportEntry.substring( index + 1 );
try {
- Class cls = this.configuration.getPackageBuilderConfiguration().getClassLoader().loadClass( className );
+ Class cls = this.pkg.getPackageCompilationData().getClassLoader().loadClass( className );
Method[] methods = cls.getDeclaredMethods();
for ( int i = 0; i < methods.length; i++ ) {
- if ( methods[i].equals( "methodName" ) ) {
- this.staticImportFactory.createVariable( methodName,
- methods[i] );
+ if ( methods[i].getName().equals( methodName ) ) {
this.imports.put( methodName, methods[i] );
break;
}
@@ -288,14 +281,6 @@
}
}
- public StaticMethodImportResolverFactory getStaticMethodImportResolverFactory() {
- return this.staticImportFactory;
- }
-
-// public ClassImportResolverFactory getClassImportResolverFactory() {
-// return this.importFactory;
-// }
-
public boolean isStrictMode() {
return strictMode;
}
@@ -384,7 +369,7 @@
}
public ParserContext getParserContext(final Dialect.AnalysisResult analysis, final Map outerDeclarations, final RuleBuildContext context) {
- final ParserContext parserContext = new ParserContext( imports,
+ final ParserContext parserContext = new ParserContext( this.imports,
null,
context.getPkg().getName()+"."+context.getRuleDescr().getClassName() );
@@ -393,8 +378,6 @@
parserContext.addPackageImport( packageImport );
}
- //this.configuration.get
-
parserContext.setStrictTypeEnforcement( strictMode );
if ( interceptors != null ) {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -74,7 +74,6 @@
final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
null,
context.getPkg().getGlobals() );
- factory.setNextFactory( ((MVELDialect) context.getDialect()).getStaticMethodImportResolverFactory() );
Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
evalDescr,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -67,8 +67,6 @@
// This builder is re-usable in other dialects, so specify by name
MVELDialect dialect = (MVELDialect) context.getDialect( "mvel" );
- factory.setNextFactory( dialect.getStaticMethodImportResolverFactory() );
-
String text = (String) accessor.toString();
Dialect.AnalysisResult analysis = dialect.analyzeExpression( context,
descr,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -63,8 +63,7 @@
try {
final DroolsMVELFactory factory = new DroolsMVELFactory( previousMap,
localMap,
- context.getPkg().getGlobals() );
- factory.setNextFactory( ((MVELDialect) context.getDialect()).getStaticMethodImportResolverFactory() );
+ context.getPkg().getGlobals() );
Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
predicateDescr,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -61,8 +61,6 @@
}
final DroolsMVELFactory factory = new DroolsMVELFactory(previousMap, localMap, context.getPkg().getGlobals() );
- factory.setNextFactory( ((MVELDialect) context.getDialect()).getStaticMethodImportResolverFactory() );
-
Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
returnValueRestrictionDescr,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -25,10 +25,11 @@
final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
null,
context.getPkg().getGlobals() );
+
+ // This builder is re-usable in other dialects, so specify by name
MVELDialect dialect = (MVELDialect) context.getDialect( "mvel" );
- // This builder is re-usable in other dialects, so specify by name
- factory.setNextFactory( dialect.getStaticMethodImportResolverFactory() );
+
Dialect.AnalysisResult analysis = dialect.analyzeExpression( context,
context.getRuleDescr(),
(String) context.getRuleDescr().getSalience() );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -31,7 +31,7 @@
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_mvel.drl" ) );
RuleBase ruleBase = loadRuleBase( reader );
-
+
// Bellow lines are a way to make sure serialization is fine
// start of serialization block
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -43,8 +43,7 @@
DroolsObjectInputStream in = new DroolsObjectInputStream( new ByteArrayInputStream( buf ) );
ruleBase = (RuleBase) in.readObject();
- // end of serialization block
-
+ // end of serialization block
final WorkingMemory workingMemory = ruleBase.newStatefulSession();
@@ -76,6 +75,9 @@
// pre build the package
final PackageBuilder builder = new PackageBuilder();
builder.addPackage( packageDescr );
+
+ System.out.println( builder.getErrors() );
+
final Package pkg = builder.getPackage();
// add the package to a rulebase
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_mvel.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_mvel.drl 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_mvel.drl 2007-09-02 01:22:07 UTC (rev 14795)
@@ -4,6 +4,10 @@
global java.util.List list;
+function String someFunction() {
+ return "hello world";
+}
+
rule "mvel1"
dialect "mvel"
when
@@ -27,4 +31,5 @@
$c : Cheese(type == "stilton", price == 20 )
then
list.add( $c.price + 2);
+ System.out.println( someFunction() );
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-core/.classpath 2007-09-02 01:22:07 UTC (rev 14795)
@@ -5,8 +5,8 @@
<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/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc4rv913/mvel14-1.2rc4rv913.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -1,20 +1,27 @@
package org.drools.base.mvel;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.io.Serializable;
+import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.drools.WorkingMemory;
+import org.drools.common.DroolsObjectInputStream;
import org.drools.reteoo.ReteTuple;
import org.drools.rule.Declaration;
+import org.drools.rule.Package;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.Tuple;
import org.mvel.CompileException;
import org.mvel.integration.VariableResolver;
import org.mvel.integration.impl.BaseVariableResolverFactory;
import org.mvel.integration.impl.LocalVariableResolverFactory;
+import org.mvel.integration.impl.StaticMethodImportResolverFactory;
public class DroolsMVELFactory extends BaseVariableResolverFactory
implements
@@ -28,10 +35,15 @@
* Holds the instance of the variables.
*/
private Object[] tupleObjects;
+
private KnowledgeHelper knowledgeHelper;
+
private Object object;
+
private Map localDeclarations;
+
private Map previousDeclarations;
+
private Map globals;
private WorkingMemory workingMemory;
@@ -44,9 +56,9 @@
this( previousDeclarations,
localDeclarations,
globals,
- null );
+ null );
}
-
+
public DroolsMVELFactory(final Map previousDeclarations,
final Map localDeclarations,
final Map globals,
@@ -54,17 +66,71 @@
this.previousDeclarations = previousDeclarations;
this.localDeclarations = localDeclarations;
this.globals = globals;
-
+
if ( externals != null && MVELDebugHandler.isDebugMode() ) {
- for( int i = 0; i < externals.length; i++ ) {
+ for ( int i = 0; i < externals.length; i++ ) {
for ( Iterator it = externals[i].iterator(); it.hasNext(); ) {
- String identifier = ( String ) it.next();
+ String identifier = (String) it.next();
isResolveable( identifier );
}
}
}
- }
-
+ }
+
+// public void writeExternal(final ObjectOutput stream) throws IOException {
+// setNextFactory( null );
+// stream.writeObject( this.previousDeclarations );
+// stream.writeObject( this.localDeclarations );
+// stream.writeObject( this.globals );
+// stream.writeObject( this.variableResolvers );
+// }
+//
+// public void readExternal(final ObjectInput stream) throws IOException,
+// ClassNotFoundException {
+// DroolsObjectInputStream droolsInputStream = (DroolsObjectInputStream) stream;
+//
+// this.previousDeclarations = (Map) droolsInputStream.readObject();
+// this.localDeclarations = (Map) droolsInputStream.readObject();
+// this.globals = (Map) droolsInputStream.readObject();
+// this.variableResolvers = (Map) droolsInputStream.readObject();
+//
+// StaticMethodImportResolverFactory factory = new StaticMethodImportResolverFactory();
+// setNextFactory( factory );
+//
+// Package pkg = droolsInputStream.getPackage();
+// ClassLoader classLoader = pkg.getPackageCompilationData().getClassLoader();
+// for ( Iterator it = pkg.getStaticImports().iterator(); it.hasNext(); ) {
+// String staticImportEntry = (String) it.next();
+// addStaticImport( factory,
+// staticImportEntry,
+// classLoader );
+// }
+// }
+
+ public static void addStaticImport(StaticMethodImportResolverFactory factory,
+ String staticImportEntry,
+ ClassLoader classLoader) {
+ int index = staticImportEntry.lastIndexOf( '.' );
+ String className = staticImportEntry.substring( 0,
+ index );
+ String methodName = staticImportEntry.substring( index + 1 );
+
+ try {
+ Class cls = classLoader.loadClass( className );
+ Method[] methods = cls.getDeclaredMethods();
+ for ( int i = 0; i < methods.length; i++ ) {
+ if ( methods[i].getName().equals( methodName ) ) {
+ factory.createVariable( methodName,
+ methods[i] );
+ break;
+ }
+ }
+ } catch ( ClassNotFoundException e ) {
+ throw new RuntimeException( "Unable to dynamically load method '" + staticImportEntry + "'" );
+ }
+
+ }
+
public Map getVariableResolvers() {
return this.variableResolvers;
}
@@ -83,7 +149,7 @@
final WorkingMemory workingMemory,
final Map variables) {
if ( tuple != null ) {
- this.tupleObjects = ((ReteTuple) tuple).toObjectArray();
+ this.tupleObjects = ((ReteTuple) tuple).toObjectArray();
}
this.knowledgeHelper = knowledgeHelper;
this.object = object;
@@ -97,7 +163,7 @@
public Object getValue(final Declaration declaration) {
int i = declaration.getPattern().getOffset();
- return this.tupleObjects[ i ];
+ return this.tupleObjects[i];
}
public Object getValue(final String identifier) {
@@ -120,7 +186,7 @@
if ( vr != null ) {
if ( this.localVariables == null ) {
this.localVariables = new HashMap();
- }
+ }
vr.setValue( value );
return vr;
} else {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectInputStream.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectInputStream.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectInputStream.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -8,11 +8,13 @@
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import java.util.HashMap;
+import org.drools.rule.Package;
public class DroolsObjectInputStream extends ObjectInputStream {
private final ClassLoader classLoader;
private InternalRuleBase ruleBase;
private InternalWorkingMemory workingMemory;
+ private Package pkg;
/** table mapping primitive type names to corresponding class objects */
private static final HashMap primClasses = new HashMap( 8,
@@ -94,4 +96,14 @@
return workingMemory;
}
+ public Package getPackage() {
+ return pkg;
+ }
+
+ public void setPackage(Package pkg) {
+ this.pkg = pkg;
+ }
+
+
+
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java 2007-09-02 01:22:07 UTC (rev 14795)
@@ -185,6 +185,7 @@
// Use a custom ObjectInputStream that can resolve against a given classLoader
final DroolsObjectInputStream streamWithLoader = new DroolsObjectInputStream( new ByteArrayInputStream( bytes ),
this.packageCompilationData.getClassLoader() );
+
this.rules = (Map) streamWithLoader.readObject();
}
Modified: labs/jbossrules/trunk/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/.classpath 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-decisiontables/.classpath 2007-09-02 01:22:07 UTC (rev 14795)
@@ -5,14 +5,14 @@
<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/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
<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/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc4rv913/mvel14-1.2rc4rv913.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.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/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jbrms/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/.classpath 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-jbrms/.classpath 2007-09-02 01:22:07 UTC (rev 14795)
@@ -5,53 +5,53 @@
<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/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <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/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc4rv913/mvel14-1.2rc4rv913.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.jar"/>
<classpathentry kind="src" path="/drools-repository"/>
<classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.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-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/seam/jboss-seam/1.2.0.GA/jboss-seam-1.2.0.GA.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="src" path="/drools-decisiontables"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/seam/profiles/seam-nopersistence/1.2.0.GA/seam-nopersistence-1.2.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.3/jackrabbit-api-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.3.3/gwt-servlet-1.3.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jms/jms/1.1/jms-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.jar"/>
+ <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.2rc6/mvel14-1.2rc6.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="src" path="/drools-decisiontables"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/seam/profiles/seam-nopersistence/1.2.0.GA/seam-nopersistence-1.2.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/seam/jboss-seam/1.2.0.GA/jboss-seam-1.2.0.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jbrms/.project
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/.project 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-jbrms/.project 2007-09-02 01:22:07 UTC (rev 14795)
@@ -2,9 +2,9 @@
<name>drools-jbrms</name>
<comment>A rule production system</comment>
<projects>
+ <project>drools-core</project>
+ <project>drools-repository</project>
<project>drools-compiler</project>
- <project>drools-repository</project>
- <project>drools-core</project>
<project>drools-decisiontables</project>
</projects>
<buildSpec>
Modified: labs/jbossrules/trunk/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.classpath 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-jsr94/.classpath 2007-09-02 01:22:07 UTC (rev 14795)
@@ -5,18 +5,18 @@
<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/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
+ <classpathentry kind="src" path="/drools-decisiontables"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.jar"/>
<classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.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/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="src" path="/drools-decisiontables"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc4rv913/mvel14-1.2rc4rv913.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jsr94/.project
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.project 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/drools-jsr94/.project 2007-09-02 01:22:07 UTC (rev 14795)
@@ -2,9 +2,9 @@
<name>drools-jsr94</name>
<comment>A rule production system</comment>
<projects>
+ <project>drools-decisiontables</project>
<project>drools-core</project>
<project>drools-compiler</project>
- <project>drools-decisiontables</project>
</projects>
<buildSpec>
<buildCommand>
Added: labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.pom
===================================================================
--- labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.pom (rev 0)
+++ labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2rc6/mvel14-1.2rc6.pom 2007-09-02 01:22:07 UTC (rev 14795)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.mvel</groupId>
+
+ <artifactId>mvel14</artifactId>
+
+ <name>mvel</name>
+
+ <version>1.2rc6</version>
+
+ <description></description>
+
+ <inceptionYear>2005</inceptionYear>
+
+ <url>http://wiki.mvflex.org/index.php?title=MVFLEX_Expression_Language</url>
+
+ <issueManagement>
+ <url>http://jira.codehaus.org/browse/MVEL</url>
+ </issueManagement>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <mailingLists/>
+
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/mvel/</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/mvel/</developerConnection>
+ <url>http://svn.mvel.codehaus.org/</url>
+ </scm>
+
+ <organization>
+ <name>Codehaus</name>
+ <url>http://codehaus.org</url>
+ </organization>
+
+ <build>
+ <sourceDirectory></sourceDirectory>
+ <testSourceDirectory></testSourceDirectory>
+ </build>
+</project>
\ No newline at end of file
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2007-09-01 18:14:55 UTC (rev 14794)
+++ labs/jbossrules/trunk/pom.xml 2007-09-02 01:22:07 UTC (rev 14795)
@@ -679,7 +679,7 @@
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel14</artifactId>
- <version>1.2rc4rv913</version>
+ <version>1.2rc6</version>
</dependency>
<!-- drools-compiler -->
More information about the jboss-svn-commits
mailing list