directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cp...@apache.org
Subject [25/43] directory-fortress-core git commit: updates to support perm attrs
Date Thu, 06 Oct 2016 17:49:42 GMT
updates to support perm attrs


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/0403277b
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/0403277b
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/0403277b

Branch: refs/heads/master
Commit: 0403277bac6287549a060682bd0c34a1ad552285
Parents: e3a74de
Author: clp207 <clp207@psu.edu>
Authored: Fri Feb 5 15:07:00 2016 -0500
Committer: clp207 <clp207@psu.edu>
Committed: Wed Mar 30 15:44:23 2016 -0400

----------------------------------------------------------------------
 src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java | 2 +-
 .../apache/directory/fortress/core/model/PermissionAttribute.java  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0403277b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index b1a0c9e..50aaec2 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -2575,7 +2575,7 @@ final class UserDAO extends ApacheDsDataProvider
             for ( String raw : roles )
             {
             	//get role name
-            	String roleName = raw.substring(0, raw.indexOf( GlobalIds.DELIMITER ));
+            	String roleName = raw.substring(0, raw.indexOf( GlobalIds.DELIMITER )).toUpperCase();
             	
             	//if already found, add to user role
             	if(uRoles.containsKey(roleName)){

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0403277b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
index c374df0..d585efd 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/PermissionAttribute.java
@@ -18,8 +18,6 @@ import org.apache.commons.lang.StringUtils;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "permission", propOrder =
     {
-        "opName",
-        "objName",
         "required",
         "operator",
         "dataType",


Mime
View raw message