[hibernate-commits] [hibernate/hibernate-orm] 0c271a: HHH-7568 Added test case to check removal of compo...

[GitHub]

  Branch: refs/heads/4.1
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 0c271ac77a62518318acb78aae218a0c3a5fb667
      https://github.com/hibernate/hibernate-orm/commit/0c271ac77a62518318acb78aae218a0c3a5fb667
  Author: Jeremy Whiting <whitingjr at hotmail.com>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwo.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerInventoryTwoPK.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CustomerTwo.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/hbm_order.xml
    A hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b/specjmapid/lazy/order_orm.xml

  Log Message:
  -----------
  HHH-7568 Added test case to check removal of compound key association items. Changed the detection of JoinColumns to work when orm/hbm xml is used. Added change to configure a property when JoinColumns annotation is used on entity definition.
(cherry picked from commit 961caf770a4e6fd4e97d08aef83ee07b247a49e3)


  Commit: 053b676684b7864e7e79b6c4d89bb63704cbc361
      https://github.com/hibernate/hibernate-orm/commit/053b676684b7864e7e79b6c4d89bb63704cbc361
  Author: Steve Ebersole <steve at hibernate.org>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java

  Log Message:
  -----------
  HHH-7568 - Add JPA1.0 compound key compatability when orm descriptor file used to override annotations.
(cherry picked from commit 6a48cccd5d250fb25768fd9c7a28c750f002c6f9)


Compare: https://github.com/hibernate/hibernate-orm/compare/bcc76ece6dd8...053b676684b7