[jboss-svn-commits] JBL Code SVN: r12266 - in labs/jbossesb/trunk/product/services/jbrules: src/main/java/org/jboss/internal/soa/esb/services/routing/cbr and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 31 12:56:22 EDT 2007
Author: kurt.stam at jboss.com
Date: 2007-05-31 12:56:22 -0400 (Thu, 31 May 2007)
New Revision: 12266
Added:
labs/jbossesb/trunk/product/services/jbrules/lib/ext/antlr-3.0b7.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/core-3.2.1.v_677_R32x.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-compiler-4.0.0.11754MR2.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-core-4.0.0.11754MR2.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-decisiontables-4.0.0.11754MR2.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-jsr94-4.0.0.11754MR2.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/janino-2.5.6.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/jsr94-1.1.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/jxl-2.4.2.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/mvel14-1.2beta16.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/xpp3-1.1.3.4.O.jar
Removed:
labs/jbossesb/trunk/product/services/jbrules/lib/ext/antlr-2.7.6.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/antlr-3.0ea8.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/commons-jci-core-1.0-406301.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/commons-jci-janino-2.4.3.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/commons-lang-2.1.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/commons-logging.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-compiler-3.0.4.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-core-3.0.4.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/janino-2.4.3.jar
labs/jbossesb/trunk/product/services/jbrules/lib/ext/stringtemplate-2.3b6.jar
Modified:
labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
labs/jbossesb/trunk/product/services/jbrules/src/main/resources/XPathLanguage.dsl
labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBPricingRoutingRules.drl
labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBPricingRules.drl
labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBRules-XPath.drl
labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBRules.drl
Log:
http://jira.jboss.com/jira/browse/JBESB-571, upgrading to rules 4.0MR2. Doing this before 4.0 is final to find issues sooner rather then later.
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/antlr-2.7.6.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/antlr-3.0b7.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/antlr-3.0b7.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/antlr-3.0ea8.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/commons-jci-core-1.0-406301.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/commons-jci-janino-2.4.3.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/commons-lang-2.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/commons-logging.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/core-3.2.1.v_677_R32x.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/core-3.2.1.v_677_R32x.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-compiler-3.0.4.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-compiler-4.0.0.11754MR2.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-compiler-4.0.0.11754MR2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-core-3.0.4.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-core-4.0.0.11754MR2.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-core-4.0.0.11754MR2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-decisiontables-4.0.0.11754MR2.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-decisiontables-4.0.0.11754MR2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-jsr94-4.0.0.11754MR2.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/drools-jsr94-4.0.0.11754MR2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/janino-2.4.3.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/janino-2.5.6.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/janino-2.5.6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/jsr94-1.1.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/jsr94-1.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/jxl-2.4.2.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/jxl-2.4.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/mvel14-1.2beta16.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/mvel14-1.2beta16.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/trunk/product/services/jbrules/lib/ext/stringtemplate-2.3b6.jar
===================================================================
(Binary files differ)
Added: labs/jbossesb/trunk/product/services/jbrules/lib/ext/xpp3-1.1.3.4.O.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/services/jbrules/lib/ext/xpp3-1.1.3.4.O.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java 2007-05-31 15:56:02 UTC (rev 12265)
+++ labs/jbossesb/trunk/product/services/jbrules/src/main/java/org/jboss/internal/soa/esb/services/routing/cbr/JBossRulesRouter.java 2007-05-31 16:56:22 UTC (rev 12266)
@@ -131,7 +131,7 @@
}
if (ruleSet != null) ruleSets.put(ruleSet, newRuleSet);
}
- WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+ WorkingMemory workingMemory = ruleBase.newStatefulSession();
logger.log(Priority.DEBUG,
"Obtained message=" + message + " with ruleSet=" + ruleSet);
workingMemory.setGlobal("destinations", destinations);
Modified: labs/jbossesb/trunk/product/services/jbrules/src/main/resources/XPathLanguage.dsl
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/src/main/resources/XPathLanguage.dsl 2007-05-31 15:56:02 UTC (rev 12265)
+++ labs/jbossesb/trunk/product/services/jbrules/src/main/resources/XPathLanguage.dsl 2007-05-31 16:56:22 UTC (rev 12266)
@@ -1,7 +1,7 @@
-#JBossESB Content Based Routing using XPath DSL
-[when]xpathMatch "{xpath}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentMatches(msg, "{xpath}") )
-[when]xpathEquals "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentEquals(msg, "{xpath}", "{value}") )
-[when]xpathGreaterThan "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentGreaterThan(msg, "{xpath}", "{value}") )
-[when]xpathLessThan "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentLessThan(msg, "{xpath}", "{value}") )
-[then]Log : "{message}"=System.out.println("{message}");
-[then]Destination : "{message}"=destinations.add("{message}");
+#JBossESB Content Based Routing using XPath DSL
+[when]xpathMatch "{xpath}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentMatches(msg, "{xpath}") )
+[when]xpathEquals "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentEquals(msg, "{xpath}", "{value}") )
+[when]xpathGreaterThan "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentGreaterThan(msg, "{xpath}", "{value}") )
+[when]xpathLessThan "{xpath}", "{value}"=msg : Message( type == MessageType.JBOSS_XML ) and eval( org.jboss.internal.soa.esb.services.routing.cbr.DslHelper.xmlContentLessThan(msg, "{xpath}", "{value}") )
+[then]Log : "{message}"=System.out.println("{message}");
+[then]Destination : "{message}"=destinations.add("{message}");
Modified: labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBPricingRoutingRules.drl
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBPricingRoutingRules.drl 2007-05-31 15:56:02 UTC (rev 12265)
+++ labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBPricingRoutingRules.drl 2007-05-31 16:56:22 UTC (rev 12266)
@@ -1,41 +1,41 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.internal.soa.esb.services.routing.cbr.Order
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Pricing Rule - low quantity"
-
- when
- m : Message ()
- order : Order( quantity < 10)
- then
- System.out.println("low volume");
- #we can modify the object
- order.setDiscount(0);
- #demonstrate that we can add a new object to the message
- m.getBody().add("DiscountObject","0%");
- #set the routing destination
- destinations.add("normal-shipping-destination");
-end
-
-rule "Prioing Rule - high quantity"
-
- when
- m : Message ()
- order : Order( quantity >= 10)
- then
- System.out.println("high volume");
- #we can modify the object
- order.setDiscount(10);
- #demonstrate that we can add a new object to the message
- m.getBody().add("DiscountObject","10%");
- #sets the routing destination
- destinations.add("express-shipping-destination");
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.internal.soa.esb.services.routing.cbr.Order
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Pricing Rule - low quantity"
+
+ when
+ m : Message ()
+ order : Order( quantity < 10)
+ then
+ System.out.println("low volume");
+ #we can modify the object
+ order.setDiscount(0);
+ #demonstrate that we can add a new object to the message
+ m.getBody().add("DiscountObject","0%");
+ #set the routing destination
+ destinations.add("normal-shipping-destination");
+end
+
+rule "Prioing Rule - high quantity"
+
+ when
+ m : Message ()
+ order : Order( quantity >= 10)
+ then
+ System.out.println("high volume");
+ #we can modify the object
+ order.setDiscount(10);
+ #demonstrate that we can add a new object to the message
+ m.getBody().add("DiscountObject","10%");
+ #sets the routing destination
+ destinations.add("express-shipping-destination");
end
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBPricingRules.drl
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBPricingRules.drl 2007-05-31 15:56:02 UTC (rev 12265)
+++ labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBPricingRules.drl 2007-05-31 16:56:22 UTC (rev 12266)
@@ -1,37 +1,37 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-import org.jboss.internal.soa.esb.services.routing.cbr.Order
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Pricing Rule - low quantity"
-
- when
- m : Message ()
- order : Order( quantity < 10)
- then
- System.out.println("low volume");
- #we can modify the object
- order.setDiscount(0);
- #demonstrate that we can add a new object to the message
- m.getBody().add("DiscountObject","0%");
-end
-
-rule "Prioing Rule - high quantity"
-
- when
- m : Message ()
- order : Order( quantity >= 10)
- then
- System.out.println("high volume");
- #we can modify the object
- order.setDiscount(10);
- #demonstrate that we can add a new object to the message
- m.getBody().add("DiscountObject","10%");
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.internal.soa.esb.services.routing.cbr.Order
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Pricing Rule - low quantity"
+
+ when
+ m : Message ()
+ order : Order( quantity < 10)
+ then
+ System.out.println("low volume");
+ #we can modify the object
+ order.setDiscount(0);
+ #demonstrate that we can add a new object to the message
+ m.getBody().add("DiscountObject","0%");
+end
+
+rule "Prioing Rule - high quantity"
+
+ when
+ m : Message ()
+ order : Order( quantity >= 10)
+ then
+ System.out.println("high volume");
+ #we can modify the object
+ order.setDiscount(10);
+ #demonstrate that we can add a new object to the message
+ m.getBody().add("DiscountObject","10%");
end
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBRules-XPath.drl
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBRules-XPath.drl 2007-05-31 15:56:02 UTC (rev 12265)
+++ labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBRules-XPath.drl 2007-05-31 16:56:22 UTC (rev 12266)
@@ -1,47 +1,47 @@
-#created on: Nov 8, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-
-expander XPathLanguage.dsl
-
-#declare any global variables here
-global java.util.List destinations;
-
-rule "Routing Rule using XPATH match"
-
- when
- xpathMatch "/jbossesb"
- then
- Log : "XPath Matched";
- Destination : "XML_XPath_Destination";
-end
-
-rule "Routing Rule using XPATH equals"
-
- when
- xpathEquals "/Dave", "rocks"
- then
- Log : "XPath Equals";
- Destination : "XML_XPath_Dave_Destination";
-end
-
-rule "Routing Rule using XPATH greater than"
-
- when
- xpathGreaterThan "/price" , "1.00"
- then
- Log : "XPath Greater Then";
- Destination : "XML_XPath_GreaterThan_Destination";
-end
-
-rule "Routing Rule using XPATH less than"
-
- when
- xpathLessThan "/price", "1.00"
- then
- Log : "XPath Less Then";
- Destination : "XML_XPath_LessThan_Destination";
-end
+#created on: Nov 8, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+
+expander XPathLanguage.dsl
+
+#declare any global variables here
+global java.util.List destinations;
+
+rule "Routing Rule using XPATH match"
+
+ when
+ xpathMatch "/jbossesb"
+ then
+ Log : "XPath Matched";
+ Destination : "XML_XPath_Destination";
+end
+
+rule "Routing Rule using XPATH equals"
+
+ when
+ xpathEquals "/Dave", "rocks"
+ then
+ Log : "XPath Equals";
+ Destination : "XML_XPath_Dave_Destination";
+end
+
+rule "Routing Rule using XPATH greater than"
+
+ when
+ xpathGreaterThan "/price", "1.00"
+ then
+ Log : "XPath Greater Then";
+ Destination : "XML_XPath_GreaterThan_Destination";
+end
+
+rule "Routing Rule using XPATH less than"
+
+ when
+ xpathLessThan "/price", "1.00"
+ then
+ Log : "XPath Less Then";
+ Destination : "XML_XPath_LessThan_Destination";
+end
Modified: labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBRules.drl
===================================================================
--- labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBRules.drl 2007-05-31 15:56:02 UTC (rev 12265)
+++ labs/jbossesb/trunk/product/services/jbrules/src/test/resources/JBossESBRules.drl 2007-05-31 16:56:22 UTC (rev 12266)
@@ -1,29 +1,29 @@
-#created on: Oct 30, 2006
-package com.jboss.soa.esb.routing.cbr
-
-#list any import classes here.
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.message.format.MessageType;
-
-#declare any global variables here
-global java.util.List destinations;
-
-
-rule "Routing Rule - Serialized based message"
-
- when
- Message( type == MessageType.JAVA_SERIALIZED)
- then
- System.out.println("Serialized");
- destinations.add("serialized-destination");
-
-end
-
-rule "Routing Rule - XML based message"
-
- when
- Message( type == MessageType.JBOSS_XML)
- then
- System.out.println("JBoss_XML");
- destinations.add("xml-destination");
+#created on: Oct 30, 2006
+package com.jboss.soa.esb.routing.cbr
+
+#list any import classes here.
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageType;
+
+#declare any global variables here
+global java.util.List destinations;
+
+
+rule "Routing Rule - Serialized based message"
+
+ when
+ Message( type == MessageType.JAVA_SERIALIZED)
+ then
+ System.out.println("Serialized");
+ destinations.add("serialized-destination");
+
+end
+
+rule "Routing Rule - XML based message"
+
+ when
+ Message( type == MessageType.JBOSS_XML)
+ then
+ System.out.println("JBoss_XML");
+ destinations.add("xml-destination");
end
\ No newline at end of file
More information about the jboss-svn-commits
mailing list