svn commit: r763615 [1/3] - /ofbiz/site/dtds/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r763615 [1/3] - /ofbiz/site/dtds/

jacopoc
Author: jacopoc
Date: Thu Apr  9 12:09:58 2009
New Revision: 763615

URL: http://svn.apache.org/viewvc?rev=763615&view=rev
Log:
Applied patch from Vikas to update the site dtds with the ones we have in trunk

Modified:
    ofbiz/site/dtds/entity-eca.xsd
    ofbiz/site/dtds/entitygroup.xsd
    ofbiz/site/dtds/entitymodel.xsd
    ofbiz/site/dtds/oagis_fields.xsd
    ofbiz/site/dtds/oagis_segments.xsd
    ofbiz/site/dtds/ofbiz-component.xsd
    ofbiz/site/dtds/ofbiz-containers.xsd
    ofbiz/site/dtds/regions.xsd
    ofbiz/site/dtds/service-config.xsd
    ofbiz/site/dtds/service-eca.xsd
    ofbiz/site/dtds/services.xsd
    ofbiz/site/dtds/simple-methods.xsd
    ofbiz/site/dtds/site-conf.xsd
    ofbiz/site/dtds/test-suite.xsd
    ofbiz/site/dtds/widget-form.xsd
    ofbiz/site/dtds/widget-menu.xsd
    ofbiz/site/dtds/widget-screen.xsd

Modified: ofbiz/site/dtds/entity-eca.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entity-eca.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/entity-eca.xsd (original)
+++ ofbiz/site/dtds/entity-eca.xsd Thu Apr  9 12:09:58 2009
@@ -35,7 +35,7 @@
                 <xs:choice minOccurs="1" maxOccurs="unbounded">
                     <xs:element ref="set"/>
                     <xs:element ref="action"/>
-                </xs:choice>                
+                </xs:choice>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.eca"/>
         </xs:complexType>
@@ -174,7 +174,7 @@
         <xs:attribute name="format">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
-                    <xs:enumeration value="append"/>                    
+                    <xs:enumeration value="append"/>
                     <xs:enumeration value="to-upper"/>
                     <xs:enumeration value="to-lower"/>
                     <xs:enumeration value="hash-code"/>

Modified: ofbiz/site/dtds/entitygroup.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitygroup.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/entitygroup.xsd (original)
+++ ofbiz/site/dtds/entitygroup.xsd Thu Apr  9 12:09:58 2009
@@ -17,7 +17,7 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!--      
+<!--
      * This is the DTD for the Open For Business Generic Entity Model field type definition XML file.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

Modified: ofbiz/site/dtds/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/entitymodel.xsd (original)
+++ ofbiz/site/dtds/entitymodel.xsd Thu Apr  9 12:09:58 2009
@@ -17,7 +17,7 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<!--      
+<!--
     *This is the DTD for the Open For Business Generic Entity Model entity definition XML file.
     *This DTD is meant to be as simple as possible, and is modelled from the standard ejb deployment descriptor ejb-jar.xml.
 -->
@@ -136,7 +136,7 @@
         <xs:attribute name="enable-audit-log" default="false">
             <xs:annotation>
                 <xs:documentation>
-                    If this is set to true then whenever the value for this field on a record changes the Entity Engine will record the change in the EntityAuditLog entity.
+                    If this is set to true then whenever the value for this field on a record changes the Entity Engine will record the change in the EntityAuditLog entity.
                     Defaults to false.
                 </xs:documentation>
             </xs:annotation>
@@ -153,7 +153,7 @@
                     This makes the field NOT NULL on the database (like primary key fields).
                     It's possible to use an id-ne similiar field type.
                     But rows can be added from outside of ofbiz (e.g. database manager, third party programm, etc).
-                    This patch uses the ability of a database to set not null constraints.
+                    This patch uses the ability of a database to set not null constraints.
                     Defaults to false.
                 </xs:documentation>
             </xs:annotation>
@@ -373,15 +373,15 @@
     <xs:element name="complex-alias">
         <xs:annotation>
             <xs:documentation>
-                In every SELECT statement, the fields that are normally used are really defined to be expressions.  
+                In every SELECT statement, the fields that are normally used are really defined to be expressions.
                 This means for example that you can supply an expression like (discountPercent * 100) in place of  just a field name.
                 The complex-alias tag is the Ofbiz way to do this.
-                
+
                 The argument to the right of operator = can be any operator valid for that data type on the database system you are using.
-                For example, *, +, -, and / are commonly available mathematical operators (min, max, sum, avg, count, count-distinct, upper, lower)  
+                For example, *, +, -, and / are commonly available mathematical operators (min, max, sum, avg, count, count-distinct, upper, lower)
                 You can also use any operator on any data type supported on the underlying database system including string and date operators.
                 complex-alias can be as complex as you need by adding nested complex-alias statements and complex-alias-field
-                can use the same functions (min, max, count, count-distinct, sum, avg, upper, and lower) as the alias tag.                                
+                can use the same functions (min, max, count, count-distinct, sum, avg, upper, and lower) as the alias tag.
             </xs:documentation>
         </xs:annotation>
         <xs:complexType>

Modified: ofbiz/site/dtds/oagis_fields.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/oagis_fields.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/oagis_fields.xsd (original)
+++ ofbiz/site/dtds/oagis_fields.xsd Thu Apr  9 12:09:58 2009
@@ -3,40 +3,40 @@
 <xs:schema xmlns="http://www.openapplications.org/oagis_fields" targetNamespace="http://www.openapplications.org/oagis_fields" xmlns:="http://www.openapplications.org/oagis_fields" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
  <xs:annotation>
  <xs:documentation>
-
+
  License information for this file is provided in LICENSE.TXT, as published
  on the Open Applications Group web site. www.openapplications.org
-
+
  For support, more information, or to report implementation bugs,
  please contact the Open Applications Group at [hidden email]
-
+
  $Revision: 7.2.1 $
  $Date: 31 October 2001 $
  Open Applications Group XML
  Copyright 1998-2001, All Rights Reserved
-
+
  $Name: oagis_fields.xsd $
-
+
  ajw 7.2 09/14/2001 Fields to support ECatalog: CLASSFNID,CLASSFN,CLASSLEVEL,CLSSSCHMRV,FTGROUP,
  FTVALIND,FTVALQUAL, PRICECODE, PRICETYPE,SEQNCENUM,USAGERESTN
- ajw 7.2 09/14/2001 Fields to support Consumptn: CONSLINENUM,ROUTELEVEL1-ROUTELEVEL9  
+ ajw 7.2 09/14/2001 Fields to support Consumptn: CONSLINENUM,ROUTELEVEL1-ROUTELEVEL9
  mlr 7.2 09/14/2001 Added fields to support updated delivery: ACKMODE, DISCRPTYPE, RECEIPTYPE.
- ajw 7.2.1 10/31/2001 W3C Schema Release
-
+ ajw 7.2.1 10/31/2001 W3C Schema Release
+
 
  Structure Overview
-
+
  This schema defines the OAGI Field datatypes used throughout the specification.
  Below is an outline depicting their placement and usage.
-
+
  BOD Namespace ("http://www.openapplications.org/nnn_verb_noun_rel")
  |
  |--- Segments Namespace - oagis_segments.xsd (os: "http://www.openapplications.org/oagis_segments")
  | |
- |--- |--- Fields Namespace - oagis_fields.xsd (of:"http://www.openapplications.org/oagis_fields")
-
-
-
+ |--- |--- Fields Namespace - oagis_fields.xsd (of:"http://www.openapplications.org/oagis_fields")
+
+
+
  </xs:documentation>
  </xs:annotation>
  <xs:element name="VERB" type="VERB"/>

Modified: ofbiz/site/dtds/oagis_segments.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/oagis_segments.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/oagis_segments.xsd (original)
+++ ofbiz/site/dtds/oagis_segments.xsd Thu Apr  9 12:09:58 2009
@@ -3,36 +3,36 @@
  <xs:import namespace="http://www.openapplications.org/oagis_fields" schemaLocation="oagis_fields.xsd"/>
  <xs:annotation>
  <xs:documentation>
-
+
  License information for this file is provided in LICENSE.TXT, as published
  on the Open Applications Group web site. www.openapplications.org
-
+
  For support, more information, or to report implementation bugs,
  please contact the Open Applications Group at [hidden email]
-
+
  $Revision: 7.2.1 $
  $Date: 31 October 2001 $
  Open Applications Group XML
  Copyright 1998-2001, All Rights Reserved
-
+
  $Name: oagis_segments.xsd $
-
- ajw 7.2.1 10/31/2001 W3C Schema Release
-
+
+ ajw 7.2.1 10/31/2001 W3C Schema Release
+
 
  Structure Overview
-
+
  This schema defines the OAGI Segment datatypes used throughout the specification.
  Below is an outline depicting their placement and usage.
-
+
  BOD Namespace ("http://www.openapplications.org/nnn_verb_noun_rel")
  |
  |--- Segments Namespace - oagis_segments.xsd (os: "http://www.openapplications.org/oagis_segments")
  | |
- |--- |--- Fields Namespace - oagis_fields.xsd (of:"http://www.openapplications.org/oagis_fields")
-
-
-
+ |--- |--- Fields Namespace - oagis_fields.xsd (of:"http://www.openapplications.org/oagis_fields")
+
+
+
  </xs:documentation>
  </xs:annotation>
  <xs:element name="CNTROLAREA" type="CNTROLAREA"/>
@@ -113,7 +113,7 @@
  <xs:enumeration value="CANCEL"/>
  <xs:enumeration value="CHANGEDATE"/>
  <xs:enumeration value="COMPDATE"/>
- <xs:enumeration value="CONSUME"/>
+ <xs:enumeration value="CONSUME"/>
  <xs:enumeration value="CREATION"/>
  <xs:enumeration value="CUMULATIVE"/>
  <xs:enumeration value="DELIVACT"/>

Modified: ofbiz/site/dtds/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-component.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/ofbiz-component.xsd (original)
+++ ofbiz/site/dtds/ofbiz-component.xsd Thu Apr  9 12:09:58 2009
@@ -143,7 +143,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="password" type="xs:string" use="required"/>        
+        <xs:attribute name="password" type="xs:string" use="required"/>
         <xs:attribute name="is-truststore" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">

Modified: ofbiz/site/dtds/ofbiz-containers.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-containers.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/ofbiz-containers.xsd (original)
+++ ofbiz/site/dtds/ofbiz-containers.xsd Thu Apr  9 12:09:58 2009
@@ -58,12 +58,12 @@
     </xs:complexType>
 </xs:schema>
 <!--
-    
+
     Container properties are relative to the implementation class for details
     of which properties are available see the docs on the class defined.
-    
+
     Example:
-    
+
     <ofbiz-containers>
         <container name="jetty-container" class="org.ofbiz.base.container.JettyContainer">
             <property name="default-listener">
@@ -82,5 +82,5 @@
             <property name="party" value="${ofbiz.home}/applications/party/component.xml"/>
         </container>
     </ofbiz-containers>
-    
+
 -->

Modified: ofbiz/site/dtds/regions.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/regions.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/regions.xsd (original)
+++ ofbiz/site/dtds/regions.xsd Thu Apr  9 12:09:58 2009
@@ -39,8 +39,8 @@
         <xs:attribute name="region"/>
     </xs:attributeGroup>
     <!--
-        NOTE: type can be direct (for direct inline content), region (for a nested region),
-            default (for JSP/Servlet resource), or any ViewHandler defined in the corresponding controller.xml file
+        NOTE: type can be direct (for direct inline content), region (for a nested region),
+            default (for JSP/Servlet resource), or any ViewHandler defined in the corresponding controller.xml file
     -->
     <xs:element name="put">
         <xs:complexType mixed="true">

Modified: ofbiz/site/dtds/service-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-config.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/service-config.xsd (original)
+++ ofbiz/site/dtds/service-config.xsd Thu Apr  9 12:09:58 2009
@@ -25,7 +25,7 @@
                 <xs:element minOccurs="1" maxOccurs="unbounded" ref="service-engine"/>
             </xs:sequence>
         </xs:complexType>
-    </xs:element>    
+    </xs:element>
     <xs:element name="service-engine">
         <xs:complexType>
             <xs:sequence>
@@ -224,7 +224,7 @@
         <xs:attribute type="xs:string" name="name"/>
     </xs:attributeGroup>
     <xs:element name="notification">
-        <xs:complexType>            
+        <xs:complexType>
             <xs:attributeGroup ref="attlist.notification"/>
         </xs:complexType>
     </xs:element>

Modified: ofbiz/site/dtds/service-eca.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-eca.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/service-eca.xsd (original)
+++ ofbiz/site/dtds/service-eca.xsd Thu Apr  9 12:09:58 2009
@@ -36,7 +36,7 @@
                 <xs:choice minOccurs="1" maxOccurs="unbounded">
                     <xs:element ref="set"/>
                     <xs:element ref="action"/>
-                </xs:choice>                
+                </xs:choice>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.eca"/>
         </xs:complexType>
@@ -131,7 +131,7 @@
         <xs:attribute name="format">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
-                    <xs:enumeration value="append"/>                    
+                    <xs:enumeration value="append"/>
                     <xs:enumeration value="to-upper"/>
                     <xs:enumeration value="to-lower"/>
                     <xs:enumeration value="hash-code"/>
@@ -219,7 +219,7 @@
                     <xs:enumeration value="true"/>
                     <xs:enumeration value="false"/>
                 </xs:restriction>
-            </xs:simpleType>    
+            </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="result-to-context" default="true">
             <xs:simpleType>

Modified: ofbiz/site/dtds/services.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/services.xsd?rev=763615&r1=763614&r2=763615&view=diff
==============================================================================
--- ofbiz/site/dtds/services.xsd (original)
+++ ofbiz/site/dtds/services.xsd Thu Apr  9 12:09:58 2009
@@ -46,7 +46,7 @@
                 <xs:choice maxOccurs="1" minOccurs="0">
                     <xs:choice minOccurs="0" maxOccurs="unbounded">
                         <xs:element ref="auto-attributes"/>
-                        <xs:element ref="attribute"/>                        
+                        <xs:element ref="attribute"/>
                     </xs:choice>
                     <xs:element ref="group"/>
                 </xs:choice>
@@ -56,10 +56,10 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.service">
-        <xs:attribute type="xs:string" name="name" use="required"/>
-        <xs:attribute type="xs:string" name="engine" use="required"/>
-        <xs:attribute type="xs:string" name="location"/>
-        <xs:attribute type="xs:string" name="invoke"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="engine" type="xs:string" use="required"/>
+        <xs:attribute name="location" type="xs:string"/>
+        <xs:attribute name="invoke" type="xs:string"/>
         <xs:attribute name="auth" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -84,7 +84,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="default-entity-name"/>
+        <xs:attribute name="default-entity-name" type="xs:string"/>
         <xs:attribute name="use-transaction" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -101,8 +101,8 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:int" name="transaction-timeout" default="0"/>
-        <xs:attribute type="xs:int" name="max-retry" default="-1"/>
+        <xs:attribute name="transaction-timeout" type="xs:int" default="0"/>
+        <xs:attribute name="max-retry" type="xs:int" default="-1"/>
         <xs:attribute name="debug" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -120,8 +120,8 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:int" name="semaphore-wait-seconds" default="300"/>
-        <xs:attribute type="xs:int" name="semaphore-sleep" default="500"/>
+        <xs:attribute name="semaphore-wait-seconds" type="xs:int" default="300"/>
+        <xs:attribute name="semaphore-sleep" type="xs:int" default="500"/>
     </xs:attributeGroup>
     <xs:element name="notification">
         <xs:complexType>
@@ -134,11 +134,11 @@
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="success"/>
                     <xs:enumeration value="error"/>
-                    <xs:enumeration value="fail"/>                    
+                    <xs:enumeration value="fail"/>
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="group" use="required"/>        
+        <xs:attribute name="group" type="xs:string" use="required"/>
     </xs:attributeGroup>
     <xs:element name="permission-service">
         <xs:complexType>
@@ -146,8 +146,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.permission-service">
-        <xs:attribute type="xs:string" name="service-name" use="required"/>
-        <xs:attribute type="xs:string" name="resource-description" use="optional">
+        <xs:attribute name="service-name" type="xs:string" use="required"/>
+        <xs:attribute name="resource-description" type="xs:string" use="optional">
             <xs:annotation><xs:documentation>This will be used in error messages, et cetera. If not specified will default to a service name.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute name="main-action" use="optional">
@@ -165,7 +165,7 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="check-permission"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="check-role-member"/>                
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="check-role-member"/>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.required-permissions"/>
         </xs:complexType>
@@ -186,8 +186,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.check-permission">
-        <xs:attribute type="xs:string" name="permission" use="required"/>
-        <xs:attribute type="xs:string" name="action"/>
+        <xs:attribute name="permission" type="xs:string" use="required"/>
+        <xs:attribute name="action" type="xs:string"/>
     </xs:attributeGroup>
     <xs:element name="check-role-member">
         <xs:complexType>
@@ -195,7 +195,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.check-role-member">
-        <xs:attribute type="xs:string" name="role-type" use="required"/>
+        <xs:attribute name="role-type" type="xs:string" use="required"/>
     </xs:attributeGroup>
     <xs:element name="service-security">
         <xs:complexType>
@@ -203,8 +203,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.service-security">
-        <xs:attribute type="xs:string" name="name" use="required"/>
-        <xs:attribute type="xs:string" name="class" use="required"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="class" type="xs:string" use="required"/>
     </xs:attributeGroup>
     <xs:element name="implements">
         <xs:complexType>
@@ -212,7 +212,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.implements">
-        <xs:attribute type="xs:string" name="service" use="required"/>
+        <xs:attribute name="service" type="xs:string" use="required"/>
         <xs:attribute name="optional" default="false">
             <xs:annotation><xs:documentation>If set to true all attributes inherited will have be optional whether or not they were in the implemented service definition.</xs:documentation></xs:annotation>
             <xs:simpleType>
@@ -233,7 +233,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.auto-attributes">
-        <xs:attribute type="xs:string" name="entity-name"/>
+        <xs:attribute name="entity-name" type="xs:string"/>
         <xs:attribute name="include" default="all">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -268,6 +268,16 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="allow-html" use="optional" default="none">
+            <xs:annotation><xs:documentation>See the documentation on the allow-html attribute of the "attribute" element.</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="any"/>
+                    <xs:enumeration value="safe"/>
+                    <xs:enumeration value="none"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="exclude">
         <xs:complexType>
@@ -275,7 +285,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.exclude">
-        <xs:attribute type="xs:string" name="field-name" use="required"/>
+        <xs:attribute name="field-name" type="xs:string" use="required"/>
     </xs:attributeGroup>
     <xs:element name="attribute">
         <xs:complexType>
@@ -286,8 +296,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.attribute">
-        <xs:attribute type="xs:string" name="name" use="required"/>
-        <xs:attribute type="xs:string" name="type" use="required"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="type" type="xs:string" use="required"/>
         <xs:attribute name="mode" use="required">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -305,14 +315,14 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="default-value">
+        <xs:attribute name="default-value" type="xs:string">
             <xs:annotation><xs:documentation>The value specified will be used for the attribute if no value is passed in. This will only happen if it is okay to not pass a value in, so if this is set then optional will be set to true. If optional=false and this is set then the value will be overridden and with a value in default-value is will set optional=true anyway.</xs:documentation></xs:annotation>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="form-label"/>
-        <xs:attribute type="xs:string" name="entity-name"/>
-        <xs:attribute type="xs:string" name="field-name"/>
-        <xs:attribute type="xs:string" name="string-map-prefix"/>
-        <xs:attribute type="xs:string" name="string-list-suffix"/>
+        <xs:attribute name="form-label" type="xs:string"/>
+        <xs:attribute name="entity-name" type="xs:string"/>
+        <xs:attribute name="field-name" type="xs:string"/>
+        <xs:attribute name="string-map-prefix" type="xs:string"/>
+        <xs:attribute name="string-list-suffix" type="xs:string"/>
         <xs:attribute name="form-display" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -321,6 +331,22 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="allow-html" use="optional" default="none">
+            <xs:annotation><xs:documentation>
+                Applies only to String fields.
+                Only checked for incoming parameters/attributes (could change in the future, but this is meant for validating input from users, other systems, etc).
+                Defualts to "none" meaning no HTML is allowed (will result in an error message).
+                If some HTML is desired then use "safe" which will follow the rules in the antisamy-esapi.xml file. This should be safe for both internal and public users.
+                In rare cases when users are trusted or it is not a sensitive field the "any" option may be used to not check the HTML content at all.
+            </xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="any"/>
+                    <xs:enumeration value="safe"/>
+                    <xs:enumeration value="none"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="override">
         <xs:complexType>
@@ -331,10 +357,10 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.override">
-        <xs:attribute type="xs:string" name="name" use="required"/>
-        <xs:attribute type="xs:string" name="type"/>
-        <xs:attribute type="xs:string" name="entity-name"/>
-        <xs:attribute type="xs:string" name="field-name"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="type" type="xs:string"/>
+        <xs:attribute name="entity-name" type="xs:string"/>
+        <xs:attribute name="field-name" type="xs:string"/>
         <xs:attribute name="mode">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -352,8 +378,8 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute type="xs:string" name="default-value"/>
-        <xs:attribute type="xs:string" name="form-label"/>
+        <xs:attribute name="default-value" type="xs:string"/>
+        <xs:attribute name="form-label" type="xs:string"/>
         <xs:attribute name="form-display">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -362,6 +388,16 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="allow-html" use="optional">
+            <xs:annotation><xs:documentation>See the documentation on the allow-html attribute of the "attribute" element. Note that it is slightly different here as there is no defualt.</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="any"/>
+                    <xs:enumeration value="safe"/>
+                    <xs:enumeration value="none"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="type-validate">
         <xs:complexType>
@@ -373,8 +409,8 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.type-validate">
-        <xs:attribute type="xs:string" name="method"/>
-        <xs:attribute type="xs:string" name="class" default="org.ofbiz.base.util.UtilValidate"/>
+        <xs:attribute name="method" type="xs:string"/>
+        <xs:attribute name="class" type="xs:string" default="org.ofbiz.base.util.UtilValidate"/>
     </xs:attributeGroup>
     <xs:element name="fail-message">
         <xs:complexType>
@@ -382,7 +418,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.fail-message">
-        <xs:attribute type="xs:string" name="message" use="required"/>
+        <xs:attribute name="message" type="xs:string" use="required"/>
     </xs:attributeGroup>
     <xs:element name="fail-property">
         <xs:complexType>
@@ -390,7 +426,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.fail-property">
-        <xs:attribute type="xs:string" name="resource" use="required"/>
-        <xs:attribute type="xs:string" name="property" use="required"/>
+        <xs:attribute name="resource" type="xs:string" use="required"/>
+        <xs:attribute name="property" type="xs:string" use="required"/>
     </xs:attributeGroup>
 </xs:schema>