Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r3874 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/xml main/resources main/resources/META-INF test/resources/org/drools/xml
Author: /services/jbf-svn/code/hooks/commit-email-two.pl: `/opt/subversion/bin/svnlook info /services/jbf-svn/code -r 3874' failed with this output:
Date: svnlook: Inconsistent line ending style
New Revision: 3874
Added:
labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/
labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFunction.xml
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseGlobal.xml
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseImport.xml
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParsePackageName.xml
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseQuery.xml
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRhs.xml
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRule.xml
Log:
2006-04-20 21:54:06 -0400 (Thu, 20 Apr 2006)
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java 2006-04-21 01:54:06 UTC (rev 3874)
@@ -73,7 +73,7 @@
Configuration[] imports = config.getChildren( "import" );
for ( int i = 0, length = imports.length; i < length; i++ ) {
- String importEntry = imports[i].getText();
+ String importEntry = imports[i].getAttribute( "name" );
if ( importEntry == null || importEntry.trim().equals( "" ) ) {
throw new SAXParseException( "<import> cannot be blank",
Added: labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/META-INF/drools-3.0.xsd 2006-04-21 01:54:06 UTC (rev 3874)
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:drools="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ targetNamespace="http://drools.org/drools-3.0">
+
+ <xs:element name="package">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded" minOccurs="0">
+ <xs:element ref="drools:import"/>
+
+ <xs:element ref="drools:global"/>
+
+ <xs:element ref="drools:function"/>
+
+ <xs:element ref="drools:rule"/>
+
+ <xs:element ref="drools:query"/>
+ </xs:choice>
+
+ <xs:attribute name="name" type="xs:string" use="required"/>
+
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="rule">
+ <xs:complexType>
+ <xs:sequence>
+
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="drools:rule-attribute"/>
+
+ <xs:element ref="drools:lhs"/>
+
+ <xs:element ref="drools:rhs"/>
+
+ </xs:sequence>
+
+ <xs:attribute name="name" type="xs:string" use="required"/>
+
+ </xs:complexType>
+
+ <!-- All rules must have unique names -->
+ <xs:key name="ruleName">
+ <xs:selector xpath="drools:rule"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ </xs:element>
+
+ <xs:element name="query">
+ <xs:complexType>
+ <xs:sequence>
+
+ <xs:element ref="drools:lhs"/>
+
+ </xs:sequence>
+
+ <xs:attribute name="name" type="xs:string" use="required"/>
+
+ </xs:complexType>
+
+ <!-- All rules must have unique names -->
+ <xs:key name="queryName">
+ <xs:selector xpath="drools:query"/>
+ <xs:field xpath="@name"/>
+ </xs:key>
+ </xs:element>
+
+ <xs:element name="rule-attribute">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+
+ <xs:element name="import">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="global">
+ <xs:complexType>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ <xs:attribute name="identifier" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="function">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="drools:parameter"/>
+ <xs:element name="body" type="xs:string"/>
+ </xs:sequence>
+
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="return-type" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="parameter">
+ <xs:complexType>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ <xs:attribute name="identifier" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+
+ <xs:element name="rhs" type="xs:string"/>
+
+ <xs:element name="lhs">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded" minOccurs="0">
+ <xs:element ref="drools:and"/>
+ <xs:element ref="drools:or"/>
+ <xs:element ref="drools:not"/>
+ <xs:element ref="drools:exists"/>
+ <xs:element ref="drools:eval"/>
+ <xs:element ref="drools:column"/>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="and">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded" minOccurs="0">
+ <xs:element ref="drools:and"/>
+ <xs:element ref="drools:or"/>
+ <xs:element ref="drools:not"/>
+ <xs:element ref="drools:exists"/>
+ <xs:element ref="drools:eval"/>
+ <xs:element ref="drools:column"/>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="or">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded" minOccurs="0">
+ <xs:element ref="drools:and"/>
+ <xs:element ref="drools:or"/>
+ <xs:element ref="drools:not"/>
+ <xs:element ref="drools:exists"/>
+ <xs:element ref="drools:eval"/>
+ <xs:element ref="drools:column"/>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="not">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="drools:column"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="exists">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="drools:column"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="eval">
+ <xs:complexType>
+ <xs:attribute name="expression" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="column">
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded" minOccurs="0">
+ <xs:element ref="drools:field-binding"/>
+ <xs:element ref="drools:literal"/>
+ <xs:element ref="drools:predicate"/>
+ <xs:element ref="drools:return-value"/>
+ <xs:element ref="drools:bound-variable"/>
+ </xs:choice>
+ <xs:attribute name="identifier" type="xs:string" use="optional"/>
+ <xs:attribute name="object-type" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="field-binding">
+ <xs:complexType>
+ <xs:attribute name="field-name" type="xs:string" use="required"/>
+ <xs:attribute name="identifier" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="literal">
+ <xs:complexType>
+ <xs:attribute name="field-name" type="xs:string" use="required"/>
+ <xs:attribute name="evaluator" type="xs:string" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="predicate">
+ <xs:complexType>
+ <xs:attribute name="field-name" type="xs:string" use="required"/>
+ <xs:attribute name="identifier" type="xs:string" use="required"/>
+ <xs:attribute name="expression" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="return-value">
+ <xs:complexType>
+ <xs:attribute name="field-name" type="xs:string" use="required"/>
+ <xs:attribute name="evaluator" type="xs:string" use="required"/>
+ <xs:attribute name="expression" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="bound-variable">
+ <xs:complexType>
+ <xs:attribute name="field-name" type="xs:string" use="required"/>
+ <xs:attribute name="evaluator" type="xs:string" use="required"/>
+ <xs:attribute name="identifier" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFunction.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFunction.xml 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFunction.xml 2006-04-21 01:54:06 UTC (rev 3874)
@@ -1,6 +1,11 @@
-<package name="com.sample">
- <import>java.util.HashMap</import>
- <import>org.drools.*</import>
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="com.sample"
+ xmlns="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd">
+
+ <import name="java.util.HashMap" />
+ <import name="org.drools.*" />
<global identifier="x" type="com.sample.X" />
<global identifier="yada" type="com.sample.Yada" />
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseGlobal.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseGlobal.xml 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseGlobal.xml 2006-04-21 01:54:06 UTC (rev 3874)
@@ -1,7 +1,13 @@
-<package name="com.sample">
- <import>java.util.HashMap</import>
- <import>org.drools.*</import>
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="com.sample"
+ xmlns="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd">
+
+ <import name="java.util.HashMap" />
+ <import name="org.drools.*" />
+
<global identifier="x" type="com.sample.X" />
<global identifier="yada" type="com.sample.Yada" />
</package>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseImport.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseImport.xml 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseImport.xml 2006-04-21 01:54:06 UTC (rev 3874)
@@ -1,4 +1,9 @@
-<package name="com.sample">
- <import>java.util.HashMap</import>
- <import>org.drools.*</import>
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="com.sample"
+ xmlns="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd">
+
+ <import name="java.util.HashMap" />
+ <import name="org.drools.*" />
</package>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml 2006-04-21 01:54:06 UTC (rev 3874)
@@ -1,6 +1,11 @@
-<package name="com.sample">
- <import>java.util.HashMap</import>
- <import>org.drools.*</import>
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="com.sample"
+ xmlns="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd">
+
+ <import name="java.util.HashMap" />
+ <import name="org.drools.*" />
<global identifier="x" type="com.sample.X" />
<global identifier="yada" type="com.sample.Yada" />
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParsePackageName.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParsePackageName.xml 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParsePackageName.xml 2006-04-21 01:54:06 UTC (rev 3874)
@@ -1,3 +1,6 @@
-<package name="com.sample">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="com.sample"
+ xmlns="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd">
</package>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseQuery.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseQuery.xml 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseQuery.xml 2006-04-21 01:54:06 UTC (rev 3874)
@@ -1,6 +1,11 @@
-<package name="com.sample">
- <import>java.util.HashMap</import>
- <import>org.drools.*</import>
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="com.sample"
+ xmlns="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd">
+
+ <import name="java.util.HashMap" />
+ <import name="org.drools.*" />
<global identifier="x" type="com.sample.X" />
<global identifier="yada" type="com.sample.Yada" />
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRhs.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRhs.xml 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRhs.xml 2006-04-21 01:54:06 UTC (rev 3874)
@@ -1,6 +1,11 @@
-<package name="com.sample">
- <import>java.util.HashMap</import>
- <import>org.drools.*</import>
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="com.sample"
+ xmlns="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd">
+
+ <import name="java.util.HashMap" />
+ <import name="org.drools.*" />
<global identifier="x" type="com.sample.X" />
<global identifier="yada" type="com.sample.Yada" />
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRule.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRule.xml 2006-04-21 01:43:23 UTC (rev 3873)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRule.xml 2006-04-21 01:54:06 UTC (rev 3874)
@@ -1,6 +1,11 @@
-<package name="com.sample">
- <import>java.util.HashMap</import>
- <import>org.drools.*</import>
+<?xml version="1.0" encoding="UTF-8"?>
+<package name="com.sample"
+ xmlns="http://drools.org/drools-3.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd">
+
+ <import name="java.util.HashMap" />
+ <import name="org.drools.*" />
<global identifier="x" type="com.sample.X" />
<global identifier="yada" type="com.sample.Yada" />
|
