Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r3868 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/xml test/resources/org/drools/xml
|
From: <jbo...@li...> - 2006-04-21 00:09:10
|
Author: mar...@jb...
Date: 2006-04-20 20:09:00 -0400 (Thu, 20 Apr 2006)
New Revision: 3868
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FunctionHandler.java
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_ParseLhs.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:
-removed bodies in favour of attributes
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FunctionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FunctionHandler.java 2006-04-20 23:52:28 UTC (rev 3867)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/FunctionHandler.java 2006-04-21 00:09:00 UTC (rev 3868)
@@ -88,9 +88,9 @@
xmlPackageReader.getLocator() );
}
- String type = parameters[i].getText();
+ String type = parameters[i].getAttribute( "type" );
if ( type == null || type.trim().equals( "" ) ) {
- throw new SAXParseException( "function's <parameter> must specify a 'type'",
+ throw new SAXParseException( "function's <parameter> requires an 'type' attribute",
xmlPackageReader.getLocator() );
}
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-20 23:52:28 UTC (rev 3867)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/PackageHandler.java 2006-04-21 00:09:00 UTC (rev 3868)
@@ -86,13 +86,13 @@
for ( int i = 0, length = globals.length; i < length; i++ ) {
String identifier = globals[i].getAttribute( "identifier" );
- String type = globals[i].getText();
if ( identifier == null || identifier.trim().equals( "" ) ) {
throw new SAXParseException( "<global> must have an identifier",
xmlPackageReader.getLocator() );
}
+ String type = globals[i].getAttribute( "type" );
if ( type == null || type.trim().equals( "" ) ) {
throw new SAXParseException( "<global> must have specify a type",
xmlPackageReader.getLocator() );
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-20 23:52:28 UTC (rev 3867)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseFunction.xml 2006-04-21 00:09:00 UTC (rev 3868)
@@ -2,16 +2,15 @@
<import>java.util.HashMap</import>
<import>org.drools.*</import>
- <global identifier="x">com.sample.X</global>
- <global identifier="yada">com.sample.Yada</global>
+ <global identifier="x" type="com.sample.X" />
+ <global identifier="yada" type="com.sample.Yada" />
<function return-type="void" name="myFunc">
- <parameter identifier="foo">Bar</parameter>
- <parameter identifier="bada">Bing</parameter>
+ <parameter identifier="foo" type="Bar" />
+ <parameter identifier="bada" type="Bing" />
<body>
System.out.println("hello world");
- </body>
-
+ </body>
</function>
</package>
\ No newline at end of file
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-20 23:52:28 UTC (rev 3867)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseGlobal.xml 2006-04-21 00:09:00 UTC (rev 3868)
@@ -2,6 +2,6 @@
<import>java.util.HashMap</import>
<import>org.drools.*</import>
- <global identifier="x">com.sample.X</global>
- <global identifier="yada">com.sample.Yada</global>
+ <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_ParseLhs.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml 2006-04-20 23:52:28 UTC (rev 3867)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseLhs.xml 2006-04-21 00:09:00 UTC (rev 3868)
@@ -2,17 +2,16 @@
<import>java.util.HashMap</import>
<import>org.drools.*</import>
- <global identifier="x">com.sample.X</global>
- <global identifier="yada">com.sample.Yada</global>
+ <global identifier="x" type="com.sample.X" />
+ <global identifier="yada" type="com.sample.Yada" />
<function return-type="void" name="myFunc">
- <parameter identifier="foo">Bar</parameter>
- <parameter identifier="bada">Bing</parameter>
+ <parameter identifier="foo" type="Bar" />
+ <parameter identifier="bada" type="Bing" />
<body>
System.out.println("hello world");
- </body>
-
+ </body>
</function>
<rule name="my rule">
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-20 23:52:28 UTC (rev 3867)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseQuery.xml 2006-04-21 00:09:00 UTC (rev 3868)
@@ -2,17 +2,16 @@
<import>java.util.HashMap</import>
<import>org.drools.*</import>
- <global identifier="x">com.sample.X</global>
- <global identifier="yada">com.sample.Yada</global>
+ <global identifier="x" type="com.sample.X" />
+ <global identifier="yada" type="com.sample.Yada" />
<function return-type="void" name="myFunc">
- <parameter identifier="foo">Bar</parameter>
- <parameter identifier="bada">Bing</parameter>
+ <parameter identifier="foo" type="Bar" />
+ <parameter identifier="bada" type="Bing" />
<body>
System.out.println("hello world");
- </body>
-
+ </body>
</function>
<query name="my query">
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-20 23:52:28 UTC (rev 3867)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRhs.xml 2006-04-21 00:09:00 UTC (rev 3868)
@@ -2,17 +2,16 @@
<import>java.util.HashMap</import>
<import>org.drools.*</import>
- <global identifier="x">com.sample.X</global>
- <global identifier="yada">com.sample.Yada</global>
+ <global identifier="x" type="com.sample.X" />
+ <global identifier="yada" type="com.sample.Yada" />
<function return-type="void" name="myFunc">
- <parameter identifier="foo">Bar</parameter>
- <parameter identifier="bada">Bing</parameter>
+ <parameter identifier="foo" type="Bar" />
+ <parameter identifier="bada" type="Bing" />
<body>
System.out.println("hello world");
- </body>
-
+ </body>
</function>
<rule name="my rule">
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-20 23:52:28 UTC (rev 3867)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_ParseRule.xml 2006-04-21 00:09:00 UTC (rev 3868)
@@ -2,21 +2,20 @@
<import>java.util.HashMap</import>
<import>org.drools.*</import>
- <global identifier="x">com.sample.X</global>
- <global identifier="yada">com.sample.Yada</global>
+ <global identifier="x" type="com.sample.X" />
+ <global identifier="yada" type="com.sample.Yada" />
<function return-type="void" name="myFunc">
- <parameter identifier="foo">Bar</parameter>
- <parameter identifier="bada">Bing</parameter>
+ <parameter identifier="foo" type="Bar" />
+ <parameter identifier="bada" type="Bing" />
<body>
System.out.println("hello world");
- </body>
-
+ </body>
</function>
<rule name="my rule">
- <attribute name="salience" value="10" />
+ <rule-attribute name="salience" value="10" />
<lhs>
<column object-type="Foo" />
|
