You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/05/06 03:19:58 UTC
directory-fortress-realm git commit: FC-170 - update to use
non-static config
Repository: directory-fortress-realm
Updated Branches:
refs/heads/master 3c1242297 -> 048e7cd36
FC-170 - update to use non-static config
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/048e7cd3
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/048e7cd3
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/048e7cd3
Branch: refs/heads/master
Commit: 048e7cd3669117885fda91cbd1d07557e0343415
Parents: 3c12422
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed May 4 01:49:06 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed May 4 01:49:06 2016 -0500
----------------------------------------------------------------------
.../fortress/realm/J2eePolicyMgrFactory.java | 2 +-
.../fortress/realm/J2eePolicyMgrImpl.java | 21 +++++++++-----------
pom.xml | 2 +-
3 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/048e7cd3/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java
----------------------------------------------------------------------
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java
index 447892d..d75ae10 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrFactory.java
@@ -48,7 +48,7 @@ public final class J2eePolicyMgrFactory
private static final String J2EE_POLICYMGR_DEFAULT_CLASS = J2eePolicyMgrImpl.class.getName();
private static final String CLS_NM = J2eePolicyMgrFactory.class.getName();
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
- private static String j2eeClassName = Config.getProperty( J2EE_POLICYMGR_IMPLEMENTATION );
+ private static String j2eeClassName = Config.getInstance().getProperty( J2EE_POLICYMGR_IMPLEMENTATION );
/**
* Create and return a reference to {@link J2eePolicyMgr} object.
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/048e7cd3/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
----------------------------------------------------------------------
diff --git a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
index cec315d..b5ae44a 100644
--- a/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
+++ b/impl/src/main/java/org/apache/directory/fortress/realm/J2eePolicyMgrImpl.java
@@ -119,12 +119,10 @@ public class J2eePolicyMgrImpl implements J2eePolicyMgr
* .org/html/draft-behera-ldap-password-policy-10/">password policy evaluation</a>.
* <li> fail for any user who is locked by OpenLDAP's policies {@link org.apache.directory.fortress.core.model.User#isLocked()},
* regardless of trusted flag being set as parm on API.
- * <li> evaluate temporal {@link org.apache.directory.fortress.core.util.time.Constraint}(s) on {@link org.apache.directory.fortress.core.model.User},
+ * <li> evaluate temporal {@link org.apache.directory.fortress.core.model.Constraint}(s) on {@link org.apache.directory.fortress.core.model.User},
* {@link org.apache.directory.fortress.core.model.UserRole} and {@link org.apache.directory.fortress.core.model.UserAdminRole} entities.
* <li> process selective role activations into User RBAC Session {@link User#roles}.
- * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.impl.DSDChecker#validate(org.apache.directory.fortress.core.model.Session,
- * org.apache.directory.fortress.core.util.time.Constraint, org.apache.directory.fortress.core.util.time.Time)} on {@link org.apache.directory.fortress.core
- * .rbac.User#roles}.
+ * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.impl.DSDChecker)} on {@link org.apache.directory.fortress.core.model.User#roles}.
* <li> process selective administrative role activations {@link User#adminRoles}.
* <li> return a {@link org.apache.directory.fortress.core.model.Session} containing {@link org.apache.directory.fortress.core.model.Session#getUser()},
* {@link org.apache.directory.fortress.core.model.Session#getRoles()} and {@link org.apache.directory.fortress.core.model.Session#getAdminRoles()} if
@@ -163,7 +161,7 @@ public class J2eePolicyMgrImpl implements J2eePolicyMgr
* <ul>
* <li> roles that violate Dynamic Separation of Duty Relationships will not be activated into session.
* <li> role activations will proceed in same order as supplied to User entity setter,
- * see {@link org.apache.directory.fortress.core.model.User#setRole(String)}.
+ * see {@link org.apache.directory.fortress.core.model.User#setRole}.
* </ul>
* </p>
*
@@ -194,9 +192,9 @@ public class J2eePolicyMgrImpl implements J2eePolicyMgr
* <li> authenticate user password if trusted == false.
* <li> perform <a href="http://www.openldap.org/">OpenLDAP</a> <a href="http://tools.ietf.org/html/draft-behera-ldap-password-policy-10/">password policy evaluation</a>.
* <li> fail for any user who is locked by OpenLDAP's policies {@link org.apache.directory.fortress.core.model.User#isLocked()}, regardless of trusted flag being set as parm on API.
- * <li> evaluate temporal {@link org.apache.directory.fortress.core.util.time.Constraint}(s) on {@link User}, {@link org.apache.directory.fortress.core.model.UserRole} and {@link org.apache.directory.fortress.core.model.UserAdminRole} entities.
+ * <li> evaluate temporal {@link org.apache.directory.fortress.core.model.Constraint}(s) on {@link User}, {@link org.apache.directory.fortress.core.model.UserRole} and {@link org.apache.directory.fortress.core.model.UserAdminRole} entities.
* <li> process selective role activations into User RBAC Session {@link User#roles}.
- * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.impl.DSDChecker#validate(org.apache.directory.fortress.core.model.Session, org.apache.directory.fortress.core.util.time.Constraint, org.apache.directory.fortress.core.util.time.Time)} on {@link org.apache.directory.fortress.core.model.User#roles}.
+ * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.impl.DSDChecker} on {@link org.apache.directory.fortress.core.model.User#roles}.
* <li> process selective administrative role activations {@link User#adminRoles}.
* <li> return a {@link org.apache.directory.fortress.core.model.Session} containing {@link org.apache.directory.fortress.core.model.Session#getUser()}, {@link org.apache.directory.fortress.core.model.Session#getRoles()} and {@link org.apache.directory.fortress.core.model.Session#getAdminRoles()} if everything checks out good.
* <li> throw a checked exception that will be {@link org.apache.directory.fortress.core.SecurityException} or its derivation.
@@ -228,7 +226,7 @@ public class J2eePolicyMgrImpl implements J2eePolicyMgr
* </h4>
* <ul>
* <li> roles that violate Dynamic Separation of Duty Relationships will not be activated into session.
- * <li> role activations will proceed in same order as supplied to User entity setter, see {@link User#setRole(String)}.
+ * <li> role activations will proceed in same order as supplied to User entity setter, see {@link org.apache.directory.fortress.core.model.User#setRole}.
* </ul>
* </p>
*
@@ -296,11 +294,10 @@ public class J2eePolicyMgrImpl implements J2eePolicyMgr
* .org/html/draft-behera-ldap-password-policy-10/">password policy evaluation</a>.
* <li> fail for any user who is locked by OpenLDAP's policies {@link org.apache.directory.fortress.core.model.User#isLocked()},
* regardless of trusted flag being set as parm on API.
- * <li> evaluate temporal {@link org.apache.directory.fortress.core.util.time.Constraint}(s) on {@link org.apache.directory.fortress.core.model.User},
+ * <li> evaluate temporal {@link org.apache.directory.fortress.core.model.Constraint}(s) on {@link org.apache.directory.fortress.core.model.User},
* {@link org.apache.directory.fortress.core.model.UserRole} and {@link org.apache.directory.fortress.core.model.UserAdminRole} entities.
* <li> process selective role activations into User RBAC Session {@link User#roles}.
- * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.impl.DSDChecker#validate(org.apache.directory.fortress.core.model.Session,
- * org.apache.directory.fortress.core.util.time.Constraint, org.apache.directory.fortress.core.util.time.Time)} on {@link org.apache.directory.fortress.core
+ * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.impl.DSDChecker} on {@link org.apache.directory.fortress.core
* .rbac.User#roles}.
* <li> process selective administrative role activations {@link User#adminRoles}.
* <li> return a {@link org.apache.directory.fortress.core.model.Session} containing {@link org.apache.directory.fortress.core.model.Session#getUser()},
@@ -340,7 +337,7 @@ public class J2eePolicyMgrImpl implements J2eePolicyMgr
* <ul>
* <li> roles that violate Dynamic Separation of Duty Relationships will not be activated into session.
* <li> role activations will proceed in same order as supplied to User entity setter,
- * see {@link org.apache.directory.fortress.core.model.User#setRole(String)}.
+ * see {@link org.apache.directory.fortress.core.model.User#setRole}.
* </ul>
* </p>
*
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/048e7cd3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b0e41f8..41fbac7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<tomcat.catalina.version>7.0.22</tomcat.catalina.version>
<!-- Set versions for depending jars -->
- <fortress-core.version>1.0.0</fortress-core.version>
+ <fortress-core.version>1.0.1-SNAPSHOT</fortress-core.version>
<!-- Set versions for depending jars -->
<findbugs.annotations.version>1.0.0</findbugs.annotations.version>