Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 AEA2394DC for ; Fri, 21 Oct 2011 10:24:25 +0000 (UTC) Received: (qmail 6964 invoked by uid 500); 21 Oct 2011 10:24:25 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 6925 invoked by uid 500); 21 Oct 2011 10:24:25 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 6916 invoked by uid 99); 21 Oct 2011 10:24:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Oct 2011 10:24:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Oct 2011 10:24:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4CE6F238890A; Fri, 21 Oct 2011 10:24:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1187285 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user: UserImporter.java UserManagerImpl.java Date: Fri, 21 Oct 2011 10:24:01 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111021102401.4CE6F238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Fri Oct 21 10:24:00 2011 New Revision: 1187285 URL: http://svn.apache.org/viewvc?rev=1187285&view=rev Log: JCR-3120 : Change log level in UserManagerImpl#getAuthorizable(NodeImpl) and UserImporter#handlePropInfo Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java?rev=1187285&r1=1187284&r2=1187285&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java Fri Oct 21 10:24:00 2011 @@ -198,7 +198,7 @@ public class UserImporter implements Pro {@link UserManager#createGroup} respectively. */ Authorizable a = userManager.getAuthorizable(parent); if (a == null) { - log.debug("Cannot handle protected PropInfo " + protectedPropInfo + ". Node " + parent + " doesn't represent a valid Authorizable."); + log.warn("Cannot handle protected PropInfo " + protectedPropInfo + ". Node " + parent + " doesn't represent a valid Authorizable."); return false; } Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java?rev=1187285&r1=1187284&r2=1187285&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java Fri Oct 21 10:24:00 2011 @@ -762,14 +762,23 @@ public class UserManagerImpl extends Pro Authorizable authorz = null; if (n != null) { String path = n.getPath(); - if (n.isNodeType(NT_REP_USER) && Text.isDescendant(usersPath, path)) { - authorz = createUser(n); - } else if (n.isNodeType(NT_REP_GROUP) && Text.isDescendant(groupsPath, path)) { - authorz = createGroup(n); + if (n.isNodeType(NT_REP_USER)) { + if (Text.isDescendant(usersPath, path)) { + authorz = createUser(n); + } else { + /* user node outside of configured tree -> return null */ + log.error("User node outside of configured user tree ('" + usersPath + "') -> Not a valid user."); + } + } else if (n.isNodeType(NT_REP_GROUP)) { + if (Text.isDescendant(groupsPath, path)) { + authorz = createGroup(n); + } else { + /* group node outside of configured tree -> return null */ + log.error("Group node outside of configured group tree ('" + groupsPath + "') -> Not a valid group."); + } } else { - /* else some other node type or outside of the valid user/group - hierarchy -> return null. */ - log.debug("Unexpected user nodetype " + n.getPrimaryNodeType().getName()); + /* else some other node type -> return null. */ + log.warn("Unexpected user/group nodetype " + n.getPrimaryNodeType().getName()); } } /* else no matching node -> return null */ return authorz;