[hibernate-commits] [hibernate/hibernate-core] 57f5dc: HHH-5800 Add tests and fixes for many-to-one orm X...

noreply at github.com noreply at github.com
Mon Jan 3 12:55:50 EST 2011 

Branch: refs/heads/3.6
Home:   https://github.com/hibernate/hibernate-core

Commit: 57f5dce48c21277a36864c66af955e918338e233
    https://github.com/hibernate/hibernate-core/commit/57f5dce48c21277a36864c66af955e918338e233
Author: davidmc24 <david at carrclan.us>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml

Log Message:
-----------
HHH-5800 Add tests and fixes for many-to-one orm XML support


Commit: 926c35a1b51b2a9b00b57e02bf47670ce5792e1a
    https://github.com/hibernate/hibernate-core/commit/926c35a1b51b2a9b00b57e02bf47670ce5792e1a
Author: davidmc24 <david at carrclan.us>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml

Log Message:
-----------
HHH-5800 Add tests for one-to-many orm XML support


Commit: 9ae8e5f1d49471f54acea23ddee39668166cdaaa
    https://github.com/hibernate/hibernate-core/commit/9ae8e5f1d49471f54acea23ddee39668166cdaaa
Author: davidmc24 <david at carrclan.us>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml

Log Message:
-----------
Attempt to match Hibernate code conventions


Commit: 463f694493a14ef00e24eca025f6c55743826f2a
    https://github.com/hibernate/hibernate-core/commit/463f694493a14ef00e24eca025f6c55743826f2a
Author: davidmc24 <david at carrclan.us>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOnetoOneTest.java
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm2.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm9.xml

Log Message:
-----------
HHH-5800 Add tests for one-to-one orm XML support


Commit: 176f7e77ecb604db5566cf8dc95f95c949119803
    https://github.com/hibernate/hibernate-core/commit/176f7e77ecb604db5566cf8dc95f95c949119803
Author: davidmc24 <david at carrclan.us>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm3.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm9.xml

Log Message:
-----------
HHH-5800 Add tests for many-to-many orm XML support


Commit: f577191be3cd173144c5c07b473c17d57a85e7bb
    https://github.com/hibernate/hibernate-core/commit/f577191be3cd173144c5c07b473c17d57a85e7bb
Author: davidmc24 <david at carrclan.us>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java
  A testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java
  R testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOnetoOneTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm3.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml
  A testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml
  M testsuite/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml

Log Message:
-----------
HHH-5800 Add tests for element-collection orm XML support


Commit: 191162974122a800257175eeb62f588018e1d6a7
    https://github.com/hibernate/hibernate-core/commit/191162974122a800257175eeb62f588018e1d6a7
Author: davidmc24 <david at carrclan.us>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java

Log Message:
-----------
HHH-5800 Fix override handling for associations as per chapter 12 of the JPA 2.0 specification.

Some subelements should merge with Java annotations in some contexts (such as directly within an entity) but not in others (such as in an association mapping).  The methods to handle these elements were enhanced to be aware of these two different modes through the use of a boolean flag.


Commit: a2a2e64361a2f589a493008e2cca4d7632fe2f74
    https://github.com/hibernate/hibernate-core/commit/a2a2e64361a2f589a493008e2cca4d7632fe2f74
Author: Hardy Ferentschik <hardy at ferentschik.de>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java

Log Message:
-----------
HHH-5800 Applying Hibernate code formatting style


Commit: 56276dc87815b27a6cfad48b940b27792339f94b
    https://github.com/hibernate/hibernate-core/commit/56276dc87815b27a6cfad48b940b27792339f94b
Author: Hardy Ferentschik <hardy at ferentschik.de>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java

Log Message:
-----------
HHH-5800 Formatting


Commit: 15607fdcfaccb7fe5f579a86629ed77a8aae4fbd
    https://github.com/hibernate/hibernate-core/commit/15607fdcfaccb7fe5f579a86629ed77a8aae4fbd
Author: Hardy Ferentschik <hardy at ferentschik.de>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M testsuite/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java

Log Message:
-----------
HHH-5800 This test now also derives from HibernateTestCase. This way the test aligned with the tests added for this issue.

 In order to backport from trunk I also added an empty implementation of closeResource() to the test classes


Commit: 6b635a14722eca9385fac9946f7c7cb15ffeba54
    https://github.com/hibernate/hibernate-core/commit/6b635a14722eca9385fac9946f7c7cb15ffeba54
Author: Hardy Ferentschik <hardy at ferentschik.de>
Date:   2011-01-03 (Mon, 03 Jan 2011)

Changed paths:
  M cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java
  M cache-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java
  M core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java
  M envers/src/main/java/org/hibernate/envers/tools/Tools.java
  A envers/src/test/java/org/hibernate/envers/test/integration/proxy/AuditedCollectionProxyTest.java
  M testsuite/src/test/java/org/hibernate/test/annotations/generics/Classes.java
  M testsuite/src/test/java/org/hibernate/test/annotations/various/readwriteexpression/Staff.java
  A testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
  A testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
  A testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml
  A testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
  M testsuite/src/test/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java
  M testsuite/src/test/java/org/hibernate/test/component/basic/User.hbm.xml
  M testsuite/src/test/java/org/hibernate/test/filter/Product.hbm.xml
  M testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
  M testsuite/src/test/java/org/hibernate/test/hql/Animal.hbm.xml
  M testsuite/src/test/java/org/hibernate/test/join/Person.hbm.xml
  M testsuite/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml
  M testsuite/src/test/java/org/hibernate/test/legacy/FooBarTest.java
  M testsuite/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml
  M testsuite/src/test/java/org/hibernate/test/unionsubclass2/Person.hbm.xml
  M testsuite/src/test/resources/hibernate.properties

Log Message:
-----------
Merge branch '3.6' of github.com:hibernate/hibernate-core into 3.6

More information about the hibernate-commits mailing list