[jboss-svn-commits] JBL Code SVN: r33938 - in labs/jbossrules/trunk/drools-container/drools-spring/src: main/resources/org/drools/container/spring and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 16 07:50:51 EDT 2010
Author: mark.proctor at jboss.com
Date: 2010-07-16 07:50:50 -0400 (Fri, 16 Jul 2010)
New Revision: 33938
Removed:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.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/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.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/beans.xml
Log:
JBRULES-1434 Drools Spring
-kill resource-ref, use resource ref="..." instead
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 11:36:13 UTC (rev 33937)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-07-16 11:50:50 UTC (rev 33938)
@@ -119,19 +119,6 @@
}
}
- childElements = DomUtils.getChildElementsByTagName( resourcesElm,
- "resource-ref" );
-
- if ( childElements != null && !childElements.isEmpty() ) {
- if ( resources == null ) {
- resources = new ManagedList( childElements.size() );
- }
- for ( Element childResource : childElements ) {
- BeanDefinition resourceDefinition = parserContext.getDelegate().parseCustomElement( childResource,
- factory.getBeanDefinition() );
- resources.add( resourceDefinition );
- }
- }
}
return resources;
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java 2010-07-16 11:36:13 UTC (rev 33937)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java 2010-07-16 11:50:50 UTC (rev 33938)
@@ -1,5 +1,7 @@
package org.drools.container.spring.namespace;
+import static org.drools.container.spring.namespace.DefinitionParserHelper.emptyAttributeCheck;
+
import java.util.List;
import org.drools.builder.DecisionTableInputType;
@@ -12,6 +14,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.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -22,6 +25,7 @@
private static final String INPUT_TYPE_ATTRIBUTE = "input-type";
private static final String TYPE_ATTRIBUTE = "type";
private static final String SOURCE_ATTRIBUTE = "source";
+ private static final String REF = "ref";
@SuppressWarnings("unchecked")
@@ -29,6 +33,14 @@
protected AbstractBeanDefinition parseInternal(Element element,
ParserContext parserContext) {
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition( DroolsResourceAdapter.class );
+
+ if ( StringUtils.hasText( element.getAttribute( REF ) )) {
+ String ref = element.getAttribute( REF);
+ emptyAttributeCheck( element.getLocalName(),
+ REF,
+ ref );
+ return (AbstractBeanDefinition) parserContext.getRegistry().getBeanDefinition( ref );
+ }
String source = element.getAttribute( SOURCE_ATTRIBUTE );
emptyAttributeCheck( element.getLocalName(),
Deleted: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.java 2010-07-16 11:36:13 UTC (rev 33937)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceRefDefinitionParser.java 2010-07-16 11:50:50 UTC (rev 33938)
@@ -1,23 +0,0 @@
-package org.drools.container.spring.namespace;
-
-import static org.drools.container.spring.namespace.DefinitionParserHelper.emptyAttributeCheck;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
-public class ResourceRefDefinitionParser extends AbstractBeanDefinitionParser {
-
- private static final String ID_ATTRIBUTE = "id";
-
- @Override
- protected AbstractBeanDefinition parseInternal(Element element,
- ParserContext parserContext) {
- String id = element.getAttribute( ID_ATTRIBUTE );
- emptyAttributeCheck( element.getLocalName(),
- ID_ATTRIBUTE,
- id );
- return (AbstractBeanDefinition) parserContext.getRegistry().getBeanDefinition( id );
- }
-}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java 2010-07-16 11:36:13 UTC (rev 33937)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java 2010-07-16 11:50:50 UTC (rev 33938)
@@ -9,9 +9,6 @@
registerBeanDefinitionParser( "resource",
new ResourceDefinitionParser() );
- registerBeanDefinitionParser( "resource-ref",
- new ResourceRefDefinitionParser() );
-
registerBeanDefinitionParser( "resource-change-scanner",
new ResourceChangeScannerDefinitionParser() );
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:36:13 UTC (rev 33937)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2010-07-16 11:50:50 UTC (rev 33938)
@@ -30,7 +30,6 @@
<xsd:complexType>
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element ref="resource" />
- <xsd:element ref="resource-ref" />
</xsd:choice>
</xsd:complexType>
</xsd:element>
@@ -45,7 +44,6 @@
</xsd:complexType>
</xsd:element>
- <xsd:element name="resource-ref" type="resourceRefType" />
<xsd:element name="kbase">
<xsd:complexType>
@@ -238,8 +236,9 @@
</xsd:complexType>
</xsd:element>
</xsd:choice>
- <xsd:attribute name="source" use="required" type="xsd:string"/>
- <xsd:attribute name="type" use="required" type="resourceTypeEnum"/>
+ <xsd:attribute name="source" use="optional" type="xsd:string"/>
+ <xsd:attribute name="type" use="optional" type="resourceTypeEnum"/>
+ <xsd:attribute name="ref" use="optional" type="xsd:string"/>
</xsd:complexType>
<xsd:complexType name="resourceRefType">
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:36:13 UTC (rev 33937)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml 2010-07-16 11:50:50 UTC (rev 33938)
@@ -20,7 +20,7 @@
<drools:decisiontable-conf input-type="XLS" worksheet-name="Tables_2" />
</drools:resource>
- <drools:resource-ref id="resource1"/>
+ <drools:resource ref="resource1"/>
<drools:resource source="classpath:org/drools/container/spring/model.xsd" type="XSD">
<drools:jaxb-conf system-id="xsd" />
More information about the jboss-svn-commits
mailing list