git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now working with both hibernate and eclipselink
[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 a086ab477844e3b0cec84900a4138b9446d9f4bf..1e5abb99c0e28cf9cc95b67e7187f0215c98efd6 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
@@
-18,8
+18,13
@@
package org.wamblee.security.authorization;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
+import javax.persistence.CascadeType;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import javax.persistence.Transient;
import org.wamblee.usermgt.User;
import org.wamblee.usermgt.UserAccessor;
import org.wamblee.usermgt.User;
import org.wamblee.usermgt.UserAccessor;
@@
-36,24
+41,22
@@
import org.wamblee.usermgt.UserAccessor;
*/
@Entity
@DiscriminatorValue("DEFAULT")
*/
@Entity
@DiscriminatorValue("DEFAULT")
-public class DefaultAuthorizationService extends AuthorizationService {
+public class DefaultAuthorizationService extends A
bstractA
uthorizationService {
/**
* List of ordered authorization rules.
*/
/**
* List of ordered authorization rules.
*/
+ @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, targetEntity = AbstractAuthorizationRule.class)
+ @OrderColumn(name = "RULE_INDEX")
private List<AuthorizationRule> rules;
/**
* User accessor used to obtain the current user.
*/
private List<AuthorizationRule> rules;
/**
* User accessor used to obtain the current user.
*/
+ @Transient
private UserAccessor userAccessor;
private UserAccessor userAccessor;
- /**
- * Name for this instance of the authorization service.
- */
- private String name;
-
/**
* Constructs the service.
*
/**
* Constructs the service.
*
@@
-63,9
+66,9
@@
public class DefaultAuthorizationService extends AuthorizationService {
* Name of this instance of the service.
*/
public DefaultAuthorizationService(UserAccessor aAccessor, String aName) {
* Name of this instance of the service.
*/
public DefaultAuthorizationService(UserAccessor aAccessor, String aName) {
+ super(aName);
rules = new ArrayList<AuthorizationRule>();
userAccessor = aAccessor;
rules = new ArrayList<AuthorizationRule>();
userAccessor = aAccessor;
- name = aName;
}
/**
}
/**
@@
-74,7
+77,6
@@
public class DefaultAuthorizationService extends AuthorizationService {
public DefaultAuthorizationService() {
rules = new ArrayList<AuthorizationRule>();
userAccessor = null;
public DefaultAuthorizationService() {
rules = new ArrayList<AuthorizationRule>();
userAccessor = null;
- name = null;
}
/**
}
/**
@@
-125,21
+127,13
@@
public class DefaultAuthorizationService extends AuthorizationService {
return aResource;
}
return aResource;
}
- protected String getName() {
- return name;
- }
-
- public void setName(String aName) {
- name = aName;
- }
-
/*
* (non-Javadoc)
*
* @see org.wamblee.security.authorization.AuthorizationService#getRules()
*/
public AuthorizationRule[] getRules() {
/*
* (non-Javadoc)
*
* @see org.wamblee.security.authorization.AuthorizationService#getRules()
*/
public AuthorizationRule[] getRules() {
- return rules.toArray(new AuthorizationRule[0]);
+ return rules.toArray(new A
bstractA
uthorizationRule[0]);
}
/*
}
/*