gistfile1.diff

diff --git a/hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd b/hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
index d020511..451d593 100644
--- a/hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
+++ b/hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd
@@ -1393,11 +1393,11 @@ arbitrary number of queries, and import declarations of arbitrary classes.
     <xs:attribute name="cache-region" type="xs:string"/>
     <xs:attribute name="cacheable" default="false" type="xs:boolean"/>
     <xs:attribute name="comment" type="xs:string"/>
-    <xs:attribute name="fetch-size" type="xs:string"/>
+    <xs:attribute name="fetch-size" type="xs:int"/>
     <xs:attribute name="flush-mode" type="flush-mode-attribute"/>
     <xs:attribute name="name" use="required" type="xs:string"/>
     <xs:attribute name="read-only" type="xs:boolean"/>
-    <xs:attribute name="timeout" type="xs:string"/>
+    <xs:attribute name="timeout" type="xs:int"/>
   </xs:complexType>
 
   <!-- The query-param element is used only by tools that generate
@@ -1558,12 +1558,12 @@ arbitrary number of queries, and import declarations of arbitrary classes.
     <xs:attribute name="cacheable" default="false" type="xs:boolean"/>
     <xs:attribute name="callable" default="false" type="xs:boolean"/>
     <xs:attribute name="comment" type="xs:string"/>
-    <xs:attribute name="fetch-size" type="xs:string"/>
+    <xs:attribute name="fetch-size" type="xs:int"/>
     <xs:attribute name="flush-mode" type="flush-mode-attribute"/>
     <xs:attribute name="name" use="required" type="xs:string"/>
     <xs:attribute name="read-only" type="xs:boolean"/>
     <xs:attribute name="resultset-ref" type="xs:string"/>
-    <xs:attribute name="timeout" type="xs:string"/>
+    <xs:attribute name="timeout" type="xs:int"/>
   </xs:complexType>
 
   <xs:complexType name="sql-update-element" mixed="true">
@@ -1614,7 +1614,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
       </xs:choice>
     </xs:sequence>
     <xs:attribute name="abstract" type="xs:boolean"/>
-    <xs:attribute name="batch-size" type="xs:string"/>
+    <xs:attribute name="batch-size" type="xs:int"/>
     <xs:attribute name="discriminator-value" type="xs:string"/> <!-- default: unqualified class name | none -->
     <xs:attribute name="dynamic-insert" default="false" type="xs:boolean"/>
     <xs:attribute name="dynamic-update" default="false" type="xs:boolean"/>
@@ -1698,7 +1698,7 @@ arbitrary number of queries, and import declarations of arbitrary classes.
       </xs:choice>
     </xs:sequence>
     <xs:attribute name="abstract" type="xs:boolean"/>
-    <xs:attribute name="batch-size" type="xs:string"/>
+    <xs:attribute name="batch-size" type="xs:int"/>
     <xs:attribute name="catalog" type="xs:string"/>
     <xs:attribute name="check" type="xs:string"/> <!-- default: none -->
     <xs:attribute name="dynamic-insert" default="false" type="xs:boolean"/>
@@ -1794,6 +1794,12 @@ arbitrary number of queries, and import declarations of arbitrary classes.
       <xs:enumeration value="upgrade"/>
       <xs:enumeration value="upgrade-nowait"/>
       <xs:enumeration value="write"/>
+      <xs:enumeration value="force"/>
+        <xs:enumeration value="optimistic"/>
+        <xs:enumeration value="optimistic_force_increment"/>
+        <xs:enumeration value="pessimistic_read"/>
+        <xs:enumeration value="pessimistic_write"/>
+        <xs:enumeration value="pessimistic_force_increment"/>
     </xs:restriction>
   </xs:simpleType>