You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/04/10 13:40:31 UTC
[sling-org-apache-sling-karaf-features] 02/05: SLING-9356 Add
prefix sling to service user mapper configurations
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git
commit 741ec9ed49df1fea0f7b482922973d76b0fac066
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 10 15:10:24 2020 +0200
SLING-9356 Add prefix sling to service user mapper configurations
---
src/main/feature/feature.xml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index a406b41..13166a4 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -20,7 +20,7 @@
<features name="sling-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.5.0">
<!-- Apache Sling -->
<feature name="sling" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver</config>
<bundle>mvn:org.apache.sling/org.apache.sling.api/2.22.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.4.4</bundle>
<!-- next engine 2.6.22 has new requirements, FIX PAXWEB-1251 -->
@@ -151,7 +151,7 @@
</feature>
<feature name="sling-caconfig" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_caconfig</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-caconfig</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig</config>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.api/1.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.impl/1.5.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.caconfig.spi/1.3.4</bundle>
@@ -163,7 +163,7 @@
</feature>
<feature name="sling-clam" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_clam</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-clam</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam</config>
<bundle>mvn:org.apache.sling/org.apache.sling.clam/1.1.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -180,7 +180,7 @@
<feature name="sling-discovery-oak" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery</config>
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery</config>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.8</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.20</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.28</bundle>
@@ -209,7 +209,7 @@
</feature>
<feature name="sling-event" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event</config>
<bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.12</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.event.dea/1.1.4</bundle>
<!-- dependencies -->
@@ -243,7 +243,7 @@
</feature>
<feature name="sling-i18n" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n</config>
<bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.5.14</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -293,7 +293,7 @@
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.6</bundle>
</feature>
<feature name="sling-resource-presence" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence</config>
<bundle>mvn:org.apache.sling/org.apache.sling.resource.presence/0.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -304,7 +304,7 @@
<feature version="${project.version}">sling</feature>
</feature>
<feature name="sling-rewriter" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-rewriter">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-rewriter</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter</config>
<bundle>mvn:org.apache.sling/org.apache.sling.rewriter/1.2.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -323,7 +323,7 @@
</feature>
<feature name="sling-validation" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation</config>
<bundle>mvn:org.apache.sling/org.apache.sling.validation.api/1.0.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.validation.core/1.0.4</bundle>
<!-- dependencies -->
@@ -333,7 +333,7 @@
</feature>
<feature name="sling-xss" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss</config>
<bundle>mvn:org.apache.sling/org.apache.sling.xss/2.2.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -360,7 +360,7 @@
</feature>
<feature name="sling-installer-provider-jcr" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr</config>
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.2.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-installer</feature>
@@ -368,8 +368,8 @@
</feature>
<!-- Apache Sling JCR -->
<feature name="sling-jcr" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource</config>
<config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource</config>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.base/3.1.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0</bundle>
@@ -476,7 +476,7 @@
<!-- Apache Sling Scripting -->
<feature name="sling-scripting" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting</config>
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.2.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.2.0</bundle>
<!-- dependencies -->
@@ -523,7 +523,7 @@
<feature version="${project.version}">sling-caconfig</feature>
</feature>
<feature name="sling-scripting-htl" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_htl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_htl</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.3.2-1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.4-1.4.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.1.4-1.4.0</bundle>
@@ -543,7 +543,7 @@
<bundle dependency="true">mvn:org.antlr/antlr4-runtime/4.8-1</bundle>
</feature>
<feature name="sling-scripting-thymeleaf" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf</config>
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/2.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">thymeleaf</feature>
@@ -553,7 +553,7 @@
</feature>
<!-- Apache Sling Servlets -->
<feature name="sling-servlets" version="${project.version}">
- <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets</config>
+ <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets</config>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.40</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.36</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.6.4</bundle>