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:15 UTC
[sling-org-apache-sling-karaf-configs] 01/02: SLING-9355 Split
LoginAdminWhitelist fragment sling into sling-discovery and sling-jcr
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",\