svn commit: r1641429 - in /ofbiz/site/dtds: entity-config.xsd entitymodel.xsd

Author: jleroux
Date: Mon Nov 24 17:35:22 2014
New Revision: 1641429

URL: http://svn.apache.org/r1641429
Log:
Updates dtds

Modified:
    ofbiz/site/dtds/entity-config.xsd
    ofbiz/site/dtds/entitymodel.xsd

Modified: ofbiz/site/dtds/entity-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entity-config.xsd?rev=1641429&r1=1641428&r2=1641429&view=diff
==============================================================================
--- ofbiz/site/dtds/entity-config.xsd (original)
+++ ofbiz/site/dtds/entity-config.xsd Mon Nov 24 17:35:22 2014
@@ -24,7 +24,7 @@ under the License.
             <xs:sequence>
                 <xs:element maxOccurs="unbounded" ref="resource-loader"/>
                 <xs:element ref="transaction-factory"/>
-                <xs:element ref="connection-factory"/>
+                <xs:element minOccurs="0" ref="connection-factory"/>
                 <xs:element ref="debug-xa-resources"/>
                 <xs:element maxOccurs="unbounded" ref="delegator"/>
                 <xs:element maxOccurs="unbounded" ref="entity-model-reader"/>
@@ -411,7 +411,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:attribute type="xs:integer" name="max-worker-pool-size" default="1"/>
     </xs:attributeGroup>
     <xs:element name="sql-load-path">
         <xs:complexType>
@@ -457,15 +457,28 @@ under the License.
         <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.
+                    Maximum number of idle connections that should remain in the pool. Defaults to 50% of pool-maxsize and always greater than pool-minsize.
                 </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="time-between-eviction-runs-millis" default="600000">
             <xs:annotation>
                 <xs:documentation>
-                    This parameter is currently not implemented
+                    Sets the number of milliseconds between eviction runs for idle connections.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:nonNegativeInteger" name="soft-min-evictable-idle-time-millis" default="600000">
+            <xs:annotation>
+                <xs:documentation>
+                    Sets the minimum amount of time a connection may sit idle in the pool before it is eligible for eviction.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:nonNegativeInteger" name="pool-sleeptime" default="120000">
+            <xs:annotation>
+                <xs:documentation>
+                    Sets the maximum amount of time (in milliseconds) to wait for a connection when the pool is exhausted
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>
@@ -493,7 +506,35 @@ under the License.
         <xs:attribute type="xs:string" name="pool-jdbc-test-stmt">
             <xs:annotation>
                 <xs:documentation>
-                    This parameter is currently not implemented
+                    Connection validation query
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:boolean" name="test-on-create" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    Run validation query when a connection is created in the pool
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:boolean" name="test-on-borrow" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    Run validation query when a connection is borrowed from pool
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:boolean" name="test-on-return" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    Run validation query when a connection is returned to pool
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:boolean" name="test-while-idle" default="false">
+            <xs:annotation>
+                <xs:documentation>
+                    Run validation query while connection is in idle in the pool with frequency set in time-between-eviction-runs-millis
                 </xs:documentation>
             </xs:annotation>
         </xs:attribute>

Modified: ofbiz/site/dtds/entitymodel.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/entitymodel.xsd?rev=1641429&r1=1641428&r2=1641429&view=diff
==============================================================================
--- ofbiz/site/dtds/entitymodel.xsd (original)
+++ ofbiz/site/dtds/entitymodel.xsd Mon Nov 24 17:35:22 2014
@@ -135,7 +135,15 @@ under the License.
         <xs:attribute name="name" type="xs:string" use="required"/>
         <xs:attribute name="col-name" type="xs:string"/>
         <xs:attribute name="type" type="xs:string" use="required"/>
-        <xs:attribute name="encrypt" default="false" type="boolean"/>
+        <xs:attribute name="encrypt" default="false">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true"/>
+                    <xs:enumeration value="false"/>
+                    <xs:enumeration value="salt"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
         <xs:attribute name="enable-audit-log" default="false" type="boolean">
             <xs:annotation>
                 <xs:documentation>