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 1890C11BAC for ; Wed, 14 May 2014 20:52:30 +0000 (UTC) Received: (qmail 65133 invoked by uid 500); 10 May 2014 22:54:09 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 50167 invoked by uid 500); 10 May 2014 22:53:05 -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-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 38482 invoked by uid 99); 10 May 2014 22:52:14 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 22:52: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; Wed, 07 May 2014 16:29:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4A459238896F; Wed, 7 May 2014 16:29:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1593059 - in /jackrabbit/oak/branches/1.0: ./ oak-doc/ oak-doc/src/site/markdown/ oak-doc/src/site/markdown/security/ oak-doc/src/site/markdown/security/accesscontrol/ oak-doc/src/site/markdown/security/permission/ oak-doc/src/site/markdow... Date: Wed, 07 May 2014 16:29:12 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140507162913.4A459238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Wed May 7 16:29:12 2014 New Revision: 1593059 URL: http://svn.apache.org/r1593059 Log: OAK-301: Document Oak Merged r1592744 Added: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/accesscontrol/ - copied from r1592744, jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/accesscontrol/ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission/ - copied from r1592744, jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/permission/ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/principal/ - copied from r1592744, jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/principal/ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/privilege/ - copied from r1592744, jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/privilege/ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user/ - copied from r1592744, jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/user/ Removed: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences_accesscontrol.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences_permission.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences_principal.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences_privileges.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences_user.md Modified: jackrabbit/oak/branches/1.0/ (props changed) jackrabbit/oak/branches/1.0/oak-doc/ (props changed) jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/principal.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/privilege.md jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user.md Propchange: jackrabbit/oak/branches/1.0/ ------------------------------------------------------------------------------ Merged /jackrabbit/oak/trunk:r1592744 Propchange: jackrabbit/oak/branches/1.0/oak-doc/ ------------------------------------------------------------------------------ Merged /jackrabbit/oak/trunk/oak-doc:r1592744 Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md?rev=1593059&r1=1593058&r2=1593059&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md (original) +++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md Wed May 7 16:29:12 2014 @@ -280,8 +280,8 @@ Security -------- * [Authentication](security/authentication/differences.html) -* [AccessControl Management](differences_accesscontrol.html) -* [Permission Evaluation](differences_permission.html) -* [Privilege Management](differences_privileges.html) -* [Principal Management](differences_principal.html) -* [User Management](differences_user.html) +* [AccessControl Management](security/accesscontrol/differences.html) +* [Permission Evaluation](security/permission/differences.html) +* [Privilege Management](security/privilege/differences.html) +* [Principal Management](security/principal/differences.html) +* [User Management](security/user/differences.html) Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md?rev=1593059&r1=1593058&r2=1593059&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md (original) +++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/overview.md Wed May 7 16:29:12 2014 @@ -26,7 +26,12 @@ The Oak Security Layer * [Pre-Authentication](authentication/preauthentication.html) * [Token Management](authentication/tokenmanagement.html) * [Access Control](accesscontrol.html) + * [Differences wrt Jackrabbit 2.x](accesscontrol/differences.html) * [Permission Evaluation](permission.html) + * [Differences wrt Jackrabbit 2.x](permission/differences.html) * [Privilege Management](privilege.html) + * [Differences wrt Jackrabbit 2.x](privilege/differences.html) * [Principal Management](principal.html) + * [Differences wrt Jackrabbit 2.x](principal/differences.html) * [User Management](user.html) + * [Differences wrt Jackrabbit 2.x](user/differences.html) Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission.md URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission.md?rev=1593059&r1=1593058&r2=1593059&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission.md (original) +++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/permission.md Wed May 7 16:29:12 2014 @@ -22,4 +22,4 @@ _TODO_ ### Differences wrt Jackrabbit 2.x -see the corresponding [documentation](../differences_permission.html). \ No newline at end of file +see the corresponding [documentation](permission/differences.html). \ No newline at end of file Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/principal.md URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/principal.md?rev=1593059&r1=1593058&r2=1593059&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/principal.md (original) +++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/principal.md Wed May 7 16:29:12 2014 @@ -22,4 +22,4 @@ _TODO_ ### Differences wrt Jackrabbit 2.x -see the corresponding [documentation](../differences_principal.html). \ No newline at end of file +see the corresponding [documentation](principal/differences.html). \ No newline at end of file Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/privilege.md URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/privilege.md?rev=1593059&r1=1593058&r2=1593059&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/privilege.md (original) +++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/privilege.md Wed May 7 16:29:12 2014 @@ -22,4 +22,4 @@ _TODO_ ### Differences wrt Jackrabbit 2.x -see the corresponding [documentation](../differences_privileges.html). \ No newline at end of file +see the corresponding [documentation](privilege/differences.html). \ No newline at end of file Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user.md URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user.md?rev=1593059&r1=1593058&r2=1593059&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user.md (original) +++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/security/user.md Wed May 7 16:29:12 2014 @@ -22,5 +22,5 @@ _TODO_ ### Differences wrt Jackrabbit 2.x -see the corresponding [documentation](../differences_user.html). +see the corresponding [documentation](user/differences.html).