[jboss-svn-commits] JBL Code SVN: r20884 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/rule/builder/dialect/java and 1 other directories.

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

Author: KrisVerlaenen
Date: 2008-07-02 09:19:23 -0400 (Wed, 02 Jul 2008)
New Revision: 20884

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/javaRule.mvel
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java
Log:
JBRULES-1658: Generalize action framework
 - adding ActionContext to action execution

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	2008-07-02 13:19:15 UTC (rev 20883)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaInvokers.mvel	2008-07-02 13:19:23 UTC (rev 20884)
@@ -393,14 +393,19 @@
 
     public void execute(org.drools.spi.KnowledgeHelper knowledgeHelper,
                         org.drools.WorkingMemory workingMemory) throws Exception {
+        execute(knowledgeHelper, workingMemory, null);
+    }
 
+    public void execute(org.drools.spi.KnowledgeHelper knowledgeHelper,
+                        org.drools.WorkingMemory workingMemory, org.drools.spi.ActionContext context ) throws Exception {
+
         @foreach{type : globalTypes, identifier : globals} @{type} @{identifier} = ( @{type} ) workingMemory.getGlobal( "@{identifier}" );
         @end{}
 
         @{processClassName}.@{methodName} (
 	        knowledgeHelper at if{globals != empty}, at end{}
 	        @foreach{identifier : globals} @{identifier}
-	        @end{","} );
+	        @end{","}, context );
     }
 
     public void writeExternal(java.io.ObjectOutput out) throws java.io.IOException {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaRule.mvel
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaRule.mvel	2008-07-02 13:19:15 UTC (rev 20883)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/rule/builder/dialect/java/javaRule.mvel	2008-07-02 13:19:23 UTC (rev 20884)
@@ -106,7 +106,7 @@
 @end{}
 
 @declare{"actionMethod"}
-public static void @{methodName}(org.drools.spi.KnowledgeHelper drools at if{globals != empty}, at end{} @foreach{type :globalTypes, identifier : globals}  @{type} @{identifier} @end{","} ) throws Exception {
+public static void @{methodName}(org.drools.spi.KnowledgeHelper drools at if{globals != empty}, at end{} @foreach{type :globalTypes, identifier : globals}  @{type} @{identifier} @end{","}, org.drools.spi.ActionContext context ) throws Exception {
     @{text}
 }
 @end{}

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java	2008-07-02 13:19:15 UTC (rev 20883)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java	2008-07-02 13:19:23 UTC (rev 20884)
@@ -72,7 +72,7 @@
         wm.setGlobal( "list", list );        
         
         KnowledgeHelper knowledgeHelper = new DefaultKnowledgeHelper();
-        ((Action) actionNode.getAction().getMetaData("Action")).execute( knowledgeHelper, wm );
+        ((Action) actionNode.getAction().getMetaData("Action")).execute( knowledgeHelper, wm, null );
        
         assertEquals("hello world", list.get(0) );
     }    

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java	2008-07-02 13:19:15 UTC (rev 20883)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java	2008-07-02 13:19:23 UTC (rev 20884)
@@ -60,7 +60,7 @@
         wm.setGlobal( "list", list );     
         
         KnowledgeHelper knowledgeHelper = new DefaultKnowledgeHelper();
-        ((Action) actionNode.getAction().getMetaData("Action")).execute( knowledgeHelper, wm );
+        ((Action) actionNode.getAction().getMetaData("Action")).execute( knowledgeHelper, wm, null );
         
         assertEquals("hello world", list.get(0) );
     }    

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java	2008-07-02 13:19:15 UTC (rev 20883)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java	2008-07-02 13:19:23 UTC (rev 20884)
@@ -61,7 +61,7 @@
         wm.setGlobal( "list", list );        
         
         KnowledgeHelper knowledgeHelper = new DefaultKnowledgeHelper();
-        ((Action)actionNode.getAction().getMetaData("Action")).execute( knowledgeHelper, wm );
+        ((Action)actionNode.getAction().getMetaData("Action")).execute( knowledgeHelper, wm, null );
         
         assertEquals("hello world", list.get(0) );
     }