You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/07/03 11:46:05 UTC

[sling-org-apache-sling-feature-cpconverter] 01/01: Merge pull request #8 from apache/avoid_subpackages_flattering

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

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

commit 51b6fbdc5886d658591fcf6c29341eeef05e6751
Merge: de4d29a aebdce7
Author: Simone Tripodi <st...@adobe.com>
AuthorDate: Wed Jul 3 13:45:59 2019 +0200

    Merge pull request #8 from apache/avoid_subpackages_flattering
    
    SLING-8529 - Avoid flattening of subpackages during convertion in featuremodel

 .../ContentPackage2FeatureModelConverter.java      | 91 +++++++++++++---------
 .../sling/feature/cpconverter/acl/AclManager.java  |  4 +-
 .../feature/cpconverter/acl/DefaultAclManager.java | 47 ++++++-----
 .../cpconverter/artifacts/ArtifactsDeployer.java   |  9 +--
 .../artifacts/DefaultArtifactsDeployer.java        | 33 ++++----
 .../artifacts/MavenPomSupplierWriter.java          | 24 ++----
 .../features/DefaultFeaturesManager.java           | 18 ++---
 .../cpconverter/features/FeaturesManager.java      |  8 +-
 .../cpconverter/handlers/BundleEntryHandler.java   | 19 ++---
 .../feature/cpconverter/acl/AclManagerTest.java    |  5 +-
 .../artifacts/DefaultBundlesDeployerTest.java      | 19 +----
 .../cpconverter/features/FeaturesManagerTest.java  | 24 +-----
 .../handlers/BundleEntryHandlerTest.java           |  3 +-
 .../handlers/PrivilegesHandlerTest.java            |  4 +-
 .../handlers/RepPolicyEntryHandlerTest.java        |  3 +-
 .../handlers/SystemUsersEntryHandlerTest.java      |  3 +-
 16 files changed, 136 insertions(+), 178 deletions(-)