[jboss-svn-commits] JBL Code SVN: r17656 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/rule/builder/dialect/java and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 9 12:57:18 EST 2008
Author: tirelli
Date: 2008-01-09 12:57:18 -0500 (Wed, 09 Jan 2008)
New Revision: 17656
Added:
labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.20/
labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.20/mvel-1.2.20.jar
labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.20/mvel-1.2.20.pom
Removed:
labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.17/
labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.8/
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.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/MVELActionBuilder.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/MVELReturnValueEvaluatorBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-1397: applying changes to trunk. Updating mvel to latest version. Fixing minor bug in mvel handling
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -164,6 +164,7 @@
mvelAnalysis,
mvel.getInterceptors(),
null,
+ null,
context );
Class ret = expr.getKnownEgressType();
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 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -101,6 +101,7 @@
analysis,
null,
source.getOuterDeclarations(),
+ null,
context );
AccumulateFunction function = context.getConfiguration().getAccumulateFunction( accumDescr.getFunctionIdentifier() );
@@ -121,13 +122,13 @@
accumDescr.getActionCode(),
new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()},
initCodeAnalysis.getMvelVariables() );
- actionCodeAnalysis.setMvelVariables( initCodeAnalysis.getMvelVariables() );
+ //actionCodeAnalysis.setMvelVariables( initCodeAnalysis.getMvelVariables() );
final MVELAnalysisResult resultCodeAnalysis = (MVELAnalysisResult) dialect.analyzeExpression( context,
accumDescr,
accumDescr.getResultCode(),
new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()},
initCodeAnalysis.getMvelVariables() );
- resultCodeAnalysis.setMvelVariables( initCodeAnalysis.getMvelVariables() );
+ //resultCodeAnalysis.setMvelVariables( initCodeAnalysis.getMvelVariables() );
final List requiredDeclarations = new ArrayList( initCodeAnalysis.getBoundIdentifiers()[0] );
requiredDeclarations.addAll( actionCodeAnalysis.getBoundIdentifiers()[0] );
@@ -150,11 +151,13 @@
initCodeAnalysis,
null,
source.getOuterDeclarations(),
+ null,
context );
final Serializable action = dialect.compile( (String) accumDescr.getActionCode(),
actionCodeAnalysis,
null,
source.getOuterDeclarations(),
+ initCodeAnalysis.getMvelVariables(),
context );
Serializable reverse = null;
@@ -163,6 +166,7 @@
resultCodeAnalysis,
null,
source.getOuterDeclarations(),
+ initCodeAnalysis.getMvelVariables(),
context );
}
@@ -170,6 +174,7 @@
resultCodeAnalysis,
null,
source.getOuterDeclarations(),
+ initCodeAnalysis.getMvelVariables(),
context );
accumulator = new MVELAccumulator( factory,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -48,6 +48,7 @@
analysis,
dialect.getInterceptors(),
null,
+ null,
context );
final DroolsMVELFactory factory = new DroolsMVELFactory( 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 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -83,6 +83,7 @@
analysis,
dialect.getInterceptors(),
null,
+ null,
context );
final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
@@ -96,7 +97,7 @@
context.getErrors().add( new DescrBuildError( context.getParentDescr(),
context.getRuleDescr(),
null,
- "Unable to build expression for 'consequence' '" + context.getRuleDescr().getConsequence() + "'" ) );
+ "Unable to build expression for 'consequence': "+e.getMessage()+" '" + context.getRuleDescr().getConsequence() + "'" ) );
}
}
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 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -406,9 +406,11 @@
final Dialect.AnalysisResult analysis,
final Map interceptors,
final Map outerDeclarations,
+ final Map otherInputVariables,
final PackageBuildContext context) {
final ParserContext parserContext = getParserContext( analysis,
outerDeclarations,
+ otherInputVariables,
context );
ExpressionCompiler compiler = new ExpressionCompiler( text.trim() );
@@ -424,6 +426,7 @@
public ParserContext getParserContext(final Dialect.AnalysisResult analysis,
final Map outerDeclarations,
+ final Map otherInputVariables,
final PackageBuildContext context) {
// @todo proper source file name
final ParserContext parserContext = new ParserContext( this.imports,
@@ -462,9 +465,8 @@
(Class) globalTypes.get( identifier ) );
}
- Map mvelVars = ((MVELAnalysisResult) analysis).getMvelVariables();
- if ( mvelVars != null ) {
- for ( Iterator it = mvelVars.entrySet().iterator(); it.hasNext(); ) {
+ if( otherInputVariables != null ) {
+ for ( Iterator it = otherInputVariables.entrySet().iterator(); it.hasNext(); ) {
Entry entry = (Entry) it.next();
parserContext.addInput( (String) entry.getKey(),
(Class) entry.getValue() );
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 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -93,6 +93,7 @@
analysis,
null,
null,
+ null,
context );
eval.setEvalExpression( new MVELEvalExpression( expr,
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 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -78,6 +78,7 @@
analysis,
null,
null,
+ null,
context );
dataProvider = new MVELDataProvider( expr,
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 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -60,19 +60,24 @@
localMap.put( localDeclarations[i].getIdentifier(),
localDeclarations[i] );
}
-
+
try {
final DroolsMVELFactory factory = new DroolsMVELFactory( previousMap,
localMap,
- context.getPkg().getGlobals() );
-
+ context.getPkg().getGlobals() );
+
Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
predicateDescr,
predicateDescr.getContent(),
new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
-
- final Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) predicateDescr.getContent(), analysis, null, null, context );
-
+
+ final Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) predicateDescr.getContent(),
+ analysis,
+ null,
+ null,
+ null,
+ context );
+
predicate.setPredicateExpression( new MVELPredicateExpression( expr,
factory ) );
} catch ( final Exception e ) {
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 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -52,24 +52,31 @@
Map previousMap = new HashMap();
for ( int i = 0, length = previousDeclarations.length; i < length; i++ ) {
previousMap.put( previousDeclarations[i].getIdentifier(),
- previousDeclarations[i] );
+ previousDeclarations[i] );
}
Map localMap = new HashMap();
for ( int i = 0, length = localDeclarations.length; i < length; i++ ) {
localMap.put( localDeclarations[i].getIdentifier(),
- localDeclarations[i] );
- }
-
- final DroolsMVELFactory factory = new DroolsMVELFactory(previousMap, localMap, context.getPkg().getGlobals() );
-
+ localDeclarations[i] );
+ }
+
+ final DroolsMVELFactory factory = new DroolsMVELFactory( previousMap,
+ localMap,
+ context.getPkg().getGlobals() );
+
Dialect.AnalysisResult analysis = context.getDialect().analyzeExpression( context,
returnValueRestrictionDescr,
returnValueRestrictionDescr.getContent(),
new Set[]{context.getDeclarationResolver().getDeclarations().keySet(), context.getPkg().getGlobals().keySet()} );
-
- final Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) returnValueRestrictionDescr.getContent(), analysis, null, null, context );
-
+
+ final Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) returnValueRestrictionDescr.getContent(),
+ analysis,
+ null,
+ null,
+ null,
+ context );
+
returnValueRestriction.setReturnValueExpression( new MVELReturnValueExpression( expr,
factory ) );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -53,6 +53,7 @@
analysis,
dialect.getInterceptors(),
null,
+ null,
context );
final DroolsMVELFactory factory = new DroolsMVELFactory( null,
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 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java 2008-01-09 17:57:18 UTC (rev 17656)
@@ -39,6 +39,7 @@
analysis,
null,
null,
+ null,
context );
MVELSalienceExpression salience = new MVELSalienceExpression( expr,
Added: labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.20/mvel-1.2.20.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.20/mvel-1.2.20.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.20/mvel-1.2.20.pom
===================================================================
--- labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.20/mvel-1.2.20.pom (rev 0)
+++ labs/jbossrules/trunk/m2_repo/org/mvel/mvel/1.2.20/mvel-1.2.20.pom 2008-01-09 17:57:18 UTC (rev 17656)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <packaging>jar</packaging>
+ <version>1.2.20-java1.5</version>
+ <name>mvel</name>
+ <url>http://mvel.codehaus.org</url>
+
+ <description>MVFLEX Expression Language 1.2 for Java 1.4</description>
+
+ <inceptionYear>2005</inceptionYear>
+
+ <url>http://mvel.codehaus.org/</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>
+
+ <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>
+</project>
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2008-01-09 17:28:27 UTC (rev 17655)
+++ labs/jbossrules/trunk/pom.xml 2008-01-09 17:57:18 UTC (rev 17656)
@@ -782,7 +782,7 @@
<dependency><!-- TODO deploy mvel to the jboss repo or snapshot repo, instead of the dir m2_repo hack -->
<groupId>org.mvel</groupId>
<artifactId>mvel</artifactId>
- <version>1.2.17</version>
+ <version>1.2.20</version>
</dependency>
<!-- drools-compiler -->
More information about the jboss-svn-commits
mailing list