Author: epbernard Date: 2010-01-25 12:57:07 -0500 (Mon, 25 Jan 2010) New Revision: 18620 Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/EmployeeId.java Log: HHH-4529 add new test Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Dependent.java 2010-01-25 17:57:07 UTC (rev 18620) @@ -0,0 +1,25 @@ +package org.hibernate.test.annotations.derivedidentities.e2.b; + +import javax.persistence.EmbeddedId; +import javax.persistence.Entity; +import javax.persistence.JoinColumn; +import javax.persistence.JoinColumns; +import javax.persistence.ManyToOne; +import javax.persistence.MapsId; + +/** + * @author Emmanuel Bernard + */ +@Entity +public class Dependent { + @EmbeddedId + DependentId id; + + @MapsId("empPK") + @JoinColumns({ + @JoinColumn(name = "FK1", referencedColumnName = "firstName"), + @JoinColumn(name = "FK2", referencedColumnName = "lastName") + }) + @ManyToOne + Employee emp; +} Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/DependentId.java 2010-01-25 17:57:07 UTC (rev 18620) @@ -0,0 +1,13 @@ +package org.hibernate.test.annotations.derivedidentities.e2.b; + +import java.io.Serializable; +import javax.persistence.Embeddable; + +/** + * @author Emmanuel Bernard + */ +@Embeddable +public class DependentId implements Serializable { + String name; + EmployeeId empPK; +} \ No newline at end of file Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/Employee.java 2010-01-25 17:57:07 UTC (rev 18620) @@ -0,0 +1,17 @@ +package org.hibernate.test.annotations.derivedidentities.e2.b; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.IdClass; + +/** + * @author Emmanuel Bernard + */ +@Entity +(a)IdClass(EmployeeId.class) +public class Employee { + @Id + String firstName; + @Id + String lastName; +} \ No newline at end of file Added: core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/EmployeeId.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/EmployeeId.java (rev 0) +++ core/trunk/annotations/src/test/java/org/hibernate/test/annotations/derivedidentities/e2/b/EmployeeId.java 2010-01-25 17:57:07 UTC (rev 18620) @@ -0,0 +1,9 @@ +package org.hibernate.test.annotations.derivedidentities.e2.b; + +/** + * @author Emmanuel Bernard + */ +public class EmployeeId { + String firstName; + String lastName; +} \ No newline at end of file