[jboss-svn-commits] JBL Code SVN: r12530 - in labs/jbossrules/trunk/drools-jsr94/src: test/resources/org/drools/jsr94/rules and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2007-06-12 22:57:47 -0400 (Tue, 12 Jun 2007)
New Revision: 12530

Modified:
   labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/StatefulRuleSessionImpl.java
   labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters.drl
   labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters.xml
   labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters_expander.dsl
   labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters_globals.drl
Log:
JBRULES-922 API change for assert and modify

Modified: labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/StatefulRuleSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/StatefulRuleSessionImpl.java	2007-06-13 02:57:35 UTC (rev 12529)
+++ labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/StatefulRuleSessionImpl.java	2007-06-13 02:57:47 UTC (rev 12530)
@@ -159,7 +159,7 @@
      */
     public Handle addObject(final Object object) throws InvalidRuleSessionException {
         checkRuleSessionValidity();
-        return (Handle) this.session.assertObject( object );
+        return (Handle) this.session.insert( object );
     }
 
     /**
@@ -210,7 +210,7 @@
         checkRuleSessionValidity();
 
         if ( objectHandle instanceof FactHandle ) {
-            this.session.modifyObject( (FactHandle) objectHandle,
+            this.session.update( (FactHandle) objectHandle,
                                              newObject );
         } else {
             throw new InvalidHandleException( "invalid handle" );
@@ -235,7 +235,7 @@
         checkRuleSessionValidity();
 
         if ( handleObject instanceof FactHandle ) {
-            this.session.retractObject( (FactHandle) handleObject );
+            this.session.retract( (FactHandle) handleObject );
         } else {
             throw new InvalidHandleException( "invalid handle" );
         }

Modified: labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters.drl
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters.drl	2007-06-13 02:57:35 UTC (rev 12529)
+++ labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters.drl	2007-06-13 02:57:47 UTC (rev 12530)
@@ -9,5 +9,5 @@
         eval( $person1.hasSister($person2) )
     then
     	System.out.println($person1.getName() + " and " + $person2.getName() +" are sisters");
-    	assert( $person1.getName() + " and " + $person2.getName() +" are sisters");
+    	insert( $person1.getName() + " and " + $person2.getName() +" are sisters");
 end
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters.xml
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters.xml	2007-06-13 02:57:35 UTC (rev 12529)
+++ labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters.xml	2007-06-13 02:57:47 UTC (rev 12530)
@@ -20,7 +20,7 @@
 		
 	    <rhs>
         	System.out.println($person1.getName() + " and " + $person2.getName() +" are sisters");
-        	assert( $person1.getName() + " and " + $person2.getName() +" are sisters");	    
+        	insert( $person1.getName() + " and " + $person2.getName() +" are sisters");	    
 		</rhs>
 	</rule>
 </package>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters_expander.dsl
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters_expander.dsl	2007-06-13 02:57:35 UTC (rev 12529)
+++ labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters_expander.dsl	2007-06-13 02:57:47 UTC (rev 12530)
@@ -1,8 +1,7 @@
-#Thats a dsl for sisters rule
-There exists a Person with name of {name}=Person(name=="{name}")
-[when]Person is at least {age} years old and lives in {location}=Person(age > {age}, location=="{location}")
-[then]Log {message}=System.out.println("{message}");
-[when]There is a Person=$person1 : Person ( )
-[when]There is a second Person and they are sisters=$person2 : Person ( ) eval( $person2.hasSister($person1) )
-[then]Tell the world they are sisters=System.out.println($person1.getName() + " and " + $person2.getName() +" are sisters");
-[then]Leave a comment in the WorkingMemory=assert( $person1.getName() + " and " + $person2.getName() +" are sisters");
+[*][]There exists a Person with name of {name}=Person(name=="{name}")
+[condition][]Person is at least {age} years old and lives in {location}=Person(age > {age}, location=="{location}")
+[consequence][]Log {message}=System.out.println("{message}");
+[condition][]There is a Person=$person1 : Person ( )
+[condition][]There is a second Person and they are sisters=$person2 : Person ( ) eval( $person2.hasSister($person1) )
+[consequence][]Tell the world they are sisters=System.out.println($person1.getName() + " and " + $person2.getName() +" are sisters");
+[consequence][]Leave a comment in the WorkingMemory=insert( $person1.getName() + " and " + $person2.getName() +" are sisters");

Modified: labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters_globals.drl
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters_globals.drl	2007-06-13 02:57:35 UTC (rev 12529)
+++ labs/jbossrules/trunk/drools-jsr94/src/test/resources/org/drools/jsr94/rules/sisters_globals.drl	2007-06-13 02:57:47 UTC (rev 12530)
@@ -11,5 +11,5 @@
         eval( $person1.hasSister($person2) )
     then
     	vector.add($person1.getName() + " and " + $person2.getName() +" are sisters");
-    	assert( $person1.getName() + " and " + $person2.getName() +" are sisters");
+    	insert( $person1.getName() + " and " + $person2.getName() +" are sisters");
 end
\ No newline at end of file