JPA mapping updates

[utils] / security / impl / src / main / java / org / wamblee / security / authorization / DefaultAuthorizationService.java

diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java b/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java
index 8e449b9e9e4ce1a46e4943b9845cbfc77b1c5345..a142712e395b999198fcd89d08ec065b2c64c221 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java
+++ b/security/impl/src/main/java/org/wamblee/security/authorization/DefaultAuthorizationService.java
@@ -21,12 +21,12 @@ import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
-import javax.persistence.ManyToMany;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderColumn;
 import javax.persistence.Transient;
 
-import org.wamblee.security.authentication.User;
 import org.wamblee.security.authentication.UserAccessor;
 import org.wamblee.security.authentication.UserAdministration;
 
@@ -48,6 +48,7 @@ public class DefaultAuthorizationService extends AbstractAuthorizationService {
      * List of ordered authorization rules.
      */
     @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, targetEntity = AbstractAuthorizationRule.class)
+    @JoinTable(name = "SEC_AUTH_SVC_RULE", joinColumns = { @JoinColumn(name = "SVC_ID") }, inverseJoinColumns = { @JoinColumn(name = "RULE_ID") })
     @OrderColumn(name = "RULE_INDEX")
     private List<AuthorizationRule> rules;
 
@@ -75,7 +76,7 @@ public class DefaultAuthorizationService extends AbstractAuthorizationService {
         super(aName);
         rules = new ArrayList<AuthorizationRule>();
         userAccessor = aAccessor;
-        userAdmin = aUserAdmin; 
+        userAdmin = aUserAdmin;
     }
 
     /**
@@ -84,19 +85,18 @@ public class DefaultAuthorizationService extends AbstractAuthorizationService {
     public DefaultAuthorizationService() {
         rules = new ArrayList<AuthorizationRule>();
         userAccessor = null;
-        userAdmin = null; 
+        userAdmin = null;
     }
 
-   
     @Override
     public void setUserAccessor(UserAccessor aUserAccessor) {
         userAccessor = aUserAccessor;
     }
-    
+
     @Override
     public void setUserAdministration(UserAdministration aUserAdmin) {
         userAdmin = aUserAdmin;
-        for (AuthorizationRule rule: rules) { 
+        for (AuthorizationRule rule : rules) {
             rule.setUserAdministration(userAdmin);
         }
     }
@@ -198,7 +198,7 @@ public class DefaultAuthorizationService extends AbstractAuthorizationService {
      */
     protected void setMappedRules(List<AuthorizationRule> aRules) {
         rules = aRules;
-        for (AuthorizationRule rule: rules) { 
+        for (AuthorizationRule rule : rules) {
             rule.setUserAdministration(userAdmin);
         }
     }