[hibernate-commits] [hibernate/hibernate-core] b5dcff: HHH-4646 and HHH-5177

Branch: refs/heads/3.6 Home: http://github.com/hibernate/hibernate-core Commit: b5dcff0cafbfa2b20297bc63555b7ce3ad232d62 http://github.com/hibernate/hibernate-core/commit/b5dcff0cafbfa2b20297bc6... Author: Hernán Chanfreau <hchanfreau(a)gmail.com&gt; Date: 2010-10-19 (Tue, 19 Oct 2010) Changed paths: R envers/src/test/java/org/hibernate/envers/test/integration/superclass/MappedSubclassing.java R envers/src/test/java/org/hibernate/envers/test/integration/superclass/SubclassEntity.java R envers/src/test/java/org/hibernate/envers/test/integration/superclass/SuperclassOfEntity.java Log Message: ----------- HHH-4646 and HHH-5177 Deleting obsolete tests Commit: d05f2d808426eec5ce27885ac500562e5ecc2a02 http://github.com/hibernate/hibernate-core/commit/d05f2d808426eec5ce27885... Author: Hernán Chanfreau <hchanfreau(a)gmail.com&gt; Date: 2010-10-19 (Tue, 19 Oct 2010) Changed paths: M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesHolder.java M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ClassAuditingData.java M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditingData.java Log Message: ----------- Fix for HHH-4646 and HHH-5177 added methods isEmpty() and contains(key) Commit: 938baa279d108ec83c1197c6cd9fa8fa40792b48 http://github.com/hibernate/hibernate-core/commit/938baa279d108ec83c1197c... Author: Hernán Chanfreau <hchanfreau(a)gmail.com&gt; Date: 2010-10-19 (Tue, 19 Oct 2010) Changed paths: M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java A envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditedPropertiesReader.java Log Message: ----------- Fix for HHH-4646 and HHH-5177 - Read audited properties from subclasses first, then check recursively on superclasses. - Chech on superclasses only if a class is audited - Calculate if the "current" class of the recursion is audited at class level. - Created ComponentAuditedPropertiesReader subclass for AuditedPropertiesReader to use for reading component audited properties inside classes - Created a protected method in AuditedPropertiesReader, letting the subclass do their job. - Ordered the code to be more understandable. Commit: 4e886b2d0cc0ddbd7b551455da27af08d48ae30d http://github.com/hibernate/hibernate-core/commit/4e886b2d0cc0ddbd7b55145... Author: Hernán Chanfreau <hchanfreau(a)gmail.com&gt; Date: 2010-10-19 (Tue, 19 Oct 2010) Changed paths: A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java M envers/src/test/resources/testng.xml Log Message: ----------- Fix for HHH-4646 and HHH-5177 Adding tests cases: - MappedSuperclass audited at class level with a NotAuditedSubclass and: - Audited subclass at class level - Audited subclass at method/field level - MappedSuperclass audited at method/field level with a NotAuditedSubclass and: - Audited subclass at class level - Audited subclass at method/field level Commit: b274c7218b90ee8e4fb24369b6890d6d4fd29aa9 http://github.com/hibernate/hibernate-core/commit/b274c7218b90ee8e4fb2436... Author: adamw <adam(a)warski.org&gt; Date: 2010-10-20 (Wed, 20 Oct 2010) Changed paths: M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesHolder.java M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ClassAuditingData.java A envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditedPropertiesReader.java M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditingData.java R envers/src/test/java/org/hibernate/envers/test/integration/superclass/MappedSubclassing.java R envers/src/test/java/org/hibernate/envers/test/integration/superclass/SubclassEntity.java R envers/src/test/java/org/hibernate/envers/test/integration/superclass/SuperclassOfEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/AuditedMethodMappedSuperclass.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/NotAuditedSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditAtMethodSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/AuditedAllMappedSuperclass.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/NotAuditedSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/AuditedAllSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditAllSubclass/MappedSubclassingAllAuditedTest.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/AuditedMethodSubclassEntity.java A envers/src/test/java/org/hibernate/envers/test/integration/superclass/auditedAtSuperclassLevel/auditMethodSubclass/MappedSubclassingMethodAuditedTest.java M envers/src/test/resources/testng.xml Log Message: ----------- Merge branch '3.6' of http://github.com/hernanch/hibernate-core into hernanch-3.6 Commit: 97d3f84180c4b6326268aa0f7b515ce2a650e2e9 http://github.com/hibernate/hibernate-core/commit/97d3f84180c4b6326268aa0... Author: adamw <adam(a)warski.org&gt; Date: 2010-10-21 (Thu, 21 Oct 2010) Changed paths: M envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java Log Message: ----------- Fix for HHH-4646 and HHH-5177: removing unneeded addPropertiesFromClassRec method