svn commit: r735697 - in /ofbiz/site/dtds: simple-methods.xsd site-conf.xsd widget-form.xsd widget-menu.xsd widget-screen.xsd widget-tree.xsd

Author: jleroux
Date: Mon Jan 19 06:18:22 2009
New Revision: 735697

URL: http://svn.apache.org/viewvc?rev=735697&view=rev
Log:
Updated from trunk

Modified:
    ofbiz/site/dtds/simple-methods.xsd
    ofbiz/site/dtds/site-conf.xsd
    ofbiz/site/dtds/widget-form.xsd
    ofbiz/site/dtds/widget-menu.xsd
    ofbiz/site/dtds/widget-screen.xsd
    ofbiz/site/dtds/widget-tree.xsd

Modified: ofbiz/site/dtds/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?rev=735697&r1=735696&r2=735697&view=diff
==============================================================================
--- ofbiz/site/dtds/simple-methods.xsd (original)
+++ ofbiz/site/dtds/simple-methods.xsd Mon Jan 19 06:18:22 2009
@@ -4523,7 +4523,7 @@
         <xs:attribute type="xs:string" name="field" use="required">
             <xs:annotation><xs:documentation>The name (key) of the map (or env if map-name is empty) field to use.</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute name="type" default="Double">
+        <xs:attribute name="type" default="BigDecimal">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="String"/>

Modified: ofbiz/site/dtds/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/site-conf.xsd?rev=735697&r1=735696&r2=735697&view=diff
==============================================================================
--- ofbiz/site/dtds/site-conf.xsd (original)
+++ ofbiz/site/dtds/site-conf.xsd Mon Jan 19 06:18:22 2009
@@ -26,6 +26,7 @@
                 <xs:element minOccurs="0" ref="owner"/>
                 <xs:element minOccurs="0" ref="errorpage"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="handler"/>
+                <xs:element minOccurs="0" maxOccurs="1" ref="protect"/>
                 <xs:element minOccurs="0" ref="firstvisit"/>
                 <xs:element minOccurs="0" ref="preprocessor"/>
                 <xs:element minOccurs="0" ref="postprocessor"/>
@@ -74,6 +75,14 @@
         </xs:attribute>
         <xs:attribute type="xs:string" name="class" use="required"/>
     </xs:attributeGroup>
+    <xs:element name="protect">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.protect"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.protect">
+        <xs:attribute type="xs:string" name="view" use="required"/>
+    </xs:attributeGroup>
     <xs:element name="firstvisit">
         <xs:complexType>
             <xs:sequence>

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=735697&r1=735696&r2=735697&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Mon Jan 19 06:18:22 2009
@@ -1089,9 +1089,9 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:double" name="frequency" default="0.4"/>
-        <xs:attribute type="xs:positiveInteger" name="min-chars" default="1"/>
-        <xs:attribute type="xs:positiveInteger" name="choices" default="10"/>
+        <xs:attribute name="frequency" type="xs:double" default="0.4"/>
+        <xs:attribute name="min-chars" type="xs:positiveInteger" default="1"/>
+        <xs:attribute name="choices" type="xs:positiveInteger" default="10"/>
         <xs:attribute name="partial-search" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -1100,7 +1100,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:positiveInteger" name="partial-chars" default="2"/>
+        <xs:attribute name="partial-chars" type="xs:positiveInteger" default="1"/>
         <xs:attribute name="ignore-case" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -1109,7 +1109,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="full-search" default="false">
+        <xs:attribute name="full-search" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -1440,12 +1440,12 @@
     </xs:element>
     <xs:attributeGroup name="attlist.service">
         <xs:attribute type="xs:string" name="service-name" use="required"/>
-        <xs:attribute type="xs:string" name="result-map-name"/>
+        <xs:attribute type="xs:string" name="result-map"/>
         <xs:attribute type="xs:string" name="auto-field-map" default="true">
             <xs:annotation><xs:documentation>This can be "true", "false" or the name of a Map in the context to use as the source Map for the service context.</xs:documentation></xs:annotation>
         </xs:attribute>
         <!-- this is deprecated and should not be used; use result-map-list-name instead: <xs:attribute type="xs:string" name="result-map-list-iterator-name"/> -->
-        <xs:attribute type="xs:string" name="result-map-list-name"/>
+        <xs:attribute type="xs:string" name="result-map-list"/>
     </xs:attributeGroup>
     <xs:element name="set" substitutionGroup="AllActions">
         <xs:complexType>
@@ -1502,8 +1502,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.entity-and">
-        <xs:attribute type="xs:string" name="entity-name" use="required"/>
-        <xs:attribute type="xs:string" name="list-name" use="optional"/>
+        <xs:attribute name="entity-name" type="xs:string" use="required"/>
+        <xs:attribute name="list" type="xs:string" use="optional"/>
         <xs:attribute name="use-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -1551,8 +1551,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.entity-condition">
-        <xs:attribute type="xs:string" name="entity-name" use="required"/>
-        <xs:attribute type="xs:string" name="list-name" use="optional"/>
+        <xs:attribute name="entity-name" type="xs:string" use="required"/>
+        <xs:attribute name="list" type="xs:string" use="optional"/>
         <xs:attribute name="use-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -1599,7 +1599,7 @@
     </xs:element>
     <xs:attributeGroup name="attlist.entity-one">
         <xs:attribute type="xs:string" name="entity-name" use="required"/>
-        <xs:attribute type="xs:string" name="value-name"/>
+        <xs:attribute type="xs:string" name="value-field"/>
         <xs:attribute name="use-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -1624,7 +1624,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-expr">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute name="field-name" type="xs:string" use="required"/>
         <xs:attribute name="operator" default="equals">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -1640,8 +1640,8 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="env-name"/>
-        <xs:attribute type="xs:string" name="value"/>
+        <xs:attribute name="from-field" type="xs:string"/>
+        <xs:attribute name="value" type="xs:string"/>
         <xs:attribute name="ignore-if-null" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -1701,7 +1701,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-object">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="field" use="required"/>
     </xs:attributeGroup>
     <xs:element name="field-map">
         <xs:complexType>
@@ -1710,7 +1710,7 @@
     </xs:element>
     <xs:attributeGroup name="attlist.field-map">
         <xs:attribute type="xs:string" name="field-name" use="required"/>
-        <xs:attribute type="xs:string" name="env-name"/>
+        <xs:attribute type="xs:string" name="from-field"/>
         <xs:attribute type="xs:string" name="value"/>
     </xs:attributeGroup>
     <xs:element name="having-condition-list">

Modified: ofbiz/site/dtds/widget-menu.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-menu.xsd?rev=735697&r1=735696&r2=735697&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-menu.xsd (original)
+++ ofbiz/site/dtds/widget-menu.xsd Mon Jan 19 06:18:22 2009
@@ -468,7 +468,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-validate-method">
-        <xs:attribute name="field-name" use="required"/>
+        <xs:attribute name="field" use="required"/>
         <xs:attribute name="method" use="required"/>
         <xs:attribute name="class" default="org.ofbiz.base.util.UtilValidate"/>
     </xs:attributeGroup>
@@ -478,7 +478,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-compare">
-        <xs:attribute name="field-name" use="required"/>
+        <xs:attribute name="field" use="required"/>
         <xs:attribute name="operator" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -519,7 +519,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-compare-field">
-        <xs:attribute name="field-name" use="required"/>
+        <xs:attribute name="field" use="required"/>
         <xs:attribute name="operator" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -533,7 +533,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="to-field-name"/>
+        <xs:attribute name="to-field"/>
         <xs:attribute name="type" default="String">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -560,7 +560,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-regexp">
-        <xs:attribute name="field-name" use="required"/>
+        <xs:attribute name="field" use="required"/>
         <xs:attribute name="expr" use="required"/>
     </xs:attributeGroup>
     <xs:element name="if-empty" substitutionGroup="AllConditionals">

Modified: ofbiz/site/dtds/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=735697&r1=735696&r2=735697&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-screen.xsd (original)
+++ ofbiz/site/dtds/widget-screen.xsd Mon Jan 19 06:18:22 2009
@@ -196,7 +196,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-validate-method">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="field" use="required"/>
         <xs:attribute type="xs:string" name="method" use="required"/>
         <xs:attribute type="xs:string" name="class" default="org.ofbiz.base.util.UtilValidate"/>
     </xs:attributeGroup>
@@ -206,7 +206,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-compare">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute name="field" type="xs:string" use="required"/>
         <xs:attribute name="operator" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -220,7 +220,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="value" use="required"/>
+        <xs:attribute name="value" type="xs:string" use="required"/>
         <xs:attribute name="type" default="String">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -247,7 +247,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-compare-field">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute name="field" type="xs:string" use="required"/>
         <xs:attribute name="operator" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -261,7 +261,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="to-field-name"/>
+        <xs:attribute name="to-field" type="xs:string"/>
         <xs:attribute name="type" default="String">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -288,7 +288,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-regexp">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="field" use="required"/>
         <xs:attribute type="xs:string" name="expr" use="required"/>
     </xs:attributeGroup>
     <xs:element name="if-empty" substitutionGroup="AllConditionals">
@@ -297,7 +297,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-empty">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="field" use="required"/>
     </xs:attributeGroup>
 
     <!-- ================ ACTIONS ================ -->
@@ -420,7 +420,7 @@
     </xs:element>
     <xs:attributeGroup name="attlist.service">
         <xs:attribute type="xs:string" name="service-name" use="required"/>
-        <xs:attribute type="xs:string" name="result-map-name"/>
+        <xs:attribute type="xs:string" name="result-map"/>
         <xs:attribute type="xs:string" name="auto-field-map" default="true">
             <xs:annotation><xs:documentation>This can be "true", "false" or the name of a Map in the context to use as the source Map for the service context.</xs:documentation></xs:annotation>
         </xs:attribute>
@@ -460,7 +460,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="list-name" use="required"/>
+        <xs:attribute type="xs:string" name="list" use="required"/>
         <xs:attribute name="result-set-type" default="scroll">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -518,7 +518,7 @@
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute type="xs:string" name="delegator-name"/>
-        <xs:attribute type="xs:string" name="list-name" use="required"/>
+        <xs:attribute type="xs:string" name="list" use="required"/>
         <xs:attribute name="result-set-type" default="scroll">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -538,8 +538,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.entity-one">
-        <xs:attribute type="xs:string" name="entity-name" use="required"/>
-        <xs:attribute type="xs:string" name="value-name" use="required"/>
+        <xs:attribute name="entity-name" type="xs:string" use="required"/>
+        <xs:attribute name="value-field" type="xs:string" use="required"/>
         <xs:attribute name="use-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -563,10 +563,10 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.get-related-one">
-        <xs:attribute name="value-name" type="xs:string" use="required"/>
+        <xs:attribute name="value-field" type="xs:string" use="required"/>
         <xs:attribute name="relation-name" type="xs:string" use="required"/>
-        <xs:attribute type="xs:string" name="use-cache" default="false"/>
-        <xs:attribute type="xs:string" name="to-value-name" use="required"/>
+        <xs:attribute name="use-cache" type="xs:string" default="false"/>
+        <xs:attribute name="to-value-field" type="xs:string" use="required"/>
     </xs:attributeGroup>
     <xs:element name="get-related" substitutionGroup="AllActions">
         <xs:complexType>
@@ -574,12 +574,12 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.get-related">
-        <xs:attribute type="xs:string" name="value-name" use="required"/>
+        <xs:attribute type="xs:string" name="value-field" use="required"/>
         <xs:attribute type="xs:string" name="relation-name" use="required"/>
-        <xs:attribute type="xs:string" name="map-name"/>
-        <xs:attribute type="xs:string" name="order-by-list-name"/>
+        <xs:attribute type="xs:string" name="map"/>
+        <xs:attribute type="xs:string" name="order-by-list"/>
         <xs:attribute type="xs:string" name="use-cache" default="false"/>
-        <xs:attribute type="xs:string" name="list-name" use="required"/>
+        <xs:attribute type="xs:string" name="list" use="required"/>
     </xs:attributeGroup>
     <xs:element name="condition-list">
         <xs:complexType>
@@ -643,7 +643,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="env-name"/>
+        <xs:attribute type="xs:string" name="from-field"/>
         <xs:attribute type="xs:string" name="value"/>
         <xs:attribute name="ignore-if-null" default="false">
             <xs:simpleType>

Modified: ofbiz/site/dtds/widget-tree.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-tree.xsd?rev=735697&r1=735696&r2=735697&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-tree.xsd (original)
+++ ofbiz/site/dtds/widget-tree.xsd Mon Jan 19 06:18:22 2009
@@ -225,14 +225,14 @@
     </xs:element>
     <xs:attributeGroup name="attlist.service">
         <xs:attribute type="xs:string" name="service-name" use="required"/>
-        <xs:attribute type="xs:string" name="result-map-name"/>
+        <xs:attribute type="xs:string" name="result-map"/>
         <xs:attribute type="xs:string" name="auto-field-map" default="true">
             <xs:annotation><xs:documentation>This can be "true", "false" or the name of a Map in the context to use as the source Map for the service context.</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="result-map-list-name"/>
-        <xs:attribute type="xs:string" name="result-map-list-iterator-name"/>
-        <xs:attribute type="xs:string" name="result-map-value-name"/>
-        <xs:attribute type="xs:string" name="value-name"/>
+        <xs:attribute type="xs:string" name="result-map-list"/>
+        <!-- deprecated, use result-map-list instead <xs:attribute type="xs:string" name="result-map-list-iterator-name"/> -->
+        <xs:attribute type="xs:string" name="result-map-value"/>
+        <xs:attribute type="xs:string" name="value"/>
     </xs:attributeGroup>
 
     <xs:element name="entity-and">
@@ -246,8 +246,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.entity-and">
-        <xs:attribute type="xs:string" name="entity-name" use="required"/>
-        <xs:attribute type="xs:string" name="list-name" />
+        <xs:attribute name="entity-name" type="xs:string" use="required"/>
+        <xs:attribute name="list" type="xs:string"/>
         <xs:attribute name="use-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -294,7 +294,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.entity-condition">
-        <xs:attribute type="xs:string" name="entity-name" use="required"/>
+        <xs:attribute name="entity-name" type="xs:string" use="required"/>
         <xs:attribute name="use-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -320,8 +320,8 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="delegator-name"/>
-        <xs:attribute type="xs:string" name="list-name" />
+        <xs:attribute name="delegator-name" type="xs:string"/>
+        <xs:attribute name="list" type="xs:string"/>
         <xs:attribute name="result-set-type" default="scroll">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -341,8 +341,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.entity-one">
-        <xs:attribute type="xs:string" name="entity-name" use="required"/>
-        <xs:attribute type="xs:string" name="value-name"/>
+        <xs:attribute name="entity-name" type="xs:string" use="required"/>
+        <xs:attribute name="value-field" type="xs:string"/>
         <xs:attribute name="use-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -405,7 +405,7 @@
     </xs:element>
     <xs:attributeGroup name="attlist.field-map">
         <xs:attribute type="xs:string" name="field-name" use="required"/>
-        <xs:attribute type="xs:string" name="env-name"/>
+        <xs:attribute type="xs:string" name="from-field"/>
         <xs:attribute type="xs:string" name="value"/>
     </xs:attributeGroup>
     <xs:element name="out-field-map">
@@ -462,7 +462,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.condition-expr">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute name="field-name" type="xs:string" use="required"/>
         <xs:attribute name="operator" default="equals">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -478,8 +478,8 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="env-name"/>
-        <xs:attribute type="xs:string" name="value"/>
+        <xs:attribute name="from-field" type="xs:string"/>
+        <xs:attribute name="value" type="xs:string"/>
         <xs:attribute name="ignore-if-null" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -627,7 +627,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-validate-method">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="field" use="required"/>
         <xs:attribute type="xs:string" name="method" use="required"/>
         <xs:attribute type="xs:string" name="class" default="org.ofbiz.base.util.UtilValidate"/>
     </xs:attributeGroup>
@@ -637,7 +637,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-compare">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute name="field" type="xs:string" use="required"/>
         <xs:attribute name="operator" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -670,7 +670,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="format"/>
+        <xs:attribute name="format" type="xs:string"/>
     </xs:attributeGroup>
     <xs:element name="if-compare-field" substitutionGroup="AllConditionals">
         <xs:complexType>
@@ -678,7 +678,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-compare-field">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute name="field" type="xs:string" use="required"/>
         <xs:attribute name="operator" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -692,7 +692,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="to-field-name"/>
+        <xs:attribute name="to-field" type="xs:string"/>
         <xs:attribute name="type" default="String">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -719,7 +719,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-regexp">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="field" use="required"/>
         <xs:attribute type="xs:string" name="expr" use="required"/>
     </xs:attributeGroup>
     <xs:element name="if-empty" substitutionGroup="AllConditionals">
@@ -728,7 +728,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.if-empty">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute type="xs:string" name="field" use="required"/>
     </xs:attributeGroup>
 </xs:schema>
 <!--
@@ -740,7 +740,7 @@
                 <label text="${description} [${productCategoryId}]" style="tabletext"/>
                 <sub-node node-name="ChildProductCategory">
                     <entity-and entity-name="ProductCategoryRollup">
-                        <constraint field-name="parentProductCategoryId" env-name="productCategoryId"/>
+                        <constraint field-name="parentProductCategoryId" from-field="productCategoryId"/>
                         <order-by field-name="sequenceNum"/>
                     </entity-many>
                 </sub-node>
@@ -753,7 +753,7 @@
                 <label text="${description} [${productCategoryId}]" style="tableheadtext"/>
                 <sub-node node-name="ChildProductCategory">
                     <entity-and entity-name="ProductCategoryRollup">
-                        <constraint field-name="parentProductCategoryId" env-name="productCategoryId"/>
+                        <constraint field-name="parentProductCategoryId" from-field="productCategoryId"/>
                         <order-by field-name="sequenceNum"/>
                     </entity-many>
                     <out-field-map field-name="productCategoryId"/>