[jboss-svn-commits] JBL Code SVN: r33968 - in labs/jbossrules/trunk/drools-container/drools-spring/src: main/resources/org/drools/container/spring and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 16 21:25:54 EDT 2010
Author: mark.proctor at jboss.com
Date: 2010-07-16 21:25:54 -0400 (Fri, 16 Jul 2010)
New Revision: 33968
Modified:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml
Log:
JBRULES-1434 Drools Spring
-added assert behaviour configuration
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-07-17 00:39:40 UTC (rev 33967)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-07-17 01:25:54 UTC (rev 33968)
@@ -3,6 +3,7 @@
import java.util.List;
import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseConfiguration.AssertBehaviour;
import org.drools.conf.EventProcessingOption;
import org.drools.container.spring.beans.KnowledgeBaseBeanFactory;
import org.drools.core.util.StringUtils;
@@ -29,6 +30,8 @@
private static final String MBEABS = "mbeans";
private static final String EVENT_PROCESSING_MODE = "event-processing-mode";
+
+ private static final String ASSERT_BEHAVIOR = "assert-behavior";
private static final String ACCUMULATE_FUNCTIONS = "accumulate-functions";
@@ -68,8 +71,13 @@
e = DomUtils.getChildElementByTagName(kbaseConf, EVENT_PROCESSING_MODE);
if ( e != null && !StringUtils.isEmpty( e.getAttribute( "mode" ) )) {
rbaseConfBuilder.addPropertyValue( "eventProcessingMode", EventProcessingOption.valueOf( e.getAttribute( "mode" ) ) );
- }
+ }
+ e = DomUtils.getChildElementByTagName(kbaseConf, ASSERT_BEHAVIOR);
+ if ( e != null && !StringUtils.isEmpty( e.getAttribute( "mode" ) )) {
+ rbaseConfBuilder.addPropertyValue( "assertBehaviour", AssertBehaviour.determineAssertBehaviour( e.getAttribute( "mode" ) ) );
+ }
+
e = DomUtils.getChildElementByTagName(kbaseConf, ACCUMULATE_FUNCTIONS);
if ( e != null ) {
List<Element> children = DomUtils.getChildElementsByTagName( e, ACCUMULATE_FUNCTION );
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2010-07-17 00:39:40 UTC (rev 33967)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2010-07-17 01:25:54 UTC (rev 33968)
@@ -77,6 +77,12 @@
<xsd:attribute name="mode" type="cloudModeEnum"/>
</xsd:complexType>
</xsd:element>
+
+ <xsd:element name="assert-behavior" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="mode" type="assertBehaviorEnum"/>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="accumulate-functions" minOccurs="0">
<xsd:complexType>
@@ -227,6 +233,14 @@
</xsd:restriction>
</xsd:simpleType>
+
+ <xsd:simpleType name="assertBehaviorEnum">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="IDENTITY" />
+ <xsd:enumeration value="EQUALITY" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
<xsd:simpleType name="clockTypeEnum">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="REALTIME" />
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-07-17 00:39:40 UTC (rev 33967)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-07-17 01:25:54 UTC (rev 33968)
@@ -16,6 +16,7 @@
import org.drools.Person;
import org.drools.RuleBaseConfiguration;
import org.drools.SessionConfiguration;
+import org.drools.RuleBaseConfiguration.AssertBehaviour;
import org.drools.agent.KnowledgeAgent;
import org.drools.agent.impl.KnowledgeAgentImpl;
import org.drools.builder.DirectoryLookupFactoryService;
@@ -38,6 +39,8 @@
import org.drools.server.KnowledgeService;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import com.sun.org.apache.bcel.internal.verifier.exc.AssertionViolatedException;
+
public class SpringDroolsTest extends TestCase {
@@ -176,6 +179,7 @@
assertTrue( rconf.isMultithreadEvaluation() );
assertEquals( 5, rconf.getMaxThreads() );
assertEquals( EventProcessingOption.STREAM, rconf.getEventProcessingMode() );
+ assertEquals( AssertBehaviour.IDENTITY, rconf.getAssertBehaviour() );
KnowledgeBaseImpl kbase2 = ( KnowledgeBaseImpl ) context.getBean( "kbase2" );
rconf = ((InternalRuleBase)kbase2.getRuleBase()).getConfiguration();
@@ -183,13 +187,14 @@
assertFalse( rconf.isMultithreadEvaluation() );
assertEquals( 3, rconf.getMaxThreads() );
assertEquals( EventProcessingOption.CLOUD, rconf.getEventProcessingMode() );
+ assertEquals( AssertBehaviour.EQUALITY, rconf.getAssertBehaviour() );
+
StatefulKnowledgeSessionImpl ksession1 = ( StatefulKnowledgeSessionImpl ) context.getBean( "ksession1" );
SessionConfiguration sconf = ksession1.session.getSessionConfiguration();
assertTrue( sconf.isKeepReference() );
assertEquals( ClockType.REALTIME_CLOCK , sconf.getClockType() );
Map<String, WorkItemHandler> wih = sconf.getWorkItemHandlers();
- System.out.println( wih );
assertEquals( 4, wih.size() );
assertTrue( wih.containsKey( "wih1" ));
assertTrue( wih.containsKey( "wih2" ));
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml 2010-07-17 00:39:40 UTC (rev 33967)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml 2010-07-17 01:25:54 UTC (rev 33968)
@@ -41,8 +41,10 @@
<drools:evaluators>
<drools:evaluator name="ed1" ref="red1" />
<drools:evaluator name="ed2" ref="red2" />
- </drools:evaluators>
+ </drools:evaluators>
+ <drools:assert-behavior mode="IDENTITY" />
+
</drools:configuration>
</drools:kbase>
@@ -58,7 +60,9 @@
<drools:mbeans enabled="false" />
- <drools:event-processing-mode mode="CLOUD" />
+ <drools:event-processing-mode mode="CLOUD" />
+
+ <drools:assert-behavior mode="EQUALITY" />
</drools:configuration>
</drools:kbase>
More information about the jboss-svn-commits
mailing list