[jboss-svn-commits] JBL Code SVN: r22329 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/integrationtests and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2008-09-02 16:51:16 -0400 (Tue, 02 Sep 2008)
New Revision: 22329

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/MVELReturnValueEvaluatorBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
Log:
JBRULES-1730: Add support for other data types when writing processes to XML
 - added Object support in IDE

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-09-02 14:32:14 UTC (rev 22328)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java	2008-09-02 20:51:16 UTC (rev 22329)
@@ -87,7 +87,8 @@
                                                                        null,
                                                                        null,
                                                                        context );              
-            MVELAction expr = new MVELAction( unit, context.getDialect().getId() );            
+            MVELAction expr = new MVELAction( unit, context.getDialect().getId() );   
+            expr.setVariableNames(analysis.getNotBoundedIdentifiers());
             action.setMetaData("Action",  expr );
             
             MVELDialectRuntimeData data = (MVELDialectRuntimeData) context.getPkg().getDialectRuntimeRegistry().getDialectData( dialect.getId() );            

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-09-02 14:32:14 UTC (rev 22328)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java	2008-09-02 20:51:16 UTC (rev 22329)
@@ -55,6 +55,7 @@
             data.addCompileable( constraintNode,
                                   expr );
             
+            expr.setVariableNames(analysis.getNotBoundedIdentifiers());
             expr.compile( context.getPackageBuilder().getRootClassLoader() );
         } catch ( final Exception e ) {
             context.getErrors().add( new DescrBuildError( context.getParentDescr(),

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java	2008-09-02 14:32:14 UTC (rev 22328)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java	2008-09-02 20:51:16 UTC (rev 22329)
@@ -38,10 +38,20 @@
             "    <start id=\"1\" name=\"Start\" />\n" +
             "    <workItem id=\"2\" name=\"HumanTask\" >\n" +
             "      <work name=\"Human Task\" >\n" +
-            "        <parameter name=\"ActorId\" type=\"org.drools.process.core.datatype.impl.type.StringDataType\" >John Doe</parameter>\n" +
-            "        <parameter name=\"TaskName\" type=\"org.drools.process.core.datatype.impl.type.StringDataType\" >Do something</parameter>\n" +
-            "        <parameter name=\"Priority\" type=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
-            "        <parameter name=\"Comment\" type=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+            "        <parameter name=\"ActorId\" >\n" +
+            "          <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+            "          <value>John Doe</value>\n" +
+            "        </parameter>\n" +
+            "        <parameter name=\"TaskName\" >\n" +
+            "          <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+            "          <value>Do something</value>\n" +
+            "        </parameter>\n" +
+            "        <parameter name=\"Priority\" >\n" +
+            "          <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+            "        </parameter>\n" +
+            "        <parameter name=\"Comment\" >\n" +
+            "          <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
+            "        </parameter>\n" +
             "      </work>\n" +
             "      <onEntry>\n" +
             "        <action type=\"expression\" name=\"Print\" dialect=\"mvel\" >list.add(\"Executing on entry action\");</action>\n" +