[hibernate-commits] [hibernate/hibernate-orm] e010e4: HHH-9106 : Merging multiple representations of the...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: e010e455c9ecc318efb15a961f988c4e87b5dc28
      https://github.com/hibernate/hibernate-orm/commit/e010e455c9ecc318efb15a961f988c4e87b5dc28
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
    A hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEntityCopyObserver.java
    M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
    A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyNotAllowedObserver.java
    A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyObserver.java
    R hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java
    A hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java
    A hibernate-core/src/main/java/org/hibernate/event/internal/NoEntityCopiesMergeEventListener.java
    R hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.java
    M hibernate-core/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java
    M hibernate-core/src/test/java/org/hibernate/test/ops/Category.java
    M hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.java
    A hibernate-core/src/test/java/org/hibernate/test/ops/HoarderOrphanDelete.hbm.xml
    M hibernate-core/src/test/java/org/hibernate/test/ops/Item.java
    A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsNotAllowedTest.java
    A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java
    A hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java
    M hibernate-core/src/test/java/org/hibernate/test/ops/MergeTest.java
    A hibernate-core/src/test/java/org/hibernate/test/ops/SubCategory.java
    A hibernate-core/src/test/java/org/hibernate/test/ops/SubItem.java
    M hibernate-core/src/test/resources/log4j.properties
    A hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/core/JpaNoEntityCopiesMergeEventListener.java
    M hibernate-entitymanager/src/test/resources/log4j.properties

  Log Message:
  -----------
  HHH-9106 : Merging multiple representations of the same entity merged

(cherry picked from commit 70532259faa14064cff8263cbb7ad6d82d607892)

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/ops/MergeTest.java
	hibernate-core/src/test/resources/log4j.properties


  Commit: 5d7266bc04b85a6db53fcab66eaf13e0d1aec0b4
      https://github.com/hibernate/hibernate-orm/commit/5d7266bc04b85a6db53fcab66eaf13e0d1aec0b4
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsOrphanDeleteTest.java
    M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java

  Log Message:
  -----------
  HHH-9239 HHH-9240 : FailureExpected test cases when merging entity copies with dirty collections

(cherry picked from commit c7c5b015c134df993de4105a2bc3e70d7e14ad68)


  Commit: caaee7bdab0c6988a3815acfeb89b63ac975c87b
      https://github.com/hibernate/hibernate-orm/commit/caaee7bdab0c6988a3815acfeb89b63ac975c87b
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    R hibernate-core/src/main/java/org/hibernate/event/internal/DefaultEntityCopyObserver.java
    M hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
    A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java
    A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedMergeEventListener.java
    A hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java
    R hibernate-core/src/main/java/org/hibernate/event/internal/NoEntityCopiesMergeEventListener.java
    A hibernate-core/src/test/java/org/hibernate/event/internal/MergeContextTest.java
    M hibernate-core/src/test/java/org/hibernate/test/ops/Category.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
    M hibernate-core/src/test/resources/log4j.properties
    A hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/core/JpaEntityCopyAllowedMergeEventListener.java
    R hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/internal/core/JpaNoEntityCopiesMergeEventListener.java
    M hibernate-entitymanager/src/test/resources/log4j.properties

  Log Message:
  -----------
  HHH-9106 : Merging multiple representations of the same entity

(cherry picked from commit 2daaf9a1965b70897928ea222ea8708acaad3bbd)

Conflicts:
	hibernate-core/src/test/resources/log4j.properties


  Commit: db3fea1ad0c52a5d1ad3a3cce9ba2b6212858022
      https://github.com/hibernate/hibernate-orm/commit/db3fea1ad0c52a5d1ad3a3cce9ba2b6212858022
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Category.java
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Hoarder.java
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/Item.java
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsAllowedTest.java
    A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/emops/MergeMultipleEntityRepresentationsNotAllowedTest.java

  Log Message:
  -----------
  HHH-9106 : Merging multiple representations of the same entity (entitymanager test cases)

(cherry picked from commit 055b0cacaec4fbb136a1fc592fa00cb7e950eb61)


  Commit: e361def028f06200297c6736087edc609ec224b2
      https://github.com/hibernate/hibernate-orm/commit/e361def028f06200297c6736087edc609ec224b2
  Author: Gail Badner <gbadner at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M hibernate-core/src/test/java/org/hibernate/test/ops/MergeMultipleEntityRepresentationsTest.java

  Log Message:
  -----------
  HHH-9245 : <list> mapped in hbm.xml ends up as a bag (test case)


Compare: https://github.com/hibernate/hibernate-orm/compare/219dfbf3bcfd...e361def028f0