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 2015/05/30 15:04:17 UTC
directory-fortress-commander git commit: FC-105 - cleanup - use
global ids
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master 440a16fd5 -> c39912313
FC-105 - cleanup - use global ids
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/c3991231
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/c3991231
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/c3991231
Branch: refs/heads/master
Commit: c39912313358cc2797b34e5d9079cdbdd3d4d817
Parents: 440a16f
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat May 30 08:04:18 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat May 30 08:04:18 2015 -0500
----------------------------------------------------------------------
.../directory/fortress/web/panel/AuditUtils.java | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/c3991231/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
index ce2b11f..caca0ed 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
@@ -96,44 +96,39 @@ final class AuditUtils
// ftObjId=006+ftOpNm=TOP1_6,ftObjNm=TOB1_4,ou=Permissions,ou=RBAC,dc=jts,dc=us
String raw = authZ.getReqDN();
- // TODO: use fortress GlobalIds instead:
- final String OBJ_ID = "ftObjId";
- final String OBJ_NM = "ftObjNm";
- final String OP_NM = "ftOpNm";
-
// TODO: fix this mapping:
//reqDerefAliases
//reqAttr
//reqAttrsOnly
//Permission perm = new Permission();
- int bindx = raw.indexOf( OBJ_ID );
+ int bindx = raw.indexOf( GlobalIds.POBJ_ID );
if ( bindx != -1 )
{
int eindx = raw.indexOf( '+' );
if ( eindx != -1 )
{
- authZ.setReqDerefAliases( raw.substring( bindx + OBJ_ID.length() + 1, eindx ) );
+ authZ.setReqDerefAliases( raw.substring( bindx + GlobalIds.POBJ_ID.length() + 1, eindx ) );
}
}
- bindx = raw.indexOf( OBJ_NM );
+ bindx = raw.indexOf( GlobalIds.POBJ_NAME );
if ( bindx != -1 )
{
int eindx = raw.substring( bindx ).indexOf( ',' );
if ( eindx != -1 )
{
eindx += bindx;
- authZ.setReqAttr( raw.substring( bindx + OBJ_NM.length() + 1, eindx ) );
+ authZ.setReqAttr( raw.substring( bindx + GlobalIds.POBJ_NAME.length() + 1, eindx ) );
}
}
- bindx = raw.indexOf( OP_NM );
+ bindx = raw.indexOf( GlobalIds.POP_NAME );
if ( bindx != -1 )
{
int eindx = raw.substring( bindx ).indexOf( ',' );
if ( eindx != -1 )
{
eindx += bindx;
- authZ.setReqAttrsOnly( raw.substring( bindx + OP_NM.length() + 1, eindx ) );
+ authZ.setReqAttrsOnly( raw.substring( bindx + GlobalIds.POP_NAME.length() + 1, eindx ) );
}
}
}