svn commit: r1097386 - in /ofbiz/site/dtds: entity-config.xsd entitymodel.xsd fieldtypemodel.xsd ofbiz-component.xsd service-config.xsd site-conf.xsd widget-form.xsd widget-menu.xsd widget-screen.xsd

Author: jleroux
Date: Thu Apr 28 09:50:05 2011
New Revision: 1097386

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

Modified:
    ofbiz/site/dtds/entity-config.xsd
    ofbiz/site/dtds/entitymodel.xsd
    ofbiz/site/dtds/fieldtypemodel.xsd
    ofbiz/site/dtds/ofbiz-component.xsd
    ofbiz/site/dtds/service-config.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

Modified: ofbiz/site/dtds/entity-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entity-config.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/entity-config.xsd (original)
+++ ofbiz/site/dtds/entity-config.xsd Thu Apr 28 09:50:05 2011
@@ -381,6 +381,14 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="use-order-by-nulls" 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 type="xs:string" name="table-type"/>
         <xs:attribute type="xs:string" name="character-set"/>
         <xs:attribute type="xs:string" name="collate"/>
@@ -425,6 +433,13 @@ under the License.
         </xs:attribute>
         <xs:attribute type="xs:nonNegativeInteger" name="pool-maxsize" default="50"/>
         <xs:attribute type="xs:nonNegativeInteger" name="pool-minsize" default="2"/>
+        <xs:attribute type="xs:nonNegativeInteger" name="idle-maxsize">
+            <xs:annotation>
+                <xs:documentation>
+                    Maximum number of idle connections that should remain in the pool.  Defaults to 50% of pool-maxsize.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
         <xs:attribute type="xs:nonNegativeInteger" name="time-between-eviction-runs-millis" default="600000"/>
         <xs:attribute type="xs:nonNegativeInteger" name="pool-sleeptime" default="300000"/>
         <xs:attribute type="xs:nonNegativeInteger" name="pool-lifetime" default="600000"/>

Modified: ofbiz/site/dtds/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/entitymodel.xsd (original)
+++ ofbiz/site/dtds/entitymodel.xsd Thu Apr 28 09:50:05 2011
@@ -90,6 +90,7 @@ under the License.
         <xs:attribute name="enable-lock" default="false" type="boolean"/>
         <xs:attribute name="no-auto-stamp" default="false" type="boolean"/>
         <xs:attribute name="never-cache" default="false" type="boolean"/>
+        <xs:attribute name="never-check" default="false" type="boolean"/>
         <xs:attribute name="auto-clear-cache" default="true" type="boolean"/>
         <xs:attribute name="title" type="xs:string"/>
         <xs:attribute name="copyright" type="xs:string"/>
@@ -462,5 +463,10 @@ under the License.
         <xs:attribute name="entity-name" type="xs:string" use="required"/>
         <xs:attribute name="default-resource-name" type="xs:string"/>
         <xs:attribute name="dependent-on" type="xs:string"/>
+        <xs:attribute name="sequence-bank-size" type="xs:string"/>
+        <xs:attribute name="enable-lock" type="boolean"/>
+        <xs:attribute name="no-auto-stamp" type="boolean"/>
+        <xs:attribute name="never-cache" type="boolean"/>
+        <xs:attribute name="auto-clear-cache" type="boolean"/>
     </xs:attributeGroup>
 </xs:schema>

Modified: ofbiz/site/dtds/fieldtypemodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/fieldtypemodel.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/fieldtypemodel.xsd (original)
+++ ofbiz/site/dtds/fieldtypemodel.xsd Thu Apr 28 09:50:05 2011
@@ -30,26 +30,101 @@ under the License.
     <!-- ================= Children of fieldtypemodel =================== -->
     <xs:element name="field-type-def">
         <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="validate"/>
-            </xs:sequence>
             <xs:attributeGroup ref="attlist.field-type-def"/>
         </xs:complexType>
     </xs:element>
-    <!-- ================= Children of field-type-def =================== -->
     <xs:attributeGroup name="attlist.field-type-def">
         <xs:attribute type="xs:string" name="type" use="required"/>
         <xs:attribute type="xs:string" name="sql-type" use="required"/>
         <xs:attribute type="xs:string" name="sql-type-alias"/>
-        <xs:attribute type="xs:string" name="java-type" use="required"/>
-    </xs:attributeGroup>
-    <xs:element name="validate">
-        <xs:complexType>
-            <xs:attributeGroup ref="attlist.validate"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:attributeGroup name="attlist.validate">
-        <xs:attribute type="xs:string" name="method" use="required"/>
-        <xs:attribute type="xs:string" name="class" default="org.ofbiz.base.util.UtilValidate"/>
+        <xs:attribute name="java-type" use="required">
+            <xs:annotation><xs:documentation>
+                The java-type attribute must contain a Java data type
+                recognized by the JDBC driver (ResultSet getXxx methods
+                or PreparedStatement setXxx methods).
+            </xs:documentation></xs:annotation>
+            <!-- Developers Note: SQL type to Java type mapping taken from
+            http://java.sun.com/j2se/1.4.2/docs/guide/jdbc/getstart/mapping.html -->
+         <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="byte[]">
+                        <xs:annotation><xs:documentation>
+                            Use with BLOB, BINARY, VARBINARY, and LONGVARBINARY SQL types
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="Boolean">
+                        <xs:annotation><xs:documentation>
+                            Use with BIT and BOOLEAN SQL types
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="Double">
+                        <xs:annotation><xs:documentation>
+                            Use with DOUBLE and FLOAT SQL types
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="Float">
+                        <xs:annotation><xs:documentation>
+                            Use with REAL SQL type
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="Integer">
+                        <xs:annotation><xs:documentation>
+                            Use with INTEGER SQL type
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="Long">
+                        <xs:annotation><xs:documentation>
+                            Use with BIGINT SQL type
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="Object">
+                        <xs:annotation><xs:documentation>
+                            Use with BLOB and LONGVARBINARY SQL types
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="Short">
+                        <xs:annotation><xs:documentation>
+                            Use with SMALLINT and TINYINT SQL types
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+         <xs:enumeration value="String">
+            <xs:annotation><xs:documentation>
+                Use with CLOB, CHAR, VARCHAR,
+                and LONGVARCHAR SQL types
+            </xs:documentation></xs:annotation>
+         </xs:enumeration>
+                    <xs:enumeration value="java.math.BigDecimal">
+                        <xs:annotation><xs:documentation>
+                            Use with DECIMAL and NUMERIC SQL types
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="java.sql.Blob">
+                        <xs:annotation><xs:documentation>
+                            Use with BLOB SQL type
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="java.sql.Clob">
+                        <xs:annotation><xs:documentation>
+                            Use with CLOB SQL type
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="java.sql.Date">
+                        <xs:annotation><xs:documentation>
+                            Use with DATE SQL type
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="java.sql.Time">
+                        <xs:annotation><xs:documentation>
+                            Use with TIME SQL type
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="java.sql.Timestamp">
+                        <xs:annotation><xs:documentation>
+                            Use with TIMESTAMP SQL type
+                        </xs:documentation></xs:annotation>
+                    </xs:enumeration>
+         </xs:restriction>
+         </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
 </xs:schema>

Modified: ofbiz/site/dtds/ofbiz-component.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/ofbiz-component.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/ofbiz-component.xsd (original)
+++ ofbiz/site/dtds/ofbiz-component.xsd Thu Apr 28 09:50:05 2011
@@ -39,7 +39,16 @@ under the License.
     </xs:attributeGroup>
     <xs:element name="depends-on">
         <xs:complexType>
-            <xs:attributeGroup ref="attlist.depends-on"/>
+            <xs:attributeGroup ref="attlist.depends-on">
+                <xs:annotation>
+                    <xs:documentation>
+                        This is yet unimplemented. It's not a trivial implementation because at the moment components are loaded
+                        in the order they are found (i.e. alphabetic or creation date).
+                        While this feature would require them all to be located first and then reordered and loaded.
+                        So, for now, simply follow the README file in hot-deploy root folder.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attributeGroup>
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.depends-on">

Modified: ofbiz/site/dtds/service-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/service-config.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/service-config.xsd (original)
+++ ofbiz/site/dtds/service-config.xsd Thu Apr 28 09:50:05 2011
@@ -92,9 +92,26 @@ under the License.
     </xs:attributeGroup>
     <xs:element name="engine">
         <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
+            </xs:sequence>
             <xs:attributeGroup ref="attlist.engine"/>
         </xs:complexType>
     </xs:element>
+    <xs:element name="parameter">
+        <xs:annotation>
+            <xs:documentation>
+                Technical parameters use by engine
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.parameter"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.parameter">
+        <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute type="xs:string" name="value"  use="required"/>
+    </xs:attributeGroup>
     <xs:attributeGroup name="attlist.engine">
         <xs:attribute type="xs:string" name="name" use="required"/>
         <xs:attribute type="xs:string" name="class" use="required"/>

Modified: ofbiz/site/dtds/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/site-conf.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/site-conf.xsd (original)
+++ ofbiz/site/dtds/site-conf.xsd Thu Apr 28 09:50:05 2011
@@ -323,6 +323,7 @@ under the License.
                     a request attribute or parameter.</xs:documentation>
             </xs:annotation>
         </xs:attribute>
+        <xs:attribute type="xs:string" name="value" use="optional"/>
     </xs:attributeGroup>
     <xs:element name="view-map">
         <xs:complexType>

Modified: ofbiz/site/dtds/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-form.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-form.xsd (original)
+++ ofbiz/site/dtds/widget-form.xsd Thu Apr 28 09:50:05 2011
@@ -155,6 +155,14 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="group-columns" default="true">
+            <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:integer" name="view-size">
             <xs:annotation><xs:documentation>The number of items to display per page</xs:documentation></xs:annotation>
         </xs:attribute>
@@ -371,6 +379,9 @@ under the License.
             <xs:documentation>Area to be updated when a form event occurs.</xs:documentation>
         </xs:annotation>
         <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter"/>
+            </xs:sequence>
             <xs:attributeGroup ref="attlist.on-form-event-update-area"/>
         </xs:complexType>
     </xs:element>
@@ -472,10 +483,10 @@ under the License.
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute type="xs:string" name="event">
-            <xs:annotation><xs:documentation>Used to specify javascript events that should be attached to fields.</xs:documentation></xs:annotation>
+            <xs:annotation><xs:documentation>Used to specify a javascript event that may be attached to field.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute type="xs:string" name="action">
-            <xs:annotation><xs:documentation>Used to specify javascript actions that should be run based on events.</xs:documentation></xs:annotation>
+            <xs:annotation><xs:documentation>Used to specify a javascript action that should be run based on an existing specified event.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute type="xs:string" name="id-name"/>
         <xs:attribute name="separate-column" default="false">
@@ -634,6 +645,26 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="step" default="1">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="1"/>
+                    <xs:enumeration value="5"/>
+                    <xs:enumeration value="10"/>
+                    <xs:enumeration value="15"/>
+                    <xs:enumeration value="30"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="mask" default="N">
+            <xs:annotation><xs:documentation>Will use the type value if set to yes, add a masked input</xs:documentation></xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="Y"/>
+                    <xs:enumeration value="N"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="display" substitutionGroup="AllFields">
         <xs:complexType>
@@ -656,6 +687,9 @@ under the License.
         <xs:attribute type="xs:string" name="description">
             <xs:annotation><xs:documentation>Specifies the string to display, can use the ${} syntax to insert context values; if empty the value of the field will be printed for a default.</xs:documentation></xs:annotation>
         </xs:attribute>
+        <xs:attribute type="xs:integer" name="size">
+            <xs:annotation><xs:documentation>Specifies the size of the field (as a number of characters), when the text to display exceed the given size it is truncated and add the complete text as a hint</xs:documentation></xs:annotation>
+        </xs:attribute>
         <xs:attribute name="type" default="text">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -682,6 +716,9 @@ under the License.
         <xs:attribute type="xs:string" name="image-location">
             <xs:annotation><xs:documentation>Specifies the image to display.</xs:documentation></xs:annotation>
         </xs:attribute>
+        <xs:attribute type="xs:string" name="default-value">
+            <xs:annotation><xs:documentation>Specifies a string to be displayed if the field is empty.</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="display-entity" substitutionGroup="AllFields">
         <xs:annotation><xs:documentation>This is just like display but looks up a description using the Entity Engine; note that if also-hidden is true then it uses the key as the value, not the shown description.</xs:documentation></xs:annotation>
@@ -696,6 +733,9 @@ under the License.
         <xs:attribute type="xs:string" name="entity-name" use="required"/>
         <xs:attribute type="xs:string" name="key-field-name"/>
         <xs:attribute type="xs:string" name="description" default="${description}"/>
+        <xs:attribute type="xs:integer" name="size">
+            <xs:annotation><xs:documentation>Specifies the size of the field (as a number of characters), when the text to display exceed the given size it is truncated and add the complete text as a hint</xs:documentation></xs:annotation>
+        </xs:attribute>
         <xs:attribute name="cache" default="true">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -768,6 +808,9 @@ under the License.
               images/webapp/images/combobox.js must be included in the page.
             </xs:documentation></xs:annotation>
         </xs:attribute>
+        <xs:attribute type="xs:integer" name="text-size" >
+            <xs:annotation><xs:documentation>Specifies the size of the field (as a number of characters), when the text to display exceed the given size it is truncated and add the complete text as a hint</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="file" substitutionGroup="AllFields">
         <xs:complexType>
@@ -863,6 +906,9 @@ under the License.
         <xs:attribute name="parameters-map" type="xs:string">
             <xs:annotation><xs:documentation>A Map in the context that will be used as additional name/value pairs.</xs:documentation></xs:annotation>
         </xs:attribute>
+        <xs:attribute type="xs:integer" name="size">
+            <xs:annotation><xs:documentation>Specifies the size of the field (as a number of characters), when the text to display exceed the given size it is truncated and add the complete text as a hint</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="parameter">
         <xs:complexType>
@@ -908,10 +954,10 @@ under the License.
         <xs:attribute type="xs:positiveInteger" name="maxlength"/>
         <xs:attribute type="xs:string" name="default-value"/>
         <xs:attribute type="xs:string" name="description-field-name">
-            <xs:annotation><xs:documentation>The name of a field whose value is also filled when coming back from lookup selection.</xs:documentation></xs:annotation>            
+            <xs:annotation><xs:documentation>The name of a field whose value is also filled when coming back from lookup selection.</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute type="xs:string" name="target-parameter">
-            <xs:annotation><xs:documentation>The name of a field whose value is passed in as a parameter to the lookup target form. Can be a comma separated list.</xs:documentation></xs:annotation>
+            <xs:annotation><xs:documentation>The name of a field whose value is passed in as a parameter to the lookup target form. Can be a comma separated list. You need to affect it the value using parameters.parmI (where I is the position number in the list, I must begin at 0) in the related lookup screen. See LookupPreferredContactMech as example</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute name="client-autocomplete-field" default="true">
             <xs:annotation><xs:documentation>Tells the browser whether or not to try and autocomplete with values previously entered. Default to true.</xs:documentation></xs:annotation>
@@ -946,10 +992,9 @@ under the License.
             <xs:annotation><xs:documentation>Only layer width. I.e. 250px, 12%</xs:documentation></xs:annotation>
         </xs:attribute>
         <xs:attribute name="position" default="topleft">
-            <xs:annotation><xs:documentation>Only for layer position. Default to topleft, normal sets the layer just under the target field, like for the calendar.</xs:documentation></xs:annotation>
+            <xs:annotation><xs:documentation>Only for layer positionining. Default to topleft corner.</xs:documentation></xs:annotation>
             <xs:simpleType>
                 <xs:restriction base="xs:string">
-                    <xs:enumeration value="normal"/>
                     <xs:enumeration value="center"/>
                     <xs:enumeration value="left"/>
                     <xs:enumeration value="right"/>
@@ -1115,6 +1160,9 @@ under the License.
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="mask" type="xs:string">
+            <xs:annotation><xs:documentation>Defines a customized input mask. Use 9 for numeric, a for alpha and * for alphanumeric character.</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="textarea" substitutionGroup="AllFields">
         <xs:complexType>
@@ -1286,6 +1334,7 @@ under the License.
                     <xs:enumeration value="equals"/>
                     <xs:enumeration value="not-equals"/>
                     <xs:enumeration value="in"/>
+                    <xs:enumeration value="not-in"/>
                     <xs:enumeration value="between"/>
                     <xs:enumeration value="like"/>
                 </xs:restriction>

Modified: ofbiz/site/dtds/widget-menu.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-menu.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-menu.xsd (original)
+++ ofbiz/site/dtds/widget-menu.xsd Thu Apr 28 09:50:05 2011
@@ -220,6 +220,7 @@ under the License.
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="confirmation-message" type="xs:string"><xs:annotation><xs:documentation>The message displayed when request-confirm is set to true</xs:documentation></xs:annotation></xs:attribute>
+        <xs:attribute name="parameters-map" type="xs:string"/>
     </xs:attributeGroup>
     <xs:element name="parameter">
         <xs:complexType>

Modified: ofbiz/site/dtds/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/widget-screen.xsd?rev=1097386&r1=1097385&r2=1097386&view=diff
==============================================================================
--- ofbiz/site/dtds/widget-screen.xsd (original)
+++ ofbiz/site/dtds/widget-screen.xsd Thu Apr 28 09:50:05 2011
@@ -40,6 +40,14 @@ under the License.
                 <xs:documentation>Transaction timeout in seconds</xs:documentation>
             </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="use-transaction" default="true">
+            <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-cache" default="false">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -652,6 +660,7 @@ under the License.
                     <xs:enumeration value="equals"/>
                     <xs:enumeration value="not-equals"/>
                     <xs:enumeration value="in"/>
+                    <xs:enumeration value="not-in"/>
                     <xs:enumeration value="between"/>
                     <xs:enumeration value="like"/>
                 </xs:restriction>
@@ -848,12 +857,15 @@ under the License.
         <xs:attribute type="xs:string" name="name"/>
         <xs:attribute type="xs:string" name="target-window"/>
         <xs:attribute type="xs:string" name="prefix"/>
+        <xs:attribute type="xs:string" name="width"/>
+        <xs:attribute type="xs:string" name="height"/>
         <xs:attribute name="link-type" default="auto">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
                     <xs:enumeration value="auto"><xs:annotation><xs:documentation>If selected the hidden-form type will be used if the url-mode is intra-app and the request specified has an event, otherwise the anchor type will be used.</xs:documentation></xs:annotation></xs:enumeration>
                     <xs:enumeration value="anchor"/>
                     <xs:enumeration value="hidden-form"/>
+                    <xs:enumeration value="ajax-window"/>
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
@@ -1087,6 +1099,32 @@ under the License.
             </xs:simpleType>
         </xs:attribute>
     </xs:attributeGroup>
+    <xs:element name="include-portal-page" substitutionGroup="AllWidgets">
+        <xs:complexType>
+            <xs:attributeGroup ref="attlist.include-portal-page"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:attributeGroup name="attlist.include-portal-page">
+        <xs:attribute type="xs:string" name="id"/>
+        <xs:attribute name="conf-mode" default="false">
+            <xs:annotation><xs:documentation>Show the portal in configuration mode.</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-private" default="true">
+            <xs:annotation><xs:documentation>If a derived private PortalPage exists for the actual UserLogin than show the private PortalPage instead of the original.</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:attributeGroup>
 
     <xs:element name="sub-content" substitutionGroup="AllWidgets">
         <xs:complexType>