directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cp...@apache.org
Subject [33/43] directory-fortress-core git commit: have junit tests working again
Date Thu, 06 Oct 2016 17:49:50 GMT
have junit tests working again


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/c70d237c
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/c70d237c
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/c70d237c

Branch: refs/heads/master
Commit: c70d237c52108365823b02b85b19fdebed535695
Parents: c4614be
Author: clp207 <clp207@psu.edu>
Authored: Wed Aug 24 09:10:52 2016 -0400
Committer: clp207 <clp207@psu.edu>
Committed: Wed Aug 24 09:10:52 2016 -0400

----------------------------------------------------------------------
 ldap/schema/fortress.schema                                    | 4 ++--
 .../java/org/apache/directory/fortress/core/impl/PermDAO.java  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c70d237c/ldap/schema/fortress.schema
----------------------------------------------------------------------
diff --git a/ldap/schema/fortress.schema b/ldap/schema/fortress.schema
index a8a492b..c56a6b9 100644
--- a/ldap/schema/fortress.schema
+++ b/ldap/schema/fortress.schema
@@ -473,7 +473,7 @@ objectClass ( ftObId:8
     )
 
 ## OC9: Fortress Permission Attribute Set Structural Object Class
-objectclass    ( ftObId:9
+objectclass ( ftObId:9
     NAME 'ftAttributeSet'
     DESC 'Fortress Attribute Set Structural Object Class'
     SUP organizationalunit
@@ -491,7 +491,7 @@ objectclass    ( ftObId:9
     )
     
 ## OC10: Fortress Permission Attribute Structural Object Class
-objectclass    ( ftObId:10
+objectclass ( ftObId:10
     NAME 'ftAttribute'
     DESC 'Fortress Attribute Structural Object Class'
     SUP organizationalrole

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/c70d237c/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index 838d425..1a2a599 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -1097,7 +1097,7 @@ final class PermDAO extends LdapDataProvider
     		filterbuf.append( GlobalIds.FILTER_PREFIX );
     		filterbuf.append( PERMISSION_ATTRIBUTE_OBJECT_CLASS_NAME );
     		filterbuf.append( ")(" );
-    		filterbuf.append( GlobalIds.FT_PERMISSION_ATTRIBUTE );
+    		filterbuf.append( GlobalIds.FT_PERMISSION_ATTRIBUTE_SET );
     		filterbuf.append( "=" );
     		filterbuf.append( paSetVal );
     		filterbuf.append(  "))" );
@@ -2026,13 +2026,13 @@ final class PermDAO extends LdapDataProvider
 
     private String getDn( PermissionAttributeSet paSet, String contextId )
     {
-        return GlobalIds.PERMISSION_ATTRIBUTE_SET_NAME + "=" + paSet.getName() + "," + getRootDn(
contextId, GlobalIds.SD_ROOT );
+        return SchemaConstants.OU_AT + "=" + paSet.getName() + "," + getRootDn( contextId,
GlobalIds.SD_ROOT );
     }
 
     
     private String getDn( PermissionAttribute pa, String paSetName, String contextId )
     {
-        return GlobalIds.PERMISSION_ATTRIBUTE_SET_NAME + "=" + paSetName + "," + GlobalIds.PERMISSION_ATTRIBUTE_NAME
 + "=" + pa.getAttributeName() + "," + getRootDn( contextId, GlobalIds.SD_ROOT );
+        return GlobalIds.FT_PERMISSION_ATTRIBUTE  + "=" + pa.getAttributeName() + "," + SchemaConstants.OU_AT
+ "=" + paSetName + "," + getRootDn( contextId, GlobalIds.SD_ROOT );
     }
     
 


Mime
View raw message