svn commit: r1234293 - in /ofbiz/site/dtds: entity-config.xsd entitymodel.xsd simple-methods.xsd widget-form.xsd widget-tree.xsd

Author: jleroux
Date: Sat Jan 21 09:50:18 2012
New Revision: 1234293

URL: http://svn.apache.org/viewvc?rev=1234293&view=rev
Log:
Updates XSDs

Modified:
    ofbiz/site/dtds/entity-config.xsd
    ofbiz/site/dtds/entitymodel.xsd
    ofbiz/site/dtds/simple-methods.xsd
    ofbiz/site/dtds/widget-form.xsd
    ofbiz/site/dtds/widget-tree.xsd

Modified: ofbiz/site/dtds/entity-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entity-config.xsd?rev=1234293&r1=1234292&r2=1234293&view=diff
==============================================================================
--- ofbiz/site/dtds/entity-config.xsd (original)
+++ ofbiz/site/dtds/entity-config.xsd Sat Jan 21 09:50:18 2012
@@ -25,6 +25,7 @@ under the License.
                 <xs:element maxOccurs="unbounded" ref="resource-loader"/>
                 <xs:element ref="transaction-factory"/>
                 <xs:element ref="connection-factory"/>
+                <xs:element ref="debug-xa-resources"/>
                 <xs:element maxOccurs="unbounded" ref="delegator"/>
                 <xs:element maxOccurs="unbounded" ref="entity-model-reader"/>
                 <xs:element maxOccurs="unbounded" ref="entity-group-reader"/>
@@ -84,6 +85,14 @@ under the License.
     <xs:attributeGroup name="attlist.connection-factory">
         <xs:attribute type="xs:string" name="class" use="required"/>
     </xs:attributeGroup>
+    <xs:element name="debug-xa-resources">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.debug-xa-resources"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.debug-xa-resources">
+        <xs:attribute type="xs:string" name="value" use="required"/>
+    </xs:attributeGroup>
     <xs:element name="delegator">
         <xs:complexType>
             <xs:sequence>
@@ -392,6 +401,7 @@ under the License.
         <xs:attribute type="xs:string" name="table-type"/>
         <xs:attribute type="xs:string" name="character-set"/>
         <xs:attribute type="xs:string" name="collate"/>
+        <xs:attribute type="xs:integer" name="max-worker-pool-size" default="0"/>
     </xs:attributeGroup>
     <xs:element name="sql-load-path">
         <xs:complexType>

Modified: ofbiz/site/dtds/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=1234293&r1=1234292&r2=1234293&view=diff
==============================================================================
--- ofbiz/site/dtds/entitymodel.xsd (original)
+++ ofbiz/site/dtds/entitymodel.xsd Sat Jan 21 09:50:18 2012
@@ -134,11 +134,18 @@ under the License.
                     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 uses the ability of a database to set not null constraints.
                     Defaults to false.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="field-set" default="" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    Any fields that have the same field-set will be selected together in generated queries.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="validate">
         <xs:complexType>
@@ -267,6 +274,13 @@ under the License.
         <xs:attribute name="prefix" type="xs:string"/>
         <xs:attribute name="group-by" default="false" type="boolean"/>
         <xs:attribute name="function" type="aggregate-function"/>
+        <xs:attribute name="field-set" default="" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    Any fields that have the same field-set will be selected together in generated queries.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="exclude">
         <xs:complexType>
@@ -293,6 +307,13 @@ under the License.
         <xs:attribute name="prim-key" type="xs:string"/>
         <xs:attribute name="group-by" default="false" type="boolean"/>
         <xs:attribute name="function" type="aggregate-function"/>
+        <xs:attribute name="field-set" default="" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    Any fields that have the same field-set will be selected together in generated queries.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="complex-alias">
         <xs:annotation>
@@ -325,9 +346,10 @@ under the License.
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.complex-alias-field">
-        <xs:attribute name="entity-alias" type="xs:string" use="required"/>
-        <xs:attribute name="field" type="xs:string" use="required"/>
+        <xs:attribute name="entity-alias" type="xs:string"/>
+        <xs:attribute name="field" type="xs:string"/>
         <xs:attribute name="default-value" type="xs:string"/>
+        <xs:attribute name="value" type="xs:string"/>
         <xs:attribute name="function" type="aggregate-function"/>
     </xs:attributeGroup>
     <xs:element name="view-link">

Modified: ofbiz/site/dtds/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?rev=1234293&r1=1234292&r2=1234293&view=diff
==============================================================================
--- ofbiz/site/dtds/simple-methods.xsd (original)
+++ ofbiz/site/dtds/simple-methods.xsd Sat Jan 21 09:50:18 2012
@@ -5276,4 +5276,3 @@ under the License.
         </xs:attribute>
     </xs:attributeGroup>
 </xs:schema>
-

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=1234293&r1=1234292&r2=1234293&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Sat Jan 21 09:50:18 2012
@@ -356,6 +356,7 @@ under the License.
     <xs:element name="sort-field">
         <xs:complexType>
             <xs:attributeGroup ref="attlist.sort-field"/>
+            <xs:attribute name="position" type="xs:positiveInteger"/>
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.sort-field">
@@ -968,7 +969,7 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="disabled" default="false">
+        <xs:attribute name="read-only" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>

Modified: ofbiz/site/dtds/widget-tree.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-tree.xsd?rev=1234293&r1=1234292&r2=1234293&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-tree.xsd (original)
+++ ofbiz/site/dtds/widget-tree.xsd Sat Jan 21 09:50:18 2012
@@ -744,43 +744,9 @@ under the License.
 </xs:schema>
 <!--
     examples
-    <trees>
-        <tree name="ProductCategoryTree" root-node-name="ChildProductCategory">
-            <node name="ChildProductCategory">
-                <entity-one entity-name="ProductCategory"/>
-                <label text="${description} [${productCategoryId}]" style="tabletext"/>
-                <sub-node node-name="ChildProductCategory">
-                    <entity-and entity-name="ProductCategoryRollup">
-                        <constraint field-name="parentProductCategoryId" from-field="productCategoryId"/>
-                        <order-by field-name="sequenceNum"/>
-                    </entity-many>
-                </sub-node>
-                <out-field-map field-name="productCategoryId"/>
-            </node>
-        </tree>
-        <tree name="ProductCategoryAndProductsTree" root-node-name="ChildProductCategory">
-            <node name="ChildProductCategory">
-                <entity-one entity-name="ProductCategory"/>
-                <label text="${description} [${productCategoryId}]" style="tableheadtext"/>
-                <sub-node node-name="ChildProductCategory">
-                    <entity-and entity-name="ProductCategoryRollup">
-                        <constraint field-name="parentProductCategoryId" from-field="productCategoryId"/>
-                        <order-by field-name="sequenceNum"/>
-                    </entity-many>
-                    <out-field-map field-name="productCategoryId"/>
-                </sub-node>
-                <sub-node node-name="ChildProduct">
-                    <entity-and entity-name="ProductCategoryMember">
-                        <constraint field-name="productCategoryId"/>
-                        <order-by field-name="sequenceNum"/>
-                    </entity-many>
-                    <out-field-map field-name="productId"/>
-                </sub-node>
-            </node>
-            <node name="ChildProduct">
-                <service service-name="getProductInfo"/>
-                <label text="${productName} [${productId}] - ${price}" style="tabletext"/>
-            </node>
-        </tree>
-    </trees>
--->
+do search  xml for
+ root-node-name
+ you will see many examples.
+
+
+ -->