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:14 UTC
[sling-org-apache-sling-karaf-configs] branch master updated
(6571136 -> 90d1e0f)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-configs.git.
from 6571136 SLING-9297 Add dedicated RepositoryInitializer configs for sling-mapping and sling-readall
new 78f7162 SLING-9355 Split LoginAdminWhitelist fragment sling into sling-discovery and sling-jcr
new 90d1e0f SLING-9356 Add prefix sling to service user mapper configurations
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 73 ++++++++++++----------
...nAdminWhitelist.fragment-sling_discovery.config | 6 ++
....LoginAdminWhitelist.fragment-sling_jcr.config} | 5 +-
...ceUserMapperImpl.amended-sling_caconfig.config} | 0
...erviceUserMapperImpl.amended-sling_clam.config} | 0
...eUserMapperImpl.amended-sling_discovery.config} | 0
...rviceUserMapperImpl.amended-sling_event.config} | 0
...erviceUserMapperImpl.amended-sling_i18n.config} | 0
...rMapperImpl.amended-sling_installer_jcr.config} | 0
...erMapperImpl.amended-sling_jcr_resource.config} | 0
...perImpl.amended-sling_resource_presence.config} | 0
...pperImpl.amended-sling_resourceresolver.config} | 0
...ceUserMapperImpl.amended-sling_rewriter.config} | 0
...eUserMapperImpl.amended-sling_scripting.config} | 0
...rMapperImpl.amended-sling_scripting_htl.config} | 0
...rImpl.amended-sling_scripting_thymeleaf.config} | 0
...ceUserMapperImpl.amended-sling_servlets.config} | 0
...UserMapperImpl.amended-sling_validation.config} | 0
...ServiceUserMapperImpl.amended-sling_xss.config} | 0
19 files changed, 46 insertions(+), 38 deletions(-)
create mode 100644 src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery.config
rename src/main/resources/{org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling.config => org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr.config} (68%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-caconfig.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-clam.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-rewriter.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_htl.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation.config} (100%)
rename src/main/resources/{org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config => org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss.config} (100%)
[sling-org-apache-sling-karaf-configs] 02/02: SLING-9356 Add prefix
sling to service user mapper configurations
Posted by ol...@apache.org.
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-configs.git
commit 90d1e0f002db18c0504133aac235906a7fae7454
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 10 15:09:54 2020 +0200
SLING-9356 Add prefix sling to service user mapper configurations
---
pom.xml | 64 +++++++++++-----------
...ceUserMapperImpl.amended-sling_caconfig.config} | 0
...erviceUserMapperImpl.amended-sling_clam.config} | 0
...eUserMapperImpl.amended-sling_discovery.config} | 0
...rviceUserMapperImpl.amended-sling_event.config} | 0
...erviceUserMapperImpl.amended-sling_i18n.config} | 0
...rMapperImpl.amended-sling_installer_jcr.config} | 0
...erMapperImpl.amended-sling_jcr_resource.config} | 0
...perImpl.amended-sling_resource_presence.config} | 0
...pperImpl.amended-sling_resourceresolver.config} | 0
...ceUserMapperImpl.amended-sling_rewriter.config} | 0
...eUserMapperImpl.amended-sling_scripting.config} | 0
...rMapperImpl.amended-sling_scripting_htl.config} | 0
...rImpl.amended-sling_scripting_thymeleaf.config} | 0
...ceUserMapperImpl.amended-sling_servlets.config} | 0
...UserMapperImpl.amended-sling_validation.config} | 0
...ServiceUserMapperImpl.amended-sling_xss.config} | 0
17 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index d2f959e..358cada 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,83 +193,83 @@
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-caconfig</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-caconfig.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-clam</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-clam.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-rewriter</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-rewriter.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_htl</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_htl.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation.config</file>
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</classifier>
- <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config</file>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss.config</file>
<type>config</type>
</artifact>
</artifacts>
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-caconfig.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-caconfig.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_caconfig.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-clam.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-clam.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_clam.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_discovery.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_event.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_i18n.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_installer_jcr.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_jcr_resource.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resource_presence.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_resourceresolver.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-rewriter.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-rewriter.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_rewriter.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_htl.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_htl.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_htl.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_scripting_thymeleaf.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_servlets.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_validation.config
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss.config
similarity index 100%
rename from src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config
rename to src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling_xss.config
[sling-org-apache-sling-karaf-configs] 01/02: SLING-9355 Split
LoginAdminWhitelist fragment sling into sling-discovery and sling-jcr
Posted by ol...@apache.org.
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-configs.git
commit 78f71627905fa51c23c10a9660338e8ec1d69d0d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Apr 10 14:16:16 2020 +0200
SLING-9355 Split LoginAdminWhitelist fragment sling into sling-discovery and sling-jcr
---
pom.xml | 9 +++++++--
....internal.LoginAdminWhitelist.fragment-sling_discovery.config | 6 ++++++
....base.internal.LoginAdminWhitelist.fragment-sling_jcr.config} | 5 +----
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index df01d38..d2f959e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,8 +123,13 @@
<type>config</type>
</artifact>
<artifact>
- <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling</classifier>
- <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling.config</file>
+ <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery.config</file>
+ <type>config</type>
+ </artifact>
+ <artifact>
+ <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr.config</file>
<type>config</type>
</artifact>
<artifact>
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery.config b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery.config
new file mode 100644
index 0000000..a32c785
--- /dev/null
+++ b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_discovery.config
@@ -0,0 +1,6 @@
+whitelist.name="sling-discovery"
+whitelist.bundles=[\
+ "org.apache.sling.discovery.commons",\
+ "org.apache.sling.discovery.base",\
+ "org.apache.sling.discovery.oak"\
+]
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling.config b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr.config
similarity index 68%
rename from src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling.config
rename to src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr.config
index 05b372b..9544d07 100644
--- a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling.config
+++ b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_jcr.config
@@ -1,8 +1,5 @@
-whitelist.name="sling"
+whitelist.name="sling-jcr"
whitelist.bundles=[\
- "org.apache.sling.discovery.commons",\
- "org.apache.sling.discovery.base",\
- "org.apache.sling.discovery.oak",\
"org.apache.sling.jcr.base",\
"org.apache.sling.jcr.classloader",\
"org.apache.sling.jcr.contentloader",\