[hibernate-commits] Hibernate SVN: r19942 - core/trunk/documentation/manual/src/main/docbook/en-US/content.

[hibernate-commits at lists.jboss.org]

Author: hardy.ferentschik
Date: 2010-07-13 09:55:32 -0400 (Tue, 13 Jul 2010)
New Revision: 19942

Modified:
   core/trunk/documentation/manual/src/main/docbook/en-US/content/configuration.xml
Log:
HHH-5150 Added the properties hibernate.id.new_generator_mappings and hibernate.cache.default_cache_concurrency_strategy to the configuration poroperties section

Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/configuration.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/configuration.xml	2010-07-13 10:40:39 UTC (rev 19941)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/configuration.xml	2010-07-13 13:55:32 UTC (rev 19942)
@@ -475,10 +475,34 @@
             <para> <emphasis role="strong">e.g.</emphasis>
             <literal>true</literal> | <literal>false</literal> </para></entry>
           </row>
+
+          <row>
+            <entry><property>hibernate.id.new_generator_mappings</property></entry>
+
+            <entry>Setting is relevant when using
+            <classname>@GeneratedValue</classname>. It indicates whether or
+            not the new <classname>IdentifierGenerator</classname>
+            implementations are used for
+            <classname>javax.persistence.GenerationType.AUTO</classname>,
+            <classname>javax.persistence.GenerationType.TABLE</classname> and
+            <classname>javax.persistence.GenerationType.SEQUENCE</classname>.
+            Default to <literal>false</literal> to keep backward
+            compatibility. <para> <emphasis role="strong">e.g.</emphasis>
+            <literal>true</literal> | <literal>false</literal> </para></entry>
+          </row>
         </tbody>
       </tgroup>
     </table>
 
+    <note>
+      <para>We recommend all new projects which make use of to use
+      <classname>@GeneratedValue</classname> to also set
+      <code>hibernate.id.new_generator_mappings=true</code> as the new
+      generators are more efficient and closer to the JPA 2 specification
+      semantic. However they are not backward compatible with existing
+      databases (if a sequence or a table is used for id generation).</para>
+    </note>
+
     <table frame="topbot" id="configuration-jdbc-properties" revision="8">
       <title>Hibernate JDBC and Connection Properties</title>
 
@@ -518,11 +542,10 @@
 
             <entry>Set this property to <literal>true</literal> if your JDBC
             driver returns correct row counts from
-            <literal>executeBatch()</literal>. It is usually safe to turn
-            this option on. Hibernate will then use batched DML for
-            automatically versioned data. Defaults to
-            <literal>false</literal>. <para> <emphasis
-            role="strong">e.g.</emphasis> <literal>true</literal> |
+            <literal>executeBatch()</literal>. It is usually safe to turn this
+            option on. Hibernate will then use batched DML for automatically
+            versioned data. Defaults to <literal>false</literal>. <para>
+            <emphasis role="strong">e.g.</emphasis> <literal>true</literal> |
             <literal>false</literal> </para></entry>
           </row>
 
@@ -723,6 +746,17 @@
             role="strong">e.g.</emphasis> <literal>true|false</literal>
             </para></entry>
           </row>
+
+          <row>
+            <entry><literal>hibernate.cache.default_cache_concurrency_strategy</literal></entry>
+
+            <entry>Setting used to give the name of the default
+            <classname>org.hibernate.annotations.CacheConcurrencyStrategy</classname>
+            to use when either <classname>@Cacheable</classname> or
+            <classname>@Cache</classname> is used.
+            <code>@Cache(strategy="..")</code> is used to override this
+            default.</entry>
+          </row>
         </tbody>
       </tgroup>
     </table>