[jboss-svn-commits] JBL Code SVN: r33937 - 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]

Author: mark.proctor at jboss.com
Date: 2010-07-16 07:36:13 -0400 (Fri, 16 Jul 2010)
New Revision: 33937

Modified:
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/ExecutionNodeBeanFactory.java
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ExecutionNodeDefinitionParser.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/beans.xml
Log:
JBRULES-1434 Drools Spring
-Execution-Nodes should not need a connection, default to local.

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/ExecutionNodeBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/ExecutionNodeBeanFactory.java	2010-07-16 11:07:19 UTC (rev 33936)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/ExecutionNodeBeanFactory.java	2010-07-16 11:36:13 UTC (rev 33937)
@@ -2,6 +2,7 @@
 
 import org.drools.grid.ExecutionNode;
 import org.drools.grid.generic.GenericConnection;
+import org.drools.grid.local.LocalConnection;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 
@@ -16,7 +17,7 @@
     InitializingBean {
 
     private String            id;
-    private GenericConnection connection;
+    private GenericConnection connection = new LocalConnection();
     private ExecutionNode     node;
 
     public Object getObject() throws Exception {

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ExecutionNodeDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ExecutionNodeDefinitionParser.java	2010-07-16 11:07:19 UTC (rev 33936)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ExecutionNodeDefinitionParser.java	2010-07-16 11:36:13 UTC (rev 33937)
@@ -7,6 +7,7 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 /**
@@ -25,11 +26,10 @@
         BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition( ExecutionNodeBeanFactory.class );
 
         String connectionRef = element.getAttribute( CONNECTION_ATTRIBUTE );
-        emptyAttributeCheck( element.getLocalName(),
-                             CONNECTION_ATTRIBUTE,
-                             connectionRef );
-        factory.addPropertyReference( "connection",
-                                      connectionRef );
+        if ( StringUtils.hasText( connectionRef ) ) {
+            factory.addPropertyReference( "connection",
+                                          connectionRef );
+        }
 
         return factory.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 11:07:19 UTC (rev 33936)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd	2010-07-16 11:36:13 UTC (rev 33937)
@@ -15,7 +15,7 @@
 	<xsd:element name="execution-node">
 		<xsd:complexType>
 			<xsd:attribute name="id" use="required" type="xsd:ID"/>
-			<xsd:attribute name="connection" use="required" type="xsd:string"/>
+			<xsd:attribute name="connection" use="optional" type="xsd:string"/>
 		</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 11:07:19 UTC (rev 33936)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java	2010-07-16 11:36:13 UTC (rev 33937)
@@ -48,6 +48,13 @@
     protected void tearDown() throws Exception {
     }
     
+    public void testNoConnection() throws Exception {
+            ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/beans.xml" );
+
+            ExecutionNode node2 = (ExecutionNode) context.getBean( "node2" );
+            assertNotNull( node2 );
+    }
+    
     public void testNoNodeKSessions() throws Exception {
         ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/no-node-beans.xml" );
 

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml	2010-07-16 11:07:19 UTC (rev 33936)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml	2010-07-16 11:36:13 UTC (rev 33937)
@@ -10,6 +10,8 @@
 	
 	<drools:execution-node id="node1" connection="connection1" />
 	
+	<drools:execution-node id="node2" />
+	
 	<drools:resource id="resource1" type="DRL" source="classpath:org/drools/container/spring/testSpring.drl"/>
 	
 	<drools:kbase id="kbase1" node="node1">