[jboss-svn-commits] JBL Code SVN: r34212 - in labs/jbossrules/trunk/drools-container/drools-spring/src: main/java/org/drools/container/spring/namespace and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 26 22:57:21 EDT 2010
Author: mark.proctor at jboss.com
Date: 2010-07-26 22:57:20 -0400 (Mon, 26 Jul 2010)
New Revision: 34212
Modified:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/AbstractKnowledgeSessionBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.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/resources/org/drools/container/spring/session-conf-beans.xml
Log:
JBRULES-1434 Drools Spring
-changed script to batch, but kept script so don't catch out any early adopters.
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/AbstractKnowledgeSessionBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/AbstractKnowledgeSessionBeanFactory.java 2010-07-27 01:02:25 UTC (rev 34211)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/AbstractKnowledgeSessionBeanFactory.java 2010-07-27 02:57:20 UTC (rev 34212)
@@ -29,7 +29,7 @@
private String beanName;
private String name;
- private List<Command<?>> script;
+ private List<Command<?>> batch;
public AbstractKnowledgeSessionBeanFactory() {
super();
@@ -75,12 +75,12 @@
return true;
}
- public List<Command<?>> getScript() {
- return script;
+ public List<Command<?>> getBatch() {
+ return batch;
}
- public void setScript(List<Command<?>> commands) {
- this.script = commands;
+ public void setBatch(List<Command<?>> commands) {
+ this.batch = commands;
}
public final void afterPropertiesSet() throws Exception {
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java 2010-07-27 01:02:25 UTC (rev 34211)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java 2010-07-27 02:57:20 UTC (rev 34212)
@@ -76,8 +76,8 @@
ksession = getKbase().newStatefulKnowledgeSession( getConf(), null);
}
- if ( getScript() != null && !getScript().isEmpty()) {
- for ( Command<?> cmd : getScript() ) {
+ if ( getBatch() != null && !getBatch().isEmpty()) {
+ for ( Command<?> cmd : getBatch() ) {
ksession.execute( cmd );
}
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.java 2010-07-27 01:02:25 UTC (rev 34211)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.java 2010-07-27 02:57:20 UTC (rev 34212)
@@ -161,13 +161,17 @@
}
}
- Element script = DomUtils.getChildElementByTagName(element, "script");
- if ( script != null) {
+ Element batch = DomUtils.getChildElementByTagName(element, "batch");
+ if ( batch == null ) {
+ // just temporary legacy suppport
+ batch = DomUtils.getChildElementByTagName(element, "script");
+ }
+ if ( batch != null) {
// we know there can only ever be one
ManagedList children = new ManagedList();
- for (int i = 0, length = script.getChildNodes().getLength(); i < length; i++) {
- Node n = script.getChildNodes().item( i );
+ for (int i = 0, length = batch.getChildNodes().getLength(); i < length; i++) {
+ Node n = batch.getChildNodes().item( i );
if ( n instanceof Element ) {
Element e = ( Element ) n;
@@ -258,7 +262,7 @@
children.add( beanBuilder.getBeanDefinition() );
}
}
- factory.addPropertyValue( "script", children );
+ factory.addPropertyValue( "batch", children );
}
// find any kagent's for the current kbase and assign
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-27 01:02:25 UTC (rev 34211)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2010-07-27 02:57:20 UTC (rev 34212)
@@ -135,7 +135,7 @@
<xsd:element name="ksession">
<xsd:complexType>
<xsd:all minOccurs="0">
- <xsd:element name="script" minOccurs="0" maxOccurs="1">
+ <xsd:element name="batch" minOccurs="0" maxOccurs="1">
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="command" minOccurs="0" maxOccurs="unbounded" />
@@ -143,6 +143,14 @@
</xsd:complexType>
</xsd:element>
+ <xsd:element name="script" minOccurs="0" maxOccurs="1">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="command" minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
<xsd:element name="configuration" minOccurs="0" maxOccurs="1">
<xsd:complexType>
<xsd:all minOccurs="0">
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-27 01:02:25 UTC (rev 34211)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml 2010-07-27 02:57:20 UTC (rev 34212)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:drools="http://drools.org/schema/drools-spring"
- xmlns:drools-service="http://drools.org/schema/drools-service-spring"
+ xmlns:drools="http://drools.org/schema/drools-spring"
xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd
- http://drools.org/schema/drools-service-spring http://drools.org/schema/drools-service-spring.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="rwih1" class="org.drools.process.instance.impl.humantask.HumanTaskHandler" />
More information about the jboss-svn-commits
mailing list