You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by an...@apache.org on 2021/04/14 10:11:46 UTC

[sling-org-apache-sling-feature-cpconverter] 01/01: Merge pull request #73 from apache/SLING-10286

This is an automated email from the ASF dual-hosted git repository.

angela pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git

commit 5be6cf3b0ce39372598343f015c9276cdb220909
Merge: bacfbd7 82b2835
Author: anchela <an...@apache.org>
AuthorDate: Wed Apr 14 12:11:35 2021 +0200

    Merge pull request #73 from apache/SLING-10286
    
    SLING-10286 : Converter ignores disabled status of system user

 .../cpconverter/accesscontrol/AbstractUser.java    | 12 +++++++
 .../accesscontrol/DefaultAclManager.java           |  5 +++
 .../cpconverter/accesscontrol/SystemUser.java      | 11 +++++++
 .../feature/cpconverter/accesscontrol/User.java    | 11 +++++++
 .../cpconverter/handlers/AbstractUserParser.java   |  4 +--
 .../cpconverter/handlers/GroupEntryHandler.java    |  3 +-
 .../cpconverter/handlers/UsersEntryHandler.java    | 16 ++++++----
 .../handlers/UsersEntryHandlerTest.java            | 37 ++++++++++++++++++++++
 .../random1 => a/disableduser}/.content.xml        | 10 +++---
 .../users/system/services/random1/.content.xml     |  3 +-
 10 files changed, 97 insertions(+), 15 deletions(-)