svn commit: r548579 - in /ofbiz/site/dtds: entity-config.xsd ofbiz-component.xsd simple-methods.xsd site-conf.xsd widget-screen.xsd

[jonesde]

Author: jonesde
Date: Mon Jun 18 21:18:19 2007
New Revision: 548579

URL: http://svn.apache.org/viewvc?view=rev&rev=548579
Log:
Updated some xsd files

Modified:
    ofbiz/site/dtds/entity-config.xsd
    ofbiz/site/dtds/ofbiz-component.xsd
    ofbiz/site/dtds/simple-methods.xsd
    ofbiz/site/dtds/site-conf.xsd
    ofbiz/site/dtds/widget-screen.xsd

Modified: ofbiz/site/dtds/entity-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entity-config.xsd?view=diff&rev=548579&r1=548578&r2=548579
==============================================================================
--- ofbiz/site/dtds/entity-config.xsd (original)
+++ ofbiz/site/dtds/entity-config.xsd Mon Jun 18 21:18:19 2007
@@ -304,6 +304,16 @@
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="use-indices" default="true">
+            <xs:annotation><xs:documentation>Use manually declared indices (indexes)?</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="use-indices-unique" default="true">
+            <xs:annotation><xs:documentation>For manually declared indices (if used), use the unique constraint?</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>
@@ -329,7 +339,7 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
-        <xs:attribute name="alias-view-columns" default="true">
+        <xs:attribute name="alias-view-columns" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>

Modified: ofbiz/site/dtds/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-component.xsd?view=diff&rev=548579&r1=548578&r2=548579
==============================================================================
--- ofbiz/site/dtds/ofbiz-component.xsd (original)
+++ ofbiz/site/dtds/ofbiz-component.xsd Mon Jun 18 21:18:19 2007
@@ -27,6 +27,7 @@
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="entity-resource"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="service-resource"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="test-suite"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="keystore"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="webapp"/>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.ofbiz-component"/>
@@ -125,6 +126,40 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.test-suite">
+        <xs:attribute type="xs:string" name="loader" use="required"/>
+        <xs:attribute type="xs:string" name="location" use="required"/>
+    </xs:attributeGroup>
+    <xs:element name="keystore">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.keystore"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.keystore">
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="type" use="required">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="jks"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="password" type="xs:string" use="required"/>        
+        <xs:attribute name="is-truststore" use="required">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="is-certstore" use="required">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
         <xs:attribute type="xs:string" name="loader" use="required"/>
         <xs:attribute type="xs:string" name="location" use="required"/>
     </xs:attributeGroup>

Modified: ofbiz/site/dtds/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/simple-methods.xsd?view=diff&rev=548579&r1=548578&r2=548579
==============================================================================
--- ofbiz/site/dtds/simple-methods.xsd (original)
+++ ofbiz/site/dtds/simple-methods.xsd Mon Jun 18 21:18:19 2007
@@ -131,7 +131,7 @@
         <xs:attribute type="xs:string" name="type">
             <xs:annotation>
                 <xs:documentation>
-                    Type of the value put in the field.
+                    Type of the value put in the field. If this is a method call or object creation and the type in the method signature being called is for a parent class or interface, then it should be the type in that parent class or interface and not the type of the object being passed in.
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>

Modified: ofbiz/site/dtds/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/site-conf.xsd?view=diff&rev=548579&r1=548578&r2=548579
==============================================================================
--- ofbiz/site/dtds/site-conf.xsd (original)
+++ ofbiz/site/dtds/site-conf.xsd Mon Jun 18 21:18:19 2007
@@ -161,6 +161,14 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="cert" default="false">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>        
         <xs:attribute name="external-view" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">

Modified: ofbiz/site/dtds/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?view=diff&rev=548579&r1=548578&r2=548579
==============================================================================
--- ofbiz/site/dtds/widget-screen.xsd (original)
+++ ofbiz/site/dtds/widget-screen.xsd Mon Jun 18 21:18:19 2007
@@ -994,7 +994,7 @@
         <xs:attribute type="xs:string" name="key-name" />
         <xs:attribute type="xs:string" name="view-size" />
         <xs:attribute type="xs:string" name="paginate-target" />
-        <xs:attribute name="paginate" default="true">
+        <xs:attribute name="paginate" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="true"/>