Adding order columns to persistence schema
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/30c3441c Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/30c3441c Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/30c3441c Branch: refs/heads/master Commit: 30c3441cd4ed3083d9469a81fed47ced2ad9bdfb Parents: f3bcedf Author: Martin Stockhammer <[email protected]> Authored: Fri Sep 30 22:38:08 2016 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Fri Sep 30 22:38:08 2016 +0200 ---------------------------------------------------------------------- .../apache/archiva/redback/rbac/jpa/JpaRbacManager.java | 1 + .../apache/archiva/redback/rbac/jpa/model/JpaRole.java | 3 +++ .../redback/rbac/jpa/model/JpaUserAssignment.java | 12 ++++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/30c3441c/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java index ced9104..80580e4 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/JpaRbacManager.java @@ -425,6 +425,7 @@ public class JpaRbacManager extends AbstractRBACManager { em.remove(ua); } em.getTransaction().commit(); + em.clear(); } http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/30c3441c/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaRole.java ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaRole.java b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaRole.java index 1f8a62c..98c4bf2 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaRole.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaRole.java @@ -21,6 +21,7 @@ package org.apache.archiva.redback.rbac.jpa.model; import org.apache.archiva.redback.rbac.AbstractRole; import org.apache.archiva.redback.rbac.Permission; +import org.springframework.core.annotation.Order; import javax.persistence.*; import java.io.Serializable; @@ -46,6 +47,7 @@ public class JpaRole extends AbstractRole implements Serializable { @Column(name="PERMANENT") private boolean permanent; @ManyToMany(cascade = CascadeType.PERSIST) + @OrderColumn(name="INTEGER_IDX") @JoinTable( name="SECURITY_ROLE_PERMISSION_MAP", joinColumns={ @JoinColumn(name="NAME_OID", referencedColumnName="NAME") }, @@ -56,6 +58,7 @@ public class JpaRole extends AbstractRole implements Serializable { List<JpaPermission> permissions = new ArrayList<JpaPermission>(); @ElementCollection + @OrderColumn(name="INTEGER_IDX") @CollectionTable( name="SECURITY_ROLE_CHILDROLE_MAP", joinColumns = { http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/30c3441c/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaUserAssignment.java ---------------------------------------------------------------------- diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaUserAssignment.java b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaUserAssignment.java index 39e0b2d..65ed8af 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaUserAssignment.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/src/main/java/org/apache/archiva/redback/rbac/jpa/model/JpaUserAssignment.java @@ -21,7 +21,14 @@ package org.apache.archiva.redback.rbac.jpa.model; import org.apache.archiva.redback.rbac.AbstractUserAssignment; -import javax.persistence.*; +import javax.persistence.CollectionTable; +import javax.persistence.Column; +import javax.persistence.ElementCollection; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.OrderColumn; +import javax.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -39,8 +46,9 @@ public class JpaUserAssignment extends AbstractUserAssignment implements Seriali private String principal; @ElementCollection @Column(name="STRING_ELE") + @OrderColumn(name="INTEGER_IDX") @CollectionTable( - name="SECURITY_USERASSIGNMENT_MAP", + name="SECURITY_USERASSIGNMENT_ROLENAMES", joinColumns = { @JoinColumn(name = "PRINCIPAL_OID", referencedColumnName = "PRINCIPAL") }
