From oak-commits-return-628-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Thu May 3 21:57:14 2012 Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DAA7C99BE for ; Thu, 3 May 2012 21:57:14 +0000 (UTC) Received: (qmail 68774 invoked by uid 500); 3 May 2012 21:57:14 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 68747 invoked by uid 500); 3 May 2012 21:57:14 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 68739 invoked by uid 99); 3 May 2012 21:57:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 21:57:14 +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; Thu, 03 May 2012 21:57:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 93F4B23889E1; Thu, 3 May 2012 21:56:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333647 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security: privileges/PrivilegeManagerImpl.java user/AuthorizableImpl.java user/UserManagerImpl.java Date: Thu, 03 May 2012 21:56:50 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120503215650.93F4B23889E1@eris.apache.org> Author: mduerig Date: Thu May 3 21:56:50 2012 New Revision: 1333647 URL: http://svn.apache.org/viewvc?rev=1333647&view=rev Log: OAK-84: Delegates for Session, Node, Property and Item - added FIXME where casts to NodeImpl should be replaced with usages of NodeDelegate Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java?rev=1333647&r1=1333646&r2=1333647&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/privileges/PrivilegeManagerImpl.java Thu May 3 21:56:50 2012 @@ -96,6 +96,7 @@ public class PrivilegeManagerImpl implem //-------------------------------------------------------------------------- private NodeImpl getPrivilegeRoot() throws RepositoryException { + // FIXME use NodeDelegate instead of NodeImpl return (NodeImpl) sessionDelegate.getSession().getNode(PRIVILEGE_ROOT); } Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java?rev=1333647&r1=1333646&r2=1333647&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/AuthorizableImpl.java Thu May 3 21:56:50 2012 @@ -55,7 +55,7 @@ abstract class AuthorizableImpl implemen static final String REP_MEMBERS = "rep:members"; static final String REP_IMPERSONATORS = "rep:impersonators"; - private final NodeImpl node; + private final NodeImpl node; // FIXME use NodeDelegate instead of NodeImpl private final UserManagerImpl userManager; private int hashCode; @@ -265,7 +265,7 @@ abstract class AuthorizableImpl implemen public String toString() { try { String typeStr = (isGroup()) ? "Group '" : "User '"; - return new StringBuilder().append(typeStr).append(getID()).append('\'').toString(); + return typeStr + getID() + '\''; } catch (RepositoryException e) { return super.toString(); } Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java?rev=1333647&r1=1333646&r2=1333647&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/security/user/UserManagerImpl.java Thu May 3 21:56:50 2012 @@ -69,6 +69,7 @@ public class UserManagerImpl implements public Authorizable getAuthorizable(String id) throws RepositoryException { Authorizable authorizable = null; try { + // FIXME use NodeDelegate instead od NodeImpl NodeImpl node = (NodeImpl) sessionDelegate.getSession().getNodeByIdentifier(buildIdentifier(id)); authorizable = getAuthorizable(node); } catch (ItemNotFoundException e) {