Hibernate SVN: r18837 - core/trunk/entitymanager.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-18 10:33:57 -0500 (Thu, 18 Feb 2010)
New Revision: 18837
Modified:
core/trunk/entitymanager/pom.xml
Log:
HHH-4932
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2010-02-18 14:29:30 UTC (rev 18836)
+++ core/trunk/entitymanager/pom.xml 2010-02-18 15:33:57 UTC (rev 18837)
@@ -65,7 +65,7 @@
-->
<groupId>${project.groupId}</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
- <version>1.0.0-Beta-3</version>
+ <version>1.0.0-CR-1</version>
<scope>test</scope>
<exclusions>
<exclusion>
14 years, 2 months
Hibernate SVN: r18835 - jpamodelgen/tags.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-02-18 09:29:19 -0500 (Thu, 18 Feb 2010)
New Revision: 18835
Added:
jpamodelgen/tags/hibernate-jpamodelgen-1.0.0-CR-1/
Log:
[maven-scm] copy for tag hibernate-jpamodelgen-1.0.0-CR-1
Copied: jpamodelgen/tags/hibernate-jpamodelgen-1.0.0-CR-1 (from rev 18834, jpamodelgen/trunk)
14 years, 2 months
Hibernate SVN: r18833 - in core/trunk/annotations/src/main/docbook/en: modules and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2010-02-18 09:20:36 -0500 (Thu, 18 Feb 2010)
New Revision: 18833
Modified:
core/trunk/annotations/src/main/docbook/en/master.xml
core/trunk/annotations/src/main/docbook/en/modules/additionalmodules.xml
core/trunk/annotations/src/main/docbook/en/modules/entity.xml
core/trunk/annotations/src/main/docbook/en/modules/setup.xml
Log:
HHH-4933 update non core annotatios doc
Modified: core/trunk/annotations/src/main/docbook/en/master.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/master.xml 2010-02-18 12:47:31 UTC (rev 18832)
+++ core/trunk/annotations/src/main/docbook/en/master.xml 2010-02-18 14:20:36 UTC (rev 18833)
@@ -23,9 +23,9 @@
~ Boston, MA 02110-1301 USA
-->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY versionNumber "3.4.0.GA">
+ <!ENTITY versionNumber "3.5.0.GA">
<!ENTITY copyrightYear "2004">
- <!ENTITY copyrightHolder "Red Hat Middleware, LLC.">
+ <!ENTITY copyrightHolder "Red Hat Inc. and the various authors">
]>
<book lang="en">
<bookinfo>
@@ -40,6 +40,17 @@
<imagedata fileref="images/hibernate_logo_a.png" format="png" />
</imageobject>
</mediaobject>
+ <copyright>
+ <year>©rightYear;</year>
+ <holder>©rightHolder;</holder>
+ </copyright>
+ <authorgroup>
+ <author>
+ <firstname>Emmanuel</firstname>
+ <surname>Bernard</surname>
+ </author>
+ <!--TODO add translators like core did -->
+ </authorgroup>
</bookinfo>
<toc/>
Modified: core/trunk/annotations/src/main/docbook/en/modules/additionalmodules.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/modules/additionalmodules.xml 2010-02-18 12:47:31 UTC (rev 18832)
+++ core/trunk/annotations/src/main/docbook/en/modules/additionalmodules.xml 2010-02-18 14:20:36 UTC (rev 18833)
@@ -27,7 +27,7 @@
<chapter id="additionalmodules">
<title>Additional modules</title>
- <para>Hibernate Annotations mainly focus on persistence metadata. The
+ <para>Hibernate Annotations mainly focuses on persistence metadata. The
project also have a nice integration with some external modules.</para>
<section>
@@ -71,7 +71,7 @@
<para>To enable the Hibernate - Bean Validation integration, simply add
a Bean Validation provider (preferably Hibernate Validation 4) in your
- classpath. </para>
+ classpath.</para>
</section>
<section>
@@ -86,8 +86,9 @@
<para>You can customize the Bean Validation integration by setting the
validation mode. Use the
<literal>javax.persistence.validation.mode</literal> property and set it
- up for example in your <filename>persistence.xml</filename> file.
- Several options are possible:</para>
+ up for example in your <filename>persistence.xml</filename> file or your
+ <filename>hibernate.cfg.xml</filename> file. Several options are
+ possible:</para>
<itemizedlist>
<listitem>
@@ -200,12 +201,14 @@
<classname>ConstraintViolationException</classname> which exposes the
set of <classname>ConstraintViolation</classname>s.</para>
- <para>This exception is wrapped into an
- <classname>HibernateException</classname> or a
- <classname>PersistenceException</classname>. Note that generally,
- catchable violation are validated at a higher level (for example in Seam
- / JSF 2 via the JSF - Bean Validation integration or in your business
- layer by explicitly calling Bean Validation).</para>
+ <para>This exception is wrapped in a
+ <classname>RollbackException</classname> when the violation happens at
+ commit time. Otherwise the
+ <classname>ConstraintViolationException</classname> is returned (for
+ example when calling <methodname>flush()</methodname>. Note that
+ generally, catchable violations are validated at a higher level (for
+ example in Seam / JSF 2 via the JSF - Bean Validation integration or in
+ your business layer by explicitly calling Bean Validation).</para>
<para>An application code will rarely be looking for a
<classname>ConstraintViolationException</classname> raised by Hibernate.
@@ -233,7 +236,7 @@
<listitem>
<para><classname>@Min</classname>, <classname>@Max</classname> lead
- to column checks (like <code>value <= max</code>) </para>
+ to column checks (like <code>value <= max</code>)</para>
</listitem>
<listitem>
Modified: core/trunk/annotations/src/main/docbook/en/modules/entity.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/modules/entity.xml 2010-02-18 12:47:31 UTC (rev 18832)
+++ core/trunk/annotations/src/main/docbook/en/modules/entity.xml 2010-02-18 14:20:36 UTC (rev 18833)
@@ -30,8 +30,8 @@
<sect1 id="entity-overview" revision="2">
<title>Intro</title>
- <para>This section covers EJB 3.0 (aka Java Persistence) entity
- annotations and Hibernate-specific extensions.</para>
+ <para>This section covers Java Persistence 2.0 mapping annotations as well
+ as Hibernate-specific extensions.</para>
</sect1>
<sect1 id="entity-mapping" revision="2">
@@ -2530,7 +2530,7 @@
<para>The default access type is determined from the position of the
<literal>@Id</literal> or <literal>@EmbeddedId</literal> annotation in
- the entity hierarchy. </para>
+ the entity hierarchy.</para>
<note>
<para>The placement of annotations within a class hierarchy has to
@@ -2572,7 +2572,7 @@
<listitem>
<para>The access type is overriden for the annotated element, if
overriden on a class, all the properties of the given class
- inherit the access type. </para>
+ inherit the access type.</para>
</listitem>
<listitem>
@@ -2582,7 +2582,7 @@
getters are scanned for annotations, if the enitiy is marked as
<literal>@Access(AccessType.FIELD)</literal> or
<literal>@AccessType("field")</literal> respectively, the fields
- are scanned for annotations. </para>
+ are scanned for annotations.</para>
</listitem>
</itemizedlist>
@@ -2731,11 +2731,11 @@
<literal>@Type</literal> annotation.</para>
<note>
- Package level annotations are placed in a file named
+ Package level annotations are placed in a file named
<filename>package-info.java</filename>
- in the appropriate package. Place your annotations before the package declaration.
+ in the appropriate package. Place your annotations before the package declaration.
</note>
<programlisting>
@@ -3938,4 +3938,4 @@
}</programlisting>
</sect2>
</sect1>
-</chapter>
+</chapter>
\ No newline at end of file
Modified: core/trunk/annotations/src/main/docbook/en/modules/setup.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/modules/setup.xml 2010-02-18 12:47:31 UTC (rev 18832)
+++ core/trunk/annotations/src/main/docbook/en/modules/setup.xml 2010-02-18 14:20:36 UTC (rev 18833)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
@@ -22,8 +22,8 @@
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
-->
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter>
<title id="setup" revision="1">Setting up an annotations project</title>
@@ -32,26 +32,30 @@
<itemizedlist>
<listitem>
- <para><ulink url="http://www.hibernate.org/6.html">Download</ulink>
- and unpack the Hibernate Annotations distribution from the Hibernate
- website.</para>
+ <para>Make sure you have JDK 5.0 installed or above.</para>
</listitem>
<listitem>
- <para><emphasis>This release requires Hibernate Core 3.3 and
- above.</emphasis></para>
+ <para><ulink url="http://www.hibernate.org/6.html">Download</ulink>
+ and unpack the Hibernate Core distribution from the Hibernate website.
+ Hibernate 3.5 and onward contains the Hibernate Annotation
+ jars.</para>
</listitem>
<listitem>
- <para>This release is known to work on Hibernate Core 3.3.0.SP1</para>
- </listitem>
+ <para>Alternatively add the following dependency in your dependency
+ manager (like Maven or Ivy). Here is an example</para>
- <listitem>
- <para>Make sure you have JDK 5.0 installed or above. You can of course
- continue using XDoclet and get some of the benefits of
- annotation-based metadata with older JDK versions. Note that this
- document only describes JDK 5.0 annotations and you have to refer to
- the XDoclet documentation for more information.</para>
+ <programlisting><project ...>
+ ...
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate-core-version}</version>
+ </dependency>
+ </dependencies>
+</project></programlisting>
</listitem>
</itemizedlist>
</section>
@@ -62,35 +66,74 @@
<para>First, set up your classpath (after you have created a new project
in your favorite IDE): <itemizedlist>
<listitem>
- <para>Copy all Hibernate3 core and required 3rd party library files
- (see lib/README.txt in Hibernate).</para>
+ <para>Copy all Hibernate3 core and required 3rd party library
+ files.</para>
</listitem>
<listitem>
<para>Copy <filename>hibernate-annotations.jar</filename>,
<filename>lib/hibernate-comons-annotations.jar</filename> and
- <filename>lib/ejb3-persistence.jar</filename> from the Hibernate
- Annotations distribution to your classpath as well.</para>
+ <filename>lib/hibernate-jpa-2.0-api.jar</filename> from the
+ distribution to your classpath as well.</para>
</listitem>
</itemizedlist></para>
- <para>If you wish to use <ulink
- url="http://validator.hibernate.org">Hibernate Validator</ulink>, download
- it from the Hibernate website and add
- <filename>hibernate-validator.jar</filename> in your classpath.</para>
+ <para>Alternatively, import your pom.xml in your favorite IDE and let the
+ dependencies be resolved automatically,</para>
+ <note>
+ <title>What is hibernate-jpa-2.0-api-x.y.z.jar</title>
+
+ <para>This is the JAR containing the JPA 2.0 API, it is fully compliant
+ with the spec and passed the TCK signature test. You typically don't
+ need it when you deploy your application in a Java EE 6 application
+ server (like JBoss AS 6 for example).</para>
+ </note>
+
+ <para>We recommend you use <ulink
+ url="http://validator.hibernate.org">Hibernate Validator</ulink> and the
+ Bean VAlidation specification capabilities. Download Hibernate Validator 4
+ or above from the Hibernate website and add
+ <filename>hibernate-validator.jar</filename> and
+ <filename>validation-api.jar</filename> in your classpath. Alternatively
+ add the following dependency in your
+ <filename>pom.xml</filename>.<programlisting><project ...>
+ ...
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator-version}</version>
+ </dependency>
+ </dependencies>
+</project></programlisting></para>
+
<para>If you wish to use <ulink
url="http://search.hibernate.org">Hibernate Search</ulink>, download it
from the Hibernate website and add
<filename>hibernate-search.jar</filename> and
- <filename>lucene-core-x.y.z.jar</filename> in your classpath.</para>
+ <filename>lucene-core-x.y.z.jar</filename> in your classpath.
+ Alternatively add the following dependency in your
+ <filename>pom.xml</filename>.<programlisting><project ...>
+ ...
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>${hibernate-search-version}</version>
+ </dependency>
+ </dependencies>
+</project></programlisting></para>
- <para>We also recommend a small wrapper class to startup Hibernate in a
- static initializer block, known as <classname>HibernateUtil</classname>.
- You might have seen this class in various forms in other areas of the
- Hibernate documentation. For Annotation support you have to enhance this
- helper class as follows: <programlisting>package hello;
+ <para>We recommend you use the JPA 2 APIs to bootstrap Hibernate (see the
+ Hibernate EntityManager documentation for more information). If you use
+ Hibernate Core and its native APIs read on.</para>
+ <para>If you boot Hibernate yourself, make sure to use the
+ <classname>AnnotationConfiguration</classname> class instead of the
+ <classname>Configuration</classname> class. Here is an example using the
+ (legacy) <classname>HibernateUtil</classname> approach: <programlisting>package hello;
+
import org.hibernate.*;
import org.hibernate.cfg.*;
import test.*;
@@ -128,51 +171,50 @@
"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
- <hibernate-configuration>
- <session-factory>
- <emphasis role="bold"><mapping package="test.animals"/>
- <mapping class="test.Flight"/>
- <mapping class="test.Sky"/>
- <mapping class="test.Person"/>
- <mapping class="test.animals.Dog"/></emphasis>
-<emphasis role="bold"> <mapping resource="test/animals/orm.xml"/></emphasis>
- </session-factory>
- </hibernate-configuration>
- </programlisting>
+<hibernate-configuration>
+ <session-factory>
+ <emphasis role="bold"><mapping package="test.animals"/>
+ <mapping class="test.Flight"/>
+ <mapping class="test.Sky"/>
+ <mapping class="test.Person"/>
+ <mapping class="test.animals.Dog"/></emphasis>
+<emphasis role="bold"> <mapping resource="test/animals/orm.xml"/></emphasis>
+ </session-factory>
+</hibernate-configuration> </programlisting>
- <para>Note that you can mix the hbm.xml use and the new annotation one.
- The resource element can be either an hbm file or an EJB3 XML deployment
- descriptor. The distinction is transparent for your configuration
- process.</para>
+ <para>Note that you can mix the legacy hbm.xml use and the annotation
+ approach. The resource element can be either an hbm file or an EJB3 XML
+ deployment descriptor. The distinction is transparent for your
+ configuration process.</para>
<para>Alternatively, you can define the annotated classes and packages
using the programmatic API</para>
- <programlisting> sessionFactory = new <emphasis role="bold">AnnotationConfiguration()
+ <programlisting>sessionFactory = new <emphasis role="bold">AnnotationConfiguration()
.addPackage("test.animals") //the fully qualified package name
.addAnnotatedClass(Flight.class)
.addAnnotatedClass(Sky.class)
.addAnnotatedClass(Person.class)
.addAnnotatedClass(Dog.class)</emphasis>
<emphasis role="bold"> .addResource("test/animals/orm.xml")</emphasis>
- configure()..buildSessionFactory();</programlisting>
+ .configure()
+ .buildSessionFactory();</programlisting>
- <para>You can also use the Hibernate EntityManager which has its own
- configuration mechanism. Please refer to this project documentation for
- more details.</para>
-
<para>There is no other difference in the way you use Hibernate APIs with
annotations, except for this startup routine change or in the
configuration file. You can use your favorite configuration method for
other properties ( <filename>hibernate.properties</filename>,
- <filename>hibernate.cfg.xml</filename>, programmatic APIs, etc). You can
- even mix annotated persistent classes and classic
- <filename>hbm.cfg.xml</filename> declarations with the same
- <classname>SessionFactory</classname>. You can however not declare a class
- several times (whether annotated or through hbm.xml). You cannot mix
- configuration strategies (hbm vs annotations) in a mapped entity hierarchy
- either.</para>
+ <filename>hibernate.cfg.xml</filename>, programmatic APIs, etc). </para>
+ <note>
+ <para>You can mix annotated persistent classes and classic
+ <filename>hbm.cfg.xml</filename> declarations with the same
+ <classname>SessionFactory</classname>. You can however not declare a
+ class several times (whether annotated or through hbm.xml). You cannot
+ mix configuration strategies (hbm vs annotations) in an entity hierarchy
+ either.</para>
+ </note>
+
<para>To ease the migration process from hbm files to annotations, the
configuration mechanism detects the mapping duplication between
annotations and hbm files. HBM files are then prioritized over annotated
@@ -186,8 +228,48 @@
<section>
<title id="setup-properties">Properties</title>
- <para>Asides from the Hibernate core properties, Hibernate Annotations
- reacts to the following one</para>
+ <para>On top of the Hibernate Core properties, Hibernate Annotations
+ reacts to the following one.<table>
+ <title>Hibernate Annotations specific properties</title>
+
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry align="center">Property</entry>
+
+ <entry align="center">Function</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><literal>hibernate.cache.default_cache_concurrency_strategy</literal></entry>
+
+ <entry><para>Setting used to give the name of the default
+ <classname>org.hibernate.annotations.CacheConcurrencyStrategy</classname>
+ to use when either <classname>@Cacheable</classname>
+ <classname>@Cache</classname>} is used.
+ <classname>@Cache(strategy="..")</classname> is used to override
+ this default.</para></entry>
+ </row>
+
+ <row>
+ <entry><literal>hibernate.id.new_generator_mappings</literal></entry>
+
+ <entry><para>true or false. Setting which indicates whether or
+ not the new <classname>IdentifierGenerator</classname>
+ implementations are used for AUTO, TABLE and SEQUENCE. Default
+ to false to keep backward compatibility.</para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table><note>
+ <para>We recommend all new projects to use
+ <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></para>
</section>
<section>
@@ -235,4 +317,4 @@
url="http://www.hibernate.org/hib_docs/v3/reference/en/html_single/#configurat...">Logging</ulink>
in the Hibernate Core documentation.</para>
</section>
-</chapter>
+</chapter>
\ No newline at end of file
14 years, 2 months
Hibernate SVN: r18832 - core/trunk/testsuite/src/test/java/org/hibernate/test/readonly.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-02-18 07:47:31 -0500 (Thu, 18 Feb 2010)
New Revision: 18832
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml
Log:
HHH-4908 Multiple failures reported during ReadOnlyProxyTest with Ingres
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml 2010-02-18 09:59:16 UTC (rev 18831)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml 2010-02-18 12:47:31 UTC (rev 18832)
@@ -13,10 +13,10 @@
<generator class="increment"/>
</id>
<property name="x">
- <column name="xval" not-null="true" precision="25" scale="20" unique-key="xy"/>
+ <column name="xval" not-null="true" precision="25" scale="19" unique-key="xy"/>
</property>
<property name="y">
- <column name="yval" not-null="true" precision="25" scale="20" unique-key="xy"/>
+ <column name="yval" not-null="true" precision="25" scale="19" unique-key="xy"/>
</property>
<property name="description"/>
</class>
14 years, 2 months
Hibernate SVN: r18831 - core/trunk/annotations/src/main/java/org/hibernate/cfg.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2010-02-18 04:59:16 -0500 (Thu, 18 Feb 2010)
New Revision: 18831
Modified:
core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java
core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java
Log:
HHH-4930 drop org. prefix on properties.
Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-02-18 09:29:30 UTC (rev 18830)
+++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationBinder.java 2010-02-18 09:59:16 UTC (rev 18831)
@@ -981,7 +981,7 @@
static void prepareDefaultCacheConcurrencyStrategy(Properties properties) {
if ( DEFAULT_CACHE_CONCURRENCY_STRATEGY != null ) {
- log.info( "Default cache concurrency strategy already defined" );
+ log.trace( "Default cache concurrency strategy already defined" );
return;
}
@@ -998,7 +998,7 @@
return;
}
- log.info( "Setting default cache concurrency strategy via config [" + strategy.name() + "]" );
+ log.debug( "Setting default cache concurrency strategy via config [" + strategy.name() + "]" );
DEFAULT_CACHE_CONCURRENCY_STRATEGY = strategy;
}
Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java 2010-02-18 09:29:30 UTC (rev 18830)
+++ core/trunk/annotations/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java 2010-02-18 09:59:16 UTC (rev 18831)
@@ -109,13 +109,14 @@
* to use when either {@link javax.persistence.Cacheable @Cacheable} or
* {@link Cache @Cache} is used. {@link Cache @Cache(strategy="..")} is used to override.
*/
- public static final String DEFAULT_CACHE_CONCURRENCY_STRATEGY = "org.hibernate.cache.default_cache_concurrency_strategy";
+ public static final String DEFAULT_CACHE_CONCURRENCY_STRATEGY = "hibernate.cache.default_cache_concurrency_strategy";
/**
- * Setting which indicates the Hibernate {@link org.hibernate.id.IdentifierGenerator} name to use as the mapping
- * for {@link javax.persistence.GenerationType#AUTO @GeneratedValue(strategy=AUTO...)}
+ * Setting which indicates whether or not the new {@link org.hibernate.id.IdentifierGenerator} are used
+ * for AUTO, TABLE and SEQUENCE.
+ * Default to false to keep backward compatibility.
*/
- public static final String USE_NEW_ID_GENERATOR_MAPPINGS = "org.hibernate.id.new_generator_mappings";
+ public static final String USE_NEW_ID_GENERATOR_MAPPINGS = "hibernate.id.new_generator_mappings";
/**
* Class name of the class needed to enable Search.
14 years, 2 months
Hibernate SVN: r18830 - in core/branches/envers-hibernate-3.3/src: main/java/org/hibernate/envers/configuration/metadata and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: adamw
Date: 2010-02-18 04:29:30 -0500 (Thu, 18 Feb 2010)
New Revision: 18830
Added:
core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java
core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java
core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java
Modified:
core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java
core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java
Log:
svn merge -r 18791:18829 https://svn.jboss.org/repos/hibernate/core/trunk/envers .
Modified: core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java
===================================================================
--- core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java 2010-02-18 09:21:17 UTC (rev 18829)
+++ core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java 2010-02-18 09:29:30 UTC (rev 18830)
@@ -84,7 +84,7 @@
classesAuditingData.updateCalculatedFields();
AuditMetadataGenerator auditMetaGen = new AuditMetadataGenerator(cfg, globalCfg, verEntCfg,
- revisionInfoRelationMapping, auditEntityNameRegister, classesAuditingData);
+ revisionInfoRelationMapping, auditEntityNameRegister);
// First pass
for (Map.Entry<PersistentClass, ClassAuditingData> pcDatasEntry : classesAuditingData.getAllClassAuditedData()) {
Modified: core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
===================================================================
--- core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java 2010-02-18 09:21:17 UTC (rev 18829)
+++ core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java 2010-02-18 09:29:30 UTC (rev 18830)
@@ -30,7 +30,6 @@
import org.dom4j.Element;
import org.hibernate.envers.configuration.GlobalConfiguration;
import org.hibernate.envers.configuration.AuditEntitiesConfiguration;
-import org.hibernate.envers.configuration.ClassesAuditingData;
import org.hibernate.envers.configuration.metadata.reader.ClassAuditingData;
import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData;
import org.hibernate.envers.entities.EntityConfiguration;
@@ -78,7 +77,6 @@
private final Map<String, EntityConfiguration> notAuditedEntitiesConfigurations;
private final AuditEntityNameRegister auditEntityNameRegister;
- private final ClassesAuditingData classesAuditingData;
// Map entity name -> (join descriptor -> element describing the "versioned" join)
private final Map<String, Map<Join, Element>> entitiesJoins;
@@ -86,8 +84,7 @@
public AuditMetadataGenerator(Configuration cfg, GlobalConfiguration globalCfg,
AuditEntitiesConfiguration verEntCfg,
Element revisionInfoRelationMapping,
- AuditEntityNameRegister auditEntityNameRegister,
- ClassesAuditingData classesAuditingData) {
+ AuditEntityNameRegister auditEntityNameRegister) {
this.cfg = cfg;
this.globalCfg = globalCfg;
this.verEntCfg = verEntCfg;
@@ -98,8 +95,7 @@
this.idMetadataGenerator = new IdMetadataGenerator(this);
this.toOneRelationMetadataGenerator = new ToOneRelationMetadataGenerator(this);
- this.auditEntityNameRegister = auditEntityNameRegister;
- this.classesAuditingData = classesAuditingData;
+ this.auditEntityNameRegister = auditEntityNameRegister;
entitiesConfigurations = new HashMap<String, EntityConfiguration>();
notAuditedEntitiesConfigurations = new HashMap<String, EntityConfiguration>();
@@ -377,7 +373,7 @@
if (!isAudited) {
String entityName = pc.getEntityName();
- IdMappingData idMapper = idMetadataGenerator.addId(pc);
+ IdMappingData idMapper = idMetadataGenerator.addId(pc, false);
if (idMapper == null) {
// Unsupported id mapping, e.g. key-many-to-one. If the entity is used in auditing, an exception
@@ -407,7 +403,7 @@
AuditTableData auditTableData = new AuditTableData(auditEntityName, auditTableName, schema, catalog);
// Generating a mapping for the id
- IdMappingData idMapper = idMetadataGenerator.addId(pc);
+ IdMappingData idMapper = idMetadataGenerator.addId(pc, true);
InheritanceType inheritanceType = InheritanceType.getForChild(pc);
@@ -495,10 +491,6 @@
return entitiesConfigurations;
}
- public ClassesAuditingData getClassesAuditingData() {
- return classesAuditingData;
- }
-
// Getters for generators and configuration
BasicMetadataGenerator getBasicMetadataGenerator() {
Modified: core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java
===================================================================
--- core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java 2010-02-18 09:21:17 UTC (rev 18829)
+++ core/branches/envers-hibernate-3.3/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java 2010-02-18 09:29:30 UTC (rev 18830)
@@ -56,7 +56,8 @@
}
@SuppressWarnings({"unchecked"})
- private void addIdProperties(Element parent, Iterator<Property> properties, SimpleMapperBuilder mapper, boolean key) {
+ private boolean addIdProperties(Element parent, Iterator<Property> properties, SimpleMapperBuilder mapper, boolean key,
+ boolean audited) {
while (properties.hasNext()) {
Property property = properties.next();
Type propertyType = property.getType();
@@ -67,14 +68,23 @@
property.getValue(), mapper, true, key);
if (!added) {
- throw new MappingException("Type not supported: " + propertyType.getClass().getName());
+ // If the entity is audited, and a non-supported id component is used, throwing an exception.
+ // If the entity is not audited, then we simply don't support this entity, even in
+ // target relation mode not audited.
+ if (audited) {
+ throw new MappingException("Type not supported: " + propertyType.getClass().getName());
+ } else {
+ return false;
+ }
}
}
}
+
+ return true;
}
@SuppressWarnings({"unchecked"})
- IdMappingData addId(PersistentClass pc) {
+ IdMappingData addId(PersistentClass pc, boolean audited) {
// Xml mapping which will be used for relations
Element rel_id_mapping = new DefaultElement("properties");
// Xml mapping which will be used for the primary key of the versions table
@@ -93,20 +103,28 @@
// Multiple id
mapper = new MultipleIdMapper(((Component) pc.getIdentifier()).getComponentClassName());
- addIdProperties(rel_id_mapping, (Iterator<Property>) id_mapper.getPropertyIterator(), mapper, false);
+ if (!addIdProperties(rel_id_mapping, (Iterator<Property>) id_mapper.getPropertyIterator(), mapper, false, audited)) {
+ return null;
+ }
// null mapper - the mapping where already added the first time, now we only want to generate the xml
- addIdProperties(orig_id_mapping, (Iterator<Property>) id_mapper.getPropertyIterator(), null, true);
+ if (!addIdProperties(orig_id_mapping, (Iterator<Property>) id_mapper.getPropertyIterator(), null, true, audited)) {
+ return null;
+ }
} else if (id_prop.isComposite()) {
// Embedded id
Component id_component = (Component) id_prop.getValue();
mapper = new EmbeddedIdMapper(getIdPropertyData(id_prop), id_component.getComponentClassName());
- addIdProperties(rel_id_mapping, (Iterator<Property>) id_component.getPropertyIterator(), mapper, false);
+ if (!addIdProperties(rel_id_mapping, (Iterator<Property>) id_component.getPropertyIterator(), mapper, false, audited)) {
+ return null;
+ }
// null mapper - the mapping where already added the first time, now we only want to generate the xml
- addIdProperties(orig_id_mapping, (Iterator<Property>) id_component.getPropertyIterator(), null, true);
+ if (!addIdProperties(orig_id_mapping, (Iterator<Property>) id_component.getPropertyIterator(), null, true, audited)) {
+ return null;
+ }
} else {
// Single id
Copied: core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java (from rev 18829, core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java)
===================================================================
--- core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java (rev 0)
+++ core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneIdNotAuditedTestEntity.java 2010-02-18 09:29:30 UTC (rev 18830)
@@ -0,0 +1,55 @@
+package org.hibernate.envers.test.entities.ids;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import java.io.Serializable;
+
+/**
+ * @author Adam Warski (adam at warski dot org)
+ */
+@Entity
+public class ManyToOneIdNotAuditedTestEntity implements Serializable {
+ @EmbeddedId
+ private ManyToOneNotAuditedEmbId id;
+
+ private String data;
+
+ public ManyToOneIdNotAuditedTestEntity() {
+ }
+
+ public ManyToOneNotAuditedEmbId getId() {
+ return id;
+ }
+
+ public void setId(ManyToOneNotAuditedEmbId id) {
+ this.id = id;
+ }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ManyToOneIdNotAuditedTestEntity that = (ManyToOneIdNotAuditedTestEntity) o;
+
+ if (data != null ? !data.equals(that.data) : that.data != null) return false;
+ if (id != null ? !id.equals(that.id) : that.id != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = id != null ? id.hashCode() : 0;
+ result = 31 * result + (data != null ? data.hashCode() : 0);
+ return result;
+ }
+}
Copied: core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java (from rev 18829, core/trunk/envers/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java)
===================================================================
--- core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java (rev 0)
+++ core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/entities/ids/ManyToOneNotAuditedEmbId.java 2010-02-18 09:29:30 UTC (rev 18830)
@@ -0,0 +1,48 @@
+package org.hibernate.envers.test.entities.ids;
+
+import org.hibernate.envers.test.entities.UnversionedStrTestEntity;
+
+import javax.persistence.Embeddable;
+import javax.persistence.ManyToOne;
+import java.io.Serializable;
+
+/**
+ * @author Adam Warski (adam at warski dot org)
+ */
+@Embeddable
+public class ManyToOneNotAuditedEmbId implements Serializable {
+ @ManyToOne
+ private UnversionedStrTestEntity id;
+
+ public ManyToOneNotAuditedEmbId() {
+ }
+
+ public ManyToOneNotAuditedEmbId(UnversionedStrTestEntity id) {
+ this.id = id;
+ }
+
+ public UnversionedStrTestEntity getId() {
+ return id;
+ }
+
+ public void setId(UnversionedStrTestEntity id) {
+ this.id = id;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ManyToOneNotAuditedEmbId that = (ManyToOneNotAuditedEmbId) o;
+
+ if (id != null ? !id.equals(that.id) : that.id != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return id != null ? id.hashCode() : 0;
+ }
+}
Copied: core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java (from rev 18829, core/trunk/envers/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java)
===================================================================
--- core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java (rev 0)
+++ core/branches/envers-hibernate-3.3/src/test/java/org/hibernate/envers/test/integration/ids/ManyToOneIdNotAudited.java 2010-02-18 09:29:30 UTC (rev 18830)
@@ -0,0 +1,52 @@
+package org.hibernate.envers.test.integration.ids;
+
+import org.hibernate.ejb.Ejb3Configuration;
+import org.hibernate.envers.test.AbstractEntityTest;
+import org.hibernate.envers.test.entities.StrTestEntity;
+import org.hibernate.envers.test.entities.UnversionedStrTestEntity;
+import org.hibernate.envers.test.entities.ids.ManyToOneIdNotAuditedTestEntity;
+import org.hibernate.envers.test.entities.ids.ManyToOneNotAuditedEmbId;
+import org.testng.annotations.Test;
+
+import javax.persistence.EntityManager;
+
+/**
+ * A test checking that when using Envers it is possible to have non-audited entities that use unsupported
+ * components in their ids, e.g. a many-to-one join to another entity.
+ * @author Adam Warski (adam at warski dot org)
+ */
+public class ManyToOneIdNotAudited extends AbstractEntityTest {
+ private ManyToOneNotAuditedEmbId id1;
+
+ public void configure(Ejb3Configuration cfg) {
+ cfg.addAnnotatedClass(ManyToOneIdNotAuditedTestEntity.class);
+ cfg.addAnnotatedClass(UnversionedStrTestEntity.class);
+ cfg.addAnnotatedClass(StrTestEntity.class);
+ }
+
+ @Test
+ public void initData() {
+ // Revision 1
+ EntityManager em = getEntityManager();
+ em.getTransaction().begin();
+
+ UnversionedStrTestEntity uste = new UnversionedStrTestEntity();
+ uste.setStr("test1");
+ em.persist(uste);
+
+ id1 = new ManyToOneNotAuditedEmbId(uste);
+
+ em.getTransaction().commit();
+
+ // Revision 2
+ em = getEntityManager();
+ em.getTransaction().begin();
+
+ ManyToOneIdNotAuditedTestEntity mtoinate = new ManyToOneIdNotAuditedTestEntity();
+ mtoinate.setData("data1");
+ mtoinate.setId(id1);
+ em.persist(mtoinate);
+
+ em.getTransaction().commit();
+ }
+}
14 years, 2 months
Hibernate SVN: r18829 - core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata.
by hibernate-commits＠lists.jboss.org
Author: adamw
Date: 2010-02-18 04:21:17 -0500 (Thu, 18 Feb 2010)
New Revision: 18829
Modified:
core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
Log:
Removing unused field/method
Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
===================================================================
--- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java 2010-02-18 09:19:31 UTC (rev 18828)
+++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java 2010-02-18 09:21:17 UTC (rev 18829)
@@ -30,7 +30,6 @@
import org.dom4j.Element;
import org.hibernate.envers.configuration.GlobalConfiguration;
import org.hibernate.envers.configuration.AuditEntitiesConfiguration;
-import org.hibernate.envers.configuration.ClassesAuditingData;
import org.hibernate.envers.configuration.metadata.reader.ClassAuditingData;
import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData;
import org.hibernate.envers.entities.EntityConfiguration;
14 years, 2 months
Hibernate SVN: r18828 - in core/trunk/envers/src/main/java/org/hibernate/envers/configuration: metadata and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: adamw
Date: 2010-02-18 04:19:31 -0500 (Thu, 18 Feb 2010)
New Revision: 18828
Modified:
core/trunk/envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java
core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
Log:
Removing unused field/method
Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java
===================================================================
--- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java 2010-02-18 09:17:24 UTC (rev 18827)
+++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java 2010-02-18 09:19:31 UTC (rev 18828)
@@ -84,7 +84,7 @@
classesAuditingData.updateCalculatedFields();
AuditMetadataGenerator auditMetaGen = new AuditMetadataGenerator(cfg, globalCfg, verEntCfg,
- revisionInfoRelationMapping, auditEntityNameRegister, classesAuditingData);
+ revisionInfoRelationMapping, auditEntityNameRegister);
// First pass
for (Map.Entry<PersistentClass, ClassAuditingData> pcDatasEntry : classesAuditingData.getAllClassAuditedData()) {
Modified: core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
===================================================================
--- core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java 2010-02-18 09:17:24 UTC (rev 18827)
+++ core/trunk/envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java 2010-02-18 09:19:31 UTC (rev 18828)
@@ -78,7 +78,6 @@
private final Map<String, EntityConfiguration> notAuditedEntitiesConfigurations;
private final AuditEntityNameRegister auditEntityNameRegister;
- private final ClassesAuditingData classesAuditingData;
// Map entity name -> (join descriptor -> element describing the "versioned" join)
private final Map<String, Map<Join, Element>> entitiesJoins;
@@ -86,8 +85,7 @@
public AuditMetadataGenerator(Configuration cfg, GlobalConfiguration globalCfg,
AuditEntitiesConfiguration verEntCfg,
Element revisionInfoRelationMapping,
- AuditEntityNameRegister auditEntityNameRegister,
- ClassesAuditingData classesAuditingData) {
+ AuditEntityNameRegister auditEntityNameRegister) {
this.cfg = cfg;
this.globalCfg = globalCfg;
this.verEntCfg = verEntCfg;
@@ -98,8 +96,7 @@
this.idMetadataGenerator = new IdMetadataGenerator(this);
this.toOneRelationMetadataGenerator = new ToOneRelationMetadataGenerator(this);
- this.auditEntityNameRegister = auditEntityNameRegister;
- this.classesAuditingData = classesAuditingData;
+ this.auditEntityNameRegister = auditEntityNameRegister;
entitiesConfigurations = new HashMap<String, EntityConfiguration>();
notAuditedEntitiesConfigurations = new HashMap<String, EntityConfiguration>();
@@ -458,10 +455,6 @@
return entitiesConfigurations;
}
- public ClassesAuditingData getClassesAuditingData() {
- return classesAuditingData;
- }
-
// Getters for generators and configuration
BasicMetadataGenerator getBasicMetadataGenerator() {
14 years, 2 months