[hibernate-commits] [hibernate/hibernate-orm] 1cba98: HHH-9388 HHH-7079 : Default collection table and f...

Branch: refs/heads/4.3 Home: https://github.com/hibernate/hibernate-orm Commit: 1cba98022ec0ccb30f6a68547c050663daf51a96 https://github.com/hibernate/hibernate-orm/commit/1cba98022ec0ccb30f6a685... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-10-20 (Mon, 20 Oct 2014) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java M hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java M hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java M hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java M hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java M hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameNormalizer.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/AbstractLegacyNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/AbstractNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/DefaultNamingStrategyDelegator.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/HbmNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/JpaNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyHbmNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyNamingStrategyDelegator.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyStandardNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/NamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/NamingStrategyDelegator.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java M hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java M hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java M hibernate-core/src/test/java/org/hibernate/id/enhanced/SequenceStyleConfigUnitTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CustomNamingCollectionElementTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/LegacyNamingCollectionElementTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Group.java M hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java A hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/LegacyManyToManyDefaultsTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ManyToManyDefaultsTest.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/AvailableSettings.java M hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/MyLegacyNamingStrategyDelegator.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/MyNamingStrategyDelegator.java A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/ejb3configuration/NamingStrategyDelegatorConfigurationTest.java Log Message: ----------- HHH-9388 HHH-7079 : Default collection table and foreign key names are incorrect in some cases; deprecate NamingStrategy (cherry picked from commit 36576046b8df859a672c90182522048dd18e1e74) Conflicts: hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/IdentifierGeneratorResolver.java hibernate-entitymanager/src/main/java/org/hibernate/ejb/AvailableSettings.java hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java Commit: 52f2c3a002b65aa530a467f4fff7b5eb50d0dd92 https://github.com/hibernate/hibernate-orm/commit/52f2c3a002b65aa530a467f... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2014-10-20 (Mon, 20 Oct 2014) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java M hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java M hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java M hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java R hibernate-core/src/main/java/org/hibernate/cfg/naming/AbstractLegacyNamingStrategyDelegate.java R hibernate-core/src/main/java/org/hibernate/cfg/naming/AbstractNamingStrategyDelegate.java R hibernate-core/src/main/java/org/hibernate/cfg/naming/DefaultNamingStrategyDelegator.java M hibernate-core/src/main/java/org/hibernate/cfg/naming/HbmNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/ImprovedNamingStrategyDelegator.java M hibernate-core/src/main/java/org/hibernate/cfg/naming/JpaNamingStrategyDelegate.java M hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyHbmNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyJpaNamingStrategyDelegate.java M hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyNamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyNamingStrategyDelegateAdapter.java M hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyNamingStrategyDelegator.java R hibernate-core/src/main/java/org/hibernate/cfg/naming/LegacyStandardNamingStrategyDelegate.java M hibernate-core/src/main/java/org/hibernate/cfg/naming/NamingStrategyDelegate.java A hibernate-core/src/main/java/org/hibernate/cfg/naming/NamingStrategyDelegateAdapter.java M hibernate-core/src/main/java/org/hibernate/cfg/naming/NamingStrategyDelegator.java R hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CustomNamingCollectionElementTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/LegacyNamingCollectionElementTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/Group.java M hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/GroupWithSet.java A hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/DefaultNamingManyToManyTest.java A hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ImprovedManyToManyDefaultsTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/LegacyManyToManyDefaultsTest.java R hibernate-core/src/test/java/org/hibernate/test/annotations/manytomany/defaults/ManyToManyDefaultsTest.java M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/MyNamingStrategyDelegator.java M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/ejb3configuration/NamingStrategyDelegatorConfigurationTest.java Log Message: ----------- HHH-9388 HHH-7079 : Default collection table and foreign key names are incorrect in some cases; deprecate NamingStrategy (cherry picked from commit e5a31caa09b56ace6ad4aa4ccb99a0ad63b1ad31) Conflicts: hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/MyNamingStrategyDelegator.java Compare: https://github.com/hibernate/hibernate-orm/compare/c60c97b468be...52f2c3a...