[jboss-svn-commits] JBL Code SVN: r33964 - in labs/jbossrules/trunk/drools-container/drools-spring/src: main/java/org/drools/container/spring/namespace and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 16 17:56:38 EDT 2010
Author: mark.proctor at jboss.com
Date: 2010-07-16 17:56:37 -0400 (Fri, 16 Jul 2010)
New Revision: 33964
Modified:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java
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
-removed work definitions, as it's internal to Eclipse
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java 2010-07-16 21:47:33 UTC (rev 33963)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java 2010-07-16 21:56:37 UTC (rev 33964)
@@ -38,7 +38,6 @@
InitializingBean {
private KnowledgeBaseConfiguration conf;
- private Map<String, WorkDefinition> workDefinitions;
private KnowledgeBase kbase;
private ExecutionNode node;
@@ -60,11 +59,6 @@
if ( node == null ) {
node = new LocalConnection().getExecutionNode();
}
-
- if ( this.conf != null && this.workDefinitions != null && !this.workDefinitions.isEmpty() ) {
- Map<String, WorkDefinition> map = ((RuleBaseConfiguration) this.conf).getProcessWorkDefinitions();
- map.putAll( this.workDefinitions );
- }
KnowledgeBuilder kbuilder = node.get( KnowledgeBuilderFactoryService.class ).newKnowledgeBuilder();
if ( this.conf != null ) {
@@ -103,17 +97,8 @@
kbaseImpl.jaxbClasses.add( conf.getClasses() );
}
- }
-
+ }
- public Map<String, WorkDefinition> getWorkDefinitions() {
- return workDefinitions;
- }
-
- public void setWorkDefinitions(Map<String, WorkDefinition> workDefinitions) {
- this.workDefinitions = workDefinitions;
- }
-
public KnowledgeBaseConfiguration getConf() {
return conf;
}
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-16 21:47:33 UTC (rev 33963)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-07-16 21:56:37 UTC (rev 33964)
@@ -66,19 +66,6 @@
rbaseConfBuilder.addPropertyValue( "eventProcessingMode", EventProcessingOption.valueOf( e.getAttribute( "mode" ) ) );
}
- e = DomUtils.getChildElementByTagName(kbaseConf, WORK_ITEM_DEFINITIONS);
- if ( e != null ) {
- List<Element> children = DomUtils.getChildElementsByTagName( e, WORK_ITEM_DEFINITION );
- if ( children != null && !children.isEmpty() ) {
- ManagedMap workDefs = new ManagedMap();
- for ( Element child : children ) {
- workDefs.put( child.getAttribute( "name" ),
- new RuntimeBeanReference( child.getAttribute( "ref" ) ) );
- }
- factory.addPropertyValue( "workDefinitions", workDefs );
- }
- }
-
factory.addPropertyValue( "conf", rbaseConfBuilder.getBeanDefinition() );
}
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-16 21:47:33 UTC (rev 33963)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2010-07-16 21:56:37 UTC (rev 33964)
@@ -77,19 +77,7 @@
<xsd:attribute name="mode" type="cloudModeEnum"/>
</xsd:complexType>
</xsd:element>
-
- <xsd:element name="work-item-definitions" minOccurs="0">
- <xsd:complexType>
- <xsd:choice>
- <xsd:element name="work-item-definition" minOccurs="0" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- <xsd:attribute name="ref" use="required" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
+
</xsd:all>
</xsd:complexType>
</xsd:element>
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-16 21:47:33 UTC (rev 33963)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-07-16 21:56:37 UTC (rev 33964)
@@ -176,15 +176,6 @@
assertTrue( rconf.isMultithreadEvaluation() );
assertEquals( 5, rconf.getMaxThreads() );
assertEquals( EventProcessingOption.STREAM, rconf.getEventProcessingMode() );
- Map<String, WorkDefinition> wds = rconf.getProcessWorkDefinitions();
- assertEquals( 4, wds.size() );
- assertTrue( wds.containsKey( "Email" ));
- assertTrue( wds.containsKey( "Log" ));
- assertTrue( wds.containsKey( "wid1" ));
- assertTrue( wds.containsKey( "wid2" ));
- assertNotSame( wds.get( "wid1" ), wds.get( "wid2" ));
- assertEquals( org.drools.process.core.impl.WorkDefinitionImpl.class, wds.get( "wid1" ).getClass() );
- assertEquals( org.drools.process.core.impl.WorkDefinitionImpl.class, wds.get( "wid2" ).getClass() );
KnowledgeBaseImpl kbase2 = ( KnowledgeBaseImpl ) context.getBean( "kbase2" );
rconf = ((InternalRuleBase)kbase2.getRuleBase()).getConfiguration();
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-16 21:47:33 UTC (rev 33963)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/session-conf-beans.xml 2010-07-16 21:56:37 UTC (rev 33964)
@@ -8,15 +8,7 @@
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="rwid1" class="org.drools.process.core.impl.WorkDefinitionImpl">
- <property name="name" value="wid1" />
- </bean>
- <bean id="rwid2" class="org.drools.process.core.impl.WorkDefinitionImpl">
- <property name="name" value="wid2" />
- </bean>
-
<bean id="rwih1" class="org.drools.process.instance.impl.humantask.HumanTaskHandler" />
<bean id="rwih2" class="org.drools.process.instance.impl.humantask.HumanTaskHandler" />
@@ -35,11 +27,6 @@
<drools:event-processing-mode mode="STREAM" />
- <drools:work-item-definitions>
- <drools:work-item-definition name="wid1" ref="rwid1" />
- <drools:work-item-definition name="wid2" ref="rwid2" />
- </drools:work-item-definitions>
-
</drools:configuration>
</drools:kbase>
More information about the jboss-svn-commits
mailing list