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/06/09 14:10:47 UTC

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

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 bf5cce12c7d35b0956aee8167358f716b1b9717e
Merge: 1f0740a 407b305
Author: anchela <an...@adobe.com>
AuthorDate: Wed Jun 9 16:10:24 2021 +0200

    Merge pull request #90 from apache/SLING-10468
    
    SLING-10468 : Converted content package is missing some .content.xml

 .../accesscontrol/DefaultAclManager.java           |   3 +-
 ...ntentPackage2FeatureModelConverterLauncher.java |   5 +-
 .../handlers/AbstractUserEntryHandler.java         |  34 +++++-
 .../cpconverter/handlers/AbstractUserParser.java   |   7 +-
 .../handlers/DefaultEntryHandlersManager.java      |   8 +-
 .../cpconverter/handlers/UsersEntryHandler.java    |  10 +-
 .../cpconverter/shared/ConverterConstants.java     |  25 ++++
 .../ContentPackage2FeatureModelConverterTest.java  | 128 ++++++++++++++++-----
 .../feature/cpconverter/handlers/TestUtils.java    |  13 +--
 .../apache/sling/feature/cpconverter/demo-cp.zip   | Bin 0 -> 16491 bytes
 10 files changed, 180 insertions(+), 53 deletions(-)