[jboss-svn-commits] JBL Code SVN: r34872 - 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
Tue Aug 24 15:17:26 EDT 2010
Author: eaa
Date: 2010-08-24 15:17:25 -0400 (Tue, 24 Aug 2010)
New Revision: 34872
Added:
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockConsequenceExceptionHandler.java
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-1.0.0.xsd
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-2674: Add support for KBaseConfiguration's ConsequenceExceptionHandlerOption when setting up a kbase using spring
- Added support for ConsequenceExceptionHandlerOption
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-08-24 19:15:25 UTC (rev 34871)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-08-24 19:17:25 UTC (rev 34872)
@@ -55,8 +55,10 @@
private static final String EVALUATORS = "evaluators";
- private static final String EVALUATOR = "evaluator";
+ private static final String EVALUATOR = "evaluator";
+ private static final String CONSEQUENCE_EXCEPTION_HANDLER = "consequenceExceptionHandler";
+
@SuppressWarnings("unchecked")
@Override
protected AbstractBeanDefinition parseInternal(Element element,
@@ -118,7 +120,12 @@
}
factory.addPropertyValue( "evaluators", evaluators );
}
- }
+ }
+
+ e = DomUtils.getChildElementByTagName(kbaseConf, CONSEQUENCE_EXCEPTION_HANDLER);
+ if ( e != null && !StringUtils.isEmpty( e.getAttribute( "handler" ) )) {
+ rbaseConfBuilder.addPropertyValue( "consequenceExceptionHandler", e.getAttribute( "handler" ) );
+ }
factory.addPropertyValue( "conf", rbaseConfBuilder.getBeanDefinition() );
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring-1.0.0.xsd
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring-1.0.0.xsd 2010-08-24 19:15:25 UTC (rev 34871)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring-1.0.0.xsd 2010-08-24 19:17:25 UTC (rev 34872)
@@ -108,8 +108,13 @@
</xsd:element>
</xsd:choice>
</xsd:complexType>
- </xsd:element>
-
+ </xsd:element>
+
+ <xsd:element name="consequenceExceptionHandler" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="handler" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
</xsd:all>
</xsd:complexType>
</xsd:element>
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-08-24 19:15:25 UTC (rev 34871)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2010-08-24 19:17:25 UTC (rev 34872)
@@ -108,7 +108,13 @@
</xsd:element>
</xsd:choice>
</xsd:complexType>
- </xsd:element>
+ </xsd:element>
+
+ <xsd:element name="consequenceExceptionHandler" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="handler" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
</xsd:all>
</xsd:complexType>
Added: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockConsequenceExceptionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockConsequenceExceptionHandler.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockConsequenceExceptionHandler.java 2010-08-24 19:17:25 UTC (rev 34872)
@@ -0,0 +1,19 @@
+package org.drools.container.spring;
+
+import org.drools.runtime.rule.Activation;
+import org.drools.runtime.rule.WorkingMemory;
+import org.drools.runtime.rule.impl.DefaultConsequenceExceptionHandler;
+
+/**
+ *
+ * @author esteban
+ */
+public class MockConsequenceExceptionHandler extends DefaultConsequenceExceptionHandler {
+
+ @Override
+ public void handleException(Activation activation, WorkingMemory workingMemory, Exception exception) {
+ super.handleException(activation, workingMemory, exception);
+ }
+
+
+}
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-08-24 19:15:25 UTC (rev 34871)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-08-24 19:17:25 UTC (rev 34872)
@@ -182,7 +182,8 @@
assertEquals( 5, rconf.getMaxThreads() );
assertEquals( EventProcessingOption.STREAM, rconf.getEventProcessingMode() );
assertEquals( AssertBehaviour.IDENTITY, rconf.getAssertBehaviour() );
-
+ assertEquals( "org.drools.container.spring.MockConsequenceExceptionHandler", rconf.getConsequenceExceptionHandler() );
+
KnowledgeBaseImpl kbase2 = ( KnowledgeBaseImpl ) context.getBean( "kbase2" );
rconf = ((InternalRuleBase)kbase2.getRuleBase()).getConfiguration();
assertFalse( rconf.isAdvancedProcessRuleIntegration() );
@@ -210,7 +211,7 @@
sconf = ksession2.session.getSessionConfiguration();
assertFalse( sconf.isKeepReference() );
assertEquals( ClockType.PSEUDO_CLOCK, sconf.getClockType() );
+
-
}
}
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-08-24 19:15:25 UTC (rev 34871)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml 2010-08-24 19:17:25 UTC (rev 34872)
@@ -41,7 +41,9 @@
<drools:evaluator name="ed2" ref="red2" />
</drools:evaluators>
- <drools:assert-behavior mode="IDENTITY" />
+ <drools:assert-behavior mode="IDENTITY" />
+
+ <drools:consequenceExceptionHandler handler="org.drools.container.spring.MockConsequenceExceptionHandler" />
</drools:configuration>
</drools:kbase>
More information about the jboss-svn-commits
mailing list