Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7850217C19 for ; Sat, 30 May 2015 13:04:17 +0000 (UTC) Received: (qmail 58599 invoked by uid 500); 30 May 2015 13:04:17 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 58540 invoked by uid 500); 30 May 2015 13:04:17 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 58530 invoked by uid 99); 30 May 2015 13:04:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 May 2015 13:04:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1AFCBE03EC; Sat, 30 May 2015 13:04:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smckinney@apache.org To: commits@directory.apache.org Message-Id: <13ce552661bb4f0494eabb3561fd7cf6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: directory-fortress-commander git commit: FC-105 - cleanup - use global ids Date: Sat, 30 May 2015 13:04:17 +0000 (UTC) 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 Authored: Sat May 30 08:04:18 2015 -0500 Committer: Shawn McKinney 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 ) ); } } }