modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 2 +- modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java | 5 +++++ modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRolePK.java | 9 ++++++++- 3 files changed, 14 insertions(+), 2 deletions(-)
New commits: commit 9e4ca33363b357405733065e27f98e66d46535c1 Author: Partha Aji paji@redhat.com Date: Wed Feb 24 12:51:22 2010 -0500
More updates on the Mapping
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java index 191106e..73d074a 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java @@ -226,7 +226,7 @@ public class Subject implements Externalizable { @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE }) private Configuration configuration;
- @OneToMany(mappedBy = "user") + @OneToMany(mappedBy = "subject") private Set<SubjectRoleEntity> subjectRoles;
@Transient diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java index ea110f7..3636fb5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRoleEntity.java @@ -37,6 +37,11 @@ import org.rhq.core.domain.authz.Role; @Table(name = "RHQ_SUBJECT_ROLE_MAP") public class SubjectRoleEntity implements Serializable {
+ /** + * + */ + private static final long serialVersionUID = 1L; + @Id private Subject subject;
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRolePK.java b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRolePK.java index e881b5b..8b6259c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRolePK.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/auth/SubjectRolePK.java @@ -19,6 +19,8 @@
package org.rhq.core.domain.auth;
+import java.io.Serializable; + import javax.persistence.JoinColumn; import javax.persistence.ManyToOne;
@@ -28,7 +30,12 @@ import org.rhq.core.domain.authz.Role; * @author paji * */ -public class SubjectRolePK { +public class SubjectRolePK implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + @ManyToOne @JoinColumn(name = "USER_ID", referencedColumnName = "ID") private Subject subject;
rhq-commits@lists.fedorahosted.org