[jboss-svn-commits] JBL Code SVN: r35982 - in labs/jbossrules/trunk/drools-container/drools-spring/src: test/resources/org/drools/container/spring and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2010-11-15 15:37:54 -0500 (Mon, 15 Nov 2010)
New Revision: 35982

Modified:
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java
   labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml
Log:
JBRULES-2746 Drools Grid Impl2
-<drools:whitepages /> now instantiates WhitePagesImpl() as default

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java	2010-11-15 20:27:56 UTC (rev 35981)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java	2010-11-15 20:37:54 UTC (rev 35982)
@@ -33,6 +33,7 @@
 import org.drools.grid.io.impl.MultiplexSocketServiceCongifuration;
 import org.drools.grid.remote.mina.MinaAcceptorFactoryService;
 import org.drools.grid.service.directory.impl.JpaWhitePages;
+import org.drools.grid.service.directory.impl.WhitePagesImpl;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
@@ -95,7 +96,9 @@
                             factory.addPropertyReference( "whitePages", ref );
                         } else if ( nestedElm != null  ) {
                             factory.addPropertyValue( "whitePages",  parserContext.getDelegate().parsePropertySubElement(nestedElm, null, null) );
-                        }                         
+                        } else {
+                            factory.addPropertyValue( "whitePages",  new WhitePagesImpl() );
+                        }
                     }
                 } else if ( "socket-service".equals( e.getLocalName() ) ) {
                     String acceptor = e.getAttribute( "acceptor" );

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-11-15 20:27:56 UTC (rev 35981)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml	2010-11-15 20:37:54 UTC (rev 35982)
@@ -6,7 +6,9 @@
                            http://drools.org/schema/drools-spring org/drools/container/spring/drools-spring-1.2.0.xsd
                            http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-	<drools:grid id="grid1" />
+	<drools:grid id="grid1">
+       <drools:whitepages />	
+	</drools:grid>
 	
 	<drools:grid-node id="node1" grid="grid1" />