git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
align package names.
[utils]
/
security
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
security
/
authorization
/
UrlAuthorizationRule.java
diff --git
a/security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
b/security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
index 17bdc348ae8263b97c7ca000d6da2b0414ebe476..8e9d1353be37aeffee066ddd55cf1a189f3e3b35 100644
(file)
--- a/
security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
+++ b/
security/impl/src/main/java/org/wamblee/security/authorization/UrlAuthorizationRule.java
@@
-26,10
+26,11
@@
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
import javax.persistence.Transient;
import org.apache.log4j.Logger;
import javax.persistence.Transient;
import org.apache.log4j.Logger;
-import org.wamblee.
usermgt
.User;
+import org.wamblee.
security.authentication
.User;
/**
* Utility base class for implementation of authentication rules based on the
/**
* Utility base class for implementation of authentication rules based on the
@@
-264,7
+265,7
@@
public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule {
*
* @return Returns the operationCondition.
*/
*
* @return Returns the operationCondition.
*/
- @
ManyToOne(cascade = CascadeType.ALL, targetEntity = AbstractOperationCondition.class
)
+ @
OneToOne(cascade = CascadeType.ALL, targetEntity = AbstractOperationCondition.class, orphanRemoval = true
)
@JoinColumn(name = "OPER_COND_PK")
public OperationCondition getOperationCondition() {
return operationCondition;
@JoinColumn(name = "OPER_COND_PK")
public OperationCondition getOperationCondition() {
return operationCondition;
@@
-283,7
+284,7
@@
public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule {
*
* @return Returns the pathCondition.
*/
*
* @return Returns the pathCondition.
*/
- @
ManyToOne(cascade = CascadeType.ALL, targetEntity = AbstractPathCondition.class
)
+ @
OneToOne(cascade = CascadeType.ALL, targetEntity = AbstractPathCondition.class, orphanRemoval = true
)
@JoinColumn(name = "PATH_COND_PK")
public PathCondition getPathCondition() {
return pathCondition;
@JoinColumn(name = "PATH_COND_PK")
public PathCondition getPathCondition() {
return pathCondition;
@@
-302,7
+303,7
@@
public abstract class UrlAuthorizationRule extends AbstractAuthorizationRule {
*
* @return Returns the userCondition.
*/
*
* @return Returns the userCondition.
*/
- @
ManyToOne(cascade = CascadeType.ALL, targetEntity = AbstractUserCondition.class
)
+ @
OneToOne(cascade = CascadeType.ALL, targetEntity = AbstractUserCondition.class, orphanRemoval = true
)
@JoinColumn(name = "USER_COND_PK")
public UserCondition getUserCondition() {
return userCondition;
@JoinColumn(name = "USER_COND_PK")
public UserCondition getUserCondition() {
return userCondition;