Branch: refs/heads/master
Home: https://github.com/hibernate/hibernate-orm
Commit: 1472681dc2e7771dda52dbc9abeac3cafbe336cc
https://github.com/hibernate/hibernate-orm/commit/1472681dc2e7771dda52dbc9abeac3cafbe336cc
Author: Gail Badner <gbadner at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
M hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java
R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedMergeEventListener.java
M hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java
M hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java
R hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserver.java
M hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java
A hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java
M hibernate-core/src/test/java/org/hibernate/event/internal/MergeContextTest.java
M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsNotAllowedTest.java
M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java
M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java
R hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/core/JpaEntityCopyAllowedMergeEventListener.java
M hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java
Log Message:
-----------
HHH-9106 : Merging multiple representations of the same entity (using StrategySelector)
(cherry picked from commit 6203b5da308ad45167ad0cbcc44214433b4e7f7b)
Commit: c7c57fc7ee3319f371ee9778d3974af94399c265
https://github.com/hibernate/hibernate-orm/commit/c7c57fc7ee3319f371ee9778d3974af94399c265
Author: Gail Badner <gbadner at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesAllowedLoggedTest.java
A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java
A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesAllowedTest.java
A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesCustomTest.java
A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityCopiesDisallowedTest.java
R hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsNotAllowedTest.java
R hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java
R hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesAllowedLoggedTest.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesAllowedTest.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesCustomTest.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityCopiesDisallowedTest.java
R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java
R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsNotAllowedTest.java
Log Message:
-----------
HHH-9106 : Merging multiple representations of the same entity (tests using StrategySelector)
(cherry picked from commit 368cdc1966b2018e03a3a5a0a6cf420a9939c398)
Commit: 9d67bf32188b46f63481d34844cdafbe0ebf8fec
https://github.com/hibernate/hibernate-orm/commit/9d67bf32188b46f63481d34844cdafbe0ebf8fec
Author: Gail Badner <gbadner at redhat.com>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Changed paths:
M hibernate-core/src/test/resources/log4j.properties
M hibernate-entitymanager/src/test/resources/log4j.properties
Log Message:
-----------
HHH-9106 : Merging multiple representations of the same entity (logging)
(cherry picked from commit 31bcb0ea0a73c32bbb430ac6eed54005f01a40f2)
Conflicts:
hibernate-core/src/test/resources/log4j.properties
Compare: https://github.com/hibernate/hibernate-orm/compare/b0a2ae9d66bd...9d67bf32188b