Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A8286200BBE for ; Thu, 6 Oct 2016 19:49:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A704D160AFC; Thu, 6 Oct 2016 17:49:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0464F160AF4 for ; Thu, 6 Oct 2016 19:49:20 +0200 (CEST) Received: (qmail 47960 invoked by uid 500); 6 Oct 2016 17:49:19 -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 47096 invoked by uid 99); 6 Oct 2016 17:49:19 -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; Thu, 06 Oct 2016 17:49:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2BB37E08AD; Thu, 6 Oct 2016 17:49:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cpike@apache.org To: commits@directory.apache.org Date: Thu, 06 Oct 2016 17:49:42 -0000 Message-Id: <6cbe8c3a99794aa3ade4cceea3843020@git.apache.org> In-Reply-To: <0f8d33fb296a46aeb8e4ce632af5ed28@git.apache.org> References: <0f8d33fb296a46aeb8e4ce632af5ed28@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/43] directory-fortress-core git commit: updates to support perm attrs archived-at: Thu, 06 Oct 2016 17:49:21 -0000 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 Authored: Fri Feb 5 15:07:00 2016 -0500 Committer: clp207 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",