[jboss-svn-commits] JBL Code SVN: r30514 - in labs/jbossrules/trunk/drools-container/drools-spring/src: main/resources/META-INF and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Dec 7 13:42:16 EST 2009
Author: baunax
Date: 2009-12-07 13:42:16 -0500 (Mon, 07 Dec 2009)
New Revision: 30514
Added:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd
Removed:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/drools-spring.xsd
Modified:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.schemas
labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml
Log:
JBRULES-1434:
- moved the schema to its own package.
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.schemas
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.schemas 2009-12-07 18:32:22 UTC (rev 30513)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/META-INF/spring.schemas 2009-12-07 18:42:16 UTC (rev 30514)
@@ -1 +1 @@
-http\://drools.org/schema/drools-spring=spring-drools.xsd
\ No newline at end of file
+http\://drools.org/schema/drools-spring.xsd=org/drools/container/spring/drools-spring.xsd
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/drools-spring.xsd
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/drools-spring.xsd 2009-12-07 18:32:22 UTC (rev 30513)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/drools-spring.xsd 2009-12-07 18:42:16 UTC (rev 30514)
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://drools.org/schema/drools-spring"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://drools.org/schema/drools-spring"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified">
-
- <xsd:simpleType name="knowledgeSessionTypeEnum">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="stateful" />
- <xsd:enumeration value="stateless" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="resourceTypeEnum">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="DRL" />
- <xsd:enumeration value="XDRL" />
- <xsd:enumeration value="DSL" />
- <xsd:enumeration value="DSLR" />
- <xsd:enumeration value="DRF" />
- <xsd:enumeration value="DTABLE" />
- <xsd:enumeration value="PKG" />
- <xsd:enumeration value="BRL" />
- <xsd:enumeration value="CHANGE_SET" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:complexType name="resourceType">
- <xsd:sequence>
- <xsd:element name="decisiontable-conf" minOccurs="0" maxOccurs="1">
- <xsd:complexType>
- <xsd:attribute name="input-type" use="required" />
- <xsd:attribute name="worksheet-name " use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="source" use="required" type="xsd:string"/>
- <xsd:attribute name="type" use="required" type="resourceTypeEnum"/>
- </xsd:complexType>
-
- <xsd:element name="resource">
- <xsd:complexType>
- <xsd:complexContent>
- <xsd:extension base="resourceType">
- <xsd:attribute name="id" use="optional" type="xsd:ID"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="kbase">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="resource" type="resourceType" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" use="optional" type="xsd:ID"/>
- <xsd:attribute name="serviceManager" use="optional" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="ksession">
- <xsd:complexType>
- <xsd:attribute name="type" use="required" type="knowledgeSessionTypeEnum"/>
- <xsd:attribute name="kbase" use="required" type="xsd:string"/>
- <xsd:attribute name="id" use="optional" type="xsd:ID"/>
- <xsd:attribute name="serviceManager" use="optional" type="xsd:string"/>
- <xsd:attribute name="name" use="optional" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
-
- <!--
- <xsd:element name="serviceManager">
-
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="register" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:attribute name="name" use="optional" />
- <xsd:attribute name="ref" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" use="required" />
- <xsd:attribute name="class" default="org.drools.vsm.local.ServiceManagerLocalClient" use="optional" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
- -->
-
-</xsd:schema>
Copied: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd (from rev 30510, labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/drools-spring.xsd)
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd 2009-12-07 18:42:16 UTC (rev 30514)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://drools.org/schema/drools-spring"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://drools.org/schema/drools-spring"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified">
+
+ <xsd:simpleType name="knowledgeSessionTypeEnum">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="stateful" />
+ <xsd:enumeration value="stateless" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="resourceTypeEnum">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="DRL" />
+ <xsd:enumeration value="XDRL" />
+ <xsd:enumeration value="DSL" />
+ <xsd:enumeration value="DSLR" />
+ <xsd:enumeration value="DRF" />
+ <xsd:enumeration value="DTABLE" />
+ <xsd:enumeration value="PKG" />
+ <xsd:enumeration value="BRL" />
+ <xsd:enumeration value="CHANGE_SET" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="resourceType">
+ <xsd:sequence>
+ <xsd:element name="decisiontable-conf" minOccurs="0" maxOccurs="1">
+ <xsd:complexType>
+ <xsd:attribute name="input-type" use="required" />
+ <xsd:attribute name="worksheet-name " use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="source" use="required" type="xsd:string"/>
+ <xsd:attribute name="type" use="required" type="resourceTypeEnum"/>
+ </xsd:complexType>
+
+ <xsd:element name="resource">
+ <xsd:complexType>
+ <xsd:complexContent>
+ <xsd:extension base="resourceType">
+ <xsd:attribute name="id" use="optional" type="xsd:ID"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="kbase">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="resource" type="resourceType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" use="optional" type="xsd:ID"/>
+ <xsd:attribute name="serviceManager" use="optional" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="ksession">
+ <xsd:complexType>
+ <xsd:attribute name="type" use="required" type="knowledgeSessionTypeEnum"/>
+ <xsd:attribute name="kbase" use="required" type="xsd:string"/>
+ <xsd:attribute name="id" use="optional" type="xsd:ID"/>
+ <xsd:attribute name="serviceManager" use="optional" type="xsd:string"/>
+ <xsd:attribute name="name" use="optional" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+
+ <!--
+ <xsd:element name="serviceManager">
+
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="register" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:attribute name="name" use="optional" />
+ <xsd:attribute name="ref" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" use="required" />
+ <xsd:attribute name="class" default="org.drools.vsm.local.ServiceManagerLocalClient" use="optional" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ -->
+
+</xsd:schema>
Property changes on: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring.xsd
___________________________________________________________________
Name: svn:mergeinfo
+
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 2009-12-07 18:32:22 UTC (rev 30513)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml 2009-12-07 18:42:16 UTC (rev 30514)
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:drools="http://drools.org/schema/drools-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 drools-spring.xsd">
+ http://drools.org/schema/drools-spring http://drools.org/schema/drools-spring.xsd">
<bean id="sm1" class="org.drools.vsm.local.ServiceManagerLocalClient" />
@@ -20,22 +20,4 @@
<drools:ksession id="ksession2" type="stateful"
kbase="kbase1" serviceManager="sm1"/>
-
- <!-- <drools:kbase id="kbase1" >
- <drools:resource source='classpath:org/drools/container/spring/testSpring.drl' type='DRL' />
- <drools:resource source='classpath:org/drools/container/spring/IntegrationExampleTest.xls' type="DTABLE">
- <drools:decisiontable-conf input-type="XLS" worksheet-name="Tables_2" />
- </drools:resource>
- </drools:kbase>
-
- <drools:ksession id="ksession1" type="stateless" kbase="kbase1" />
-
- <drools:ksession id="ksession2" type="stateful" kbase="kbase1" />
-
- <drools:serviceManager id="sm1">
- <drools:register name="stateless1" ref="ksession1" />
- <drools:register ref="ksession2" />
- </drools:serviceManager>
-
- -->
</beans>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list