Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: 9bdd76b0e70fe9d7d86dd3182ebeb1a260160bf1 https://github.com/hibernate/hibernate-core/commit/9bdd76b0e70fe9d7d86dd3... Author: davidmc24 <david(a)carrclan.us&gt; Date: 2011-01-01 (Sat, 01 Jan 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity1.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml A hibernate-core/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: 6de52c2db3d6357cfe02ebf8f506054554fd00f0 https://github.com/hibernate/hibernate-core/commit/6de52c2db3d6357cfe02eb... Author: davidmc24 <david(a)carrclan.us&gt; Date: 2011-01-01 (Sat, 01 Jan 2011) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml A hibernate-core/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: e0b06e8a57cd7abbf1eb8f4bd0867195bc44b7ab https://github.com/hibernate/hibernate-core/commit/e0b06e8a57cd7abbf1eb8f... Author: davidmc24 <david(a)carrclan.us&gt; Date: 2011-01-01 (Sat, 01 Jan 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm1.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm2.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm3.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm4.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm6.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm7.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm8.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm9.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm1.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm10.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm11.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm12.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm13.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm14.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm15.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm16.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm18.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm19.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm2.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm20.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm21.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm22.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm23.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm3.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm4.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm5.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm6.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm7.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm8.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm9.xml Log Message: ----------- Attempt to match Hibernate code conventions Commit: 33d9cbaa766829f236a5d06a49759f133f633b04 https://github.com/hibernate/hibernate-core/commit/33d9cbaa766829f236a5d0... Author: davidmc24 <david(a)carrclan.us&gt; Date: 2011-01-01 (Sat, 01 Jan 2011) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOnetoOneTest.java A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm1.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm10.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm11.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm2.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm3.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm4.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm5.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm6.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm7.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-one.orm8.xml A hibernate-core/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: af1e078f83d121c3f57abe21c9d34e99fd8a8092 https://github.com/hibernate/hibernate-core/commit/af1e078f83d121c3f57abe... Author: davidmc24 <david(a)carrclan.us&gt; Date: 2011-01-01 (Sat, 01 Jan 2011) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm1.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm10.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm11.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm12.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm13.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm14.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm15.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm16.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm18.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm19.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm2.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm20.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm21.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm3.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm4.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm5.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm6.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm7.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm8.xml A hibernate-core/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: 99c4ecef99246836dc424dfecb0fbaf102142ead https://github.com/hibernate/hibernate-core/commit/99c4ecef99246836dc424d... Author: davidmc24 <david(a)carrclan.us&gt; Date: 2011-01-01 (Sat, 01 Jan 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOnetoOneTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm1.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm10.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm11.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm12.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm13.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm14.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm15.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm16.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm17.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm18.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm19.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm2.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm20.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm21.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm22.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm23.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm24.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm25.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm26.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm27.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm28.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm3.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm4.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm5.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm6.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm7.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm8.xml A hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/element-collection.orm9.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-many.orm17.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/many-to-one.orm5.xml M hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/one-to-many.orm17.xml M hibernate-core/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: bde29a52d274be55687322094082bca0ae907076 https://github.com/hibernate/hibernate-core/commit/bde29a52d274be55687322... Author: davidmc24 <david(a)carrclan.us&gt; Date: 2011-01-01 (Sat, 01 Jan 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java M hibernate-core/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: 95c23b6f507f95480f8f0d2b403617cba922c3f5 https://github.com/hibernate/hibernate-core/commit/95c23b6f507f95480f8f0d... Author: Hardy Ferentschik <hardy(a)ferentschik.de&gt; Date: 2011-01-03 (Mon, 03 Jan 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToManyTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToManyTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity2.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Entity3.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Manufacturer.java Log Message: ----------- HHH-5800 Applying Hibernate code formatting style Commit: dc9172774236eafb95bfce30222f12f75ca8066f https://github.com/hibernate/hibernate-core/commit/dc9172774236eafb95bfce... Author: Hardy Ferentschik <hardy(a)ferentschik.de&gt; Date: 2011-01-03 (Mon, 03 Jan 2011) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java Log Message: ----------- HHH-5800 This test now also derives from HibernateTestCase. This way the test is aligned with the tests added for this issue.