This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/optionally-keep-modified-content-packages
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git.
discard 45e3ced SLING-10127 emit all converted packages to the local Maven
repository
add 8ae335d SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (initial draft)
add 2ed5b1c SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (initial draft)
add 65df736 SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (add more TODOs, don't convert ac-lines with action remove
or remove_all)
add bb1a908 SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (always compute relative intermediate path for system users)
add 6288fd7 SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (resolve FIXME related to SLING-10235)
add fdf9bd8 SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (unused imports)
add a701669 SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (missing escaping for disablereason, missing support for
abitrary function with acl-line)
add 518e1b1 SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (resolve TODOs in DefaultAclManager, extend acl-manager to
allow to record additional known system-user-ids)
add 192609e Make it possible to give a seed feature that can be used to
seed service user mappings
add 7d572e4 Merge master
add a1763f1 SLING-10219 : Expand enforcing principal-based authorization
option to repo-init (use Operation.asRepoInitString)
add 30dbeee Merge pull request #67 from apache/SLING-10219
add 1ddfd83 Use feature model 1.2.22
add cf86386 SLING-10268 : Use Operation.asRepoInitString instead of
hardcoding repo-init statements
add 88c4edb Merge pull request #68 from apache/SLING-10268
add 8e2eda7 SLING-10274: use the repoinit parser to normalize line
separators (#69)
add 7775286 fix null annotation to silence Sonar bug report
add 7e8c865 SLING-10279 rename cp2sf to cp2fm (#71)
add 040535b SLING-10278 allow configurations below "install" and bundles
below (#72)
add 798f3ed SLING-10127 emit all converted packages to the local Maven
repository
add 9674b0a add option for full backwards compatibility (i.e. drop fully)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (45e3ced)
\
N -- N -- N
refs/heads/feature/optionally-keep-modified-content-packages (9674b0a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
README.md | 10 +-
pom.xml | 18 +-
src/main/assembly/README.md | 8 +-
.../ContentPackage2FeatureModelConverter.java | 58 ++++-
.../accesscontrol/AccessControlEntry.java | 38 +--
.../cpconverter/accesscontrol/AclManager.java | 5 +-
.../accesscontrol/DefaultAclManager.java | 268 ++++++++++++++-------
.../EnforceInfo.java} | 20 +-
.../cpconverter/artifacts/ArtifactsDeployer.java | 2 +-
... => LocalMavenRepositoryArtifactsDeployer.java} | 34 +--
.../artifacts/SimpleFolderArtifactsDeployer.java | 61 +++++
...ntentPackage2FeatureModelConverterLauncher.java | 58 ++++-
.../features/DefaultFeaturesManager.java | 114 +++++++--
.../cpconverter/features/FeaturesManager.java | 2 +-
.../AbstractConfigurationEntryHandler.java | 61 +----
.../cpconverter/handlers/AbstractPolicyParser.java | 24 +-
.../cpconverter/handlers/BundleEntryHandler.java | 62 ++---
.../handlers/DefaultEntryHandlersManager.java | 6 +-
.../handlers/NodeTypesEntryHandler.java | 27 +--
.../handlers/RepPrincipalPolicyEntryHandler.java | 3 +-
.../cpconverter/repoinit/AccessControlVisitor.java | 148 ++++++++++++
.../cpconverter/repoinit/ConversionMap.java | 82 +++++++
.../cpconverter/repoinit/DefaultVisitor.java | 114 +++++++++
.../feature/cpconverter/repoinit/NoOpVisitor.java | 107 ++++++++
.../cpconverter/repoinit/OperationProcessor.java | 48 ++++
.../cpconverter/repoinit/SystemUserVisitor.java | 48 ++++
.../cpconverter/shared/AbstractJcrNodeParser.java | 1 -
.../ContentPackage2FeatureModelConverterTest.java | 151 +++++++++---
.../org/apache/sling/feature/cpconverter/Util.java | 46 ++++
.../cpconverter/accesscontrol/AclManagerTest.java | 102 +++++---
.../accesscontrol/EnforcePrincipalBasedTest.java | 129 +++++++---
.../artifacts/DefaultBundlesDeployerTest.java | 4 +-
.../handlers/BundleEntryHandlerGAVTest.java | 10 +-
.../handlers/BundleEntryHandlerTest.java | 7 +-
.../handlers/ConfigEntryHandlerTest.java | 7 +
.../handlers/ConfigurationEntryHandlerTest.java | 16 +-
.../JsonConfigurationEntryHandlerTest.java | 1 +
.../handlers/PrivilegesHandlerTest.java | 6 +-
.../handlers/RepPolicyEntryHandlerTest.java | 83 +++----
.../RepPrincipalPolicyEntryHandlerTest.java | 35 +--
.../handlers/RepRepoPolicyEntryHandlerTest.java | 7 +-
.../feature/cpconverter/handlers/RepoInitTest.java | 189 +++++++++++++++
.../handlers/UsersEntryHandlerTest.java | 7 +-
.../handlers/META-INF/vault/privileges.xml | 2 +-
....RepositoryInitializer-conversion-result.config | 62 +++++
...it.RepositoryInitializer-conversion-test.config | 44 ++++
...RepositoryInitializer-no-conv-with-diff.config} | 27 ++-
...positoryInitializer-no-conversion-result.config | 83 +++++++
...RepositoryInitializer-no-conversion-test.config | 83 +++++++
.../{install => config.publish}/test-framework.jar | Bin
...ceusermapping.impl.ServiceUserMapperImpl.config | 0
51 files changed, 2038 insertions(+), 490 deletions(-)
copy
src/main/java/org/apache/sling/feature/cpconverter/{handlers/RepRepoPolicyEntryHandler.java
=> accesscontrol/EnforceInfo.java} (56%)
rename
src/main/java/org/apache/sling/feature/cpconverter/artifacts/{DefaultArtifactsDeployer.java
=> LocalMavenRepositoryArtifactsDeployer.java} (86%)
create mode 100644
src/main/java/org/apache/sling/feature/cpconverter/artifacts/SimpleFolderArtifactsDeployer.java
create mode 100644
src/main/java/org/apache/sling/feature/cpconverter/repoinit/AccessControlVisitor.java
create mode 100644
src/main/java/org/apache/sling/feature/cpconverter/repoinit/ConversionMap.java
create mode 100644
src/main/java/org/apache/sling/feature/cpconverter/repoinit/DefaultVisitor.java
create mode 100644
src/main/java/org/apache/sling/feature/cpconverter/repoinit/NoOpVisitor.java
create mode 100644
src/main/java/org/apache/sling/feature/cpconverter/repoinit/OperationProcessor.java
create mode 100644
src/main/java/org/apache/sling/feature/cpconverter/repoinit/SystemUserVisitor.java
create mode 100644 src/test/java/org/apache/sling/feature/cpconverter/Util.java
create mode 100644
src/test/java/org/apache/sling/feature/cpconverter/handlers/RepoInitTest.java
create mode 100644
src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-conversion-result.config
create mode 100644
src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-conversion-test.config
copy
src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/{config.author/org.apache.sling.jcr.repoinit.RepositoryInitializer-test.config
=>
config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conv-with-diff.config}
(56%)
create mode 100644
src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-result.config
create mode 100644
src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-test.config
copy
src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/{install
=> config.publish}/test-framework.jar (100%)
copy
src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/{config.publish
=>
install.publish}/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.config
(100%)
