You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:27:35 UTC
[sling-org-apache-sling-karaf-configs] 17/39: add and fix configs
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-configs.git
commit 13236b70822bfbaee7cd94ebfbbd00ceeb15600b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Dec 21 10:42:50 2016 +0000
add and fix configs
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1775386 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 20 +++++++++++++
...al.LoginAdminWhitelist.fragment-composum.config | 4 +++
...ernal.LoginAdminWhitelist.fragment-sling.config | 33 +++++++++++-----------
....jcr.repoinit.impl.RepositoryInitializer.config | 4 ++-
....ServiceUserMapperImpl.amended-discovery.config | 8 +++---
...impl.ServiceUserMapperImpl.amended-event.config | 6 ++--
...impl.ServiceUserMapperImpl.amended-fling.config | 3 ++
....impl.ServiceUserMapperImpl.amended-i18n.config | 4 +--
...apperImpl.amended-installer_provider_jcr.config | 3 ++
...rviceUserMapperImpl.amended-jcr_resource.config | 3 ++
...eUserMapperImpl.amended-resourceresolver.config | 4 +++
....ServiceUserMapperImpl.amended-scripting.config | 4 +--
...UserMapperImpl.amended-scripting_sightly.config | 4 +--
...erMapperImpl.amended-scripting_thymeleaf.config | 4 +--
...g.impl.ServiceUserMapperImpl.amended-xss.config | 4 +--
15 files changed, 74 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index 536f886..1c5c380 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,6 +118,11 @@
<type>config</type>
</artifact>
<artifact>
+ <classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum.config</file>
+ <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>
<type>config</type>
@@ -168,6 +173,21 @@
<type>config</type>
</artifact>
<artifact>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_provider_jcr</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_provider_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>
+ <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>
+ <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>
<type>config</type>
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum.config b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum.config
new file mode 100644
index 0000000..72fc8a6
--- /dev/null
+++ b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum.config
@@ -0,0 +1,4 @@
+whitelist.name="composum"
+whitelist.bundles=[\
+ "com.composum.core.commons",\
+]
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.config
index f85027d..b2880ba 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.config
@@ -1,18 +1,19 @@
whitelist.name="sling"
-whitelist.bundles=[
- "org.apache.sling.discovery.commons",
- "org.apache.sling.discovery.base",
- "org.apache.sling.discovery.oak",
- "org.apache.sling.extensions.webconsolesecurityprovider",
- "org.apache.sling.i18n",
- "org.apache.sling.jcr.base",
- "org.apache.sling.jcr.contentloader",
- "org.apache.sling.jcr.davex",
- "org.apache.sling.jcr.jackrabbit.usermanager",
- "org.apache.sling.jcr.oak.server",
- "org.apache.sling.jcr.repoinit",
- "org.apache.sling.jcr.resource",
- "org.apache.sling.jcr.webconsole",
- "org.apache.sling.servlets.post",
- "org.apache.sling.servlets.resolver"
+whitelist.bundles=[\
+ "org.apache.sling.discovery.commons",\
+ "org.apache.sling.discovery.base",\
+ "org.apache.sling.discovery.oak",\
+ "org.apache.sling.extensions.webconsolesecurityprovider",\
+ "org.apache.sling.i18n",\
+ "org.apache.sling.jcr.base",\
+ "org.apache.sling.jcr.classloader",\
+ "org.apache.sling.jcr.contentloader",\
+ "org.apache.sling.jcr.davex",\
+ "org.apache.sling.jcr.jackrabbit.usermanager",\
+ "org.apache.sling.jcr.oak.server",\
+ "org.apache.sling.jcr.repoinit",\
+ "org.apache.sling.jcr.resource",\
+ "org.apache.sling.jcr.webconsole",\
+ "org.apache.sling.servlets.post",\
+ "org.apache.sling.servlets.resolver"\
]
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config b/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config
index b120ca7..b611822 100644
--- a/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config
+++ b/src/main/resources/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config
@@ -1 +1,3 @@
-references=["raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt"]
+references=[\
+ "raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt"\
+]
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-discovery.config
index 18c4aea..076fc1f 100644
--- a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config
@@ -1,5 +1,5 @@
-user.mapping=[
- "org.apache.sling.discovery.commons=sling-discovery",
- "org.apache.sling.discovery.base=sling-discovery",
- "org.apache.sling.discovery.oak=sling-discovery"
+user.mapping=[\
+ "org.apache.sling.discovery.commons\=sling-discovery",\
+ "org.apache.sling.discovery.base\=sling-discovery",\
+ "org.apache.sling.discovery.oak\=sling-discovery"\
]
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-event.config
index 7371319..ebeda2e 100644
--- a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config
@@ -1,4 +1,4 @@
-user.mapping=[
- "org.apache.sling.event=sling-event",
- "org.apache.sling.event.dea=sling-event"
+user.mapping=[\
+ "org.apache.sling.event\=sling-event",\
+ "org.apache.sling.event.dea\=sling-event"\
]
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-fling.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-fling.config
new file mode 100644
index 0000000..bbe6a26
--- /dev/null
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-fling.config
@@ -0,0 +1,3 @@
+user.mapping=[\
+ "org.apache.sling.samples.fling\=sling-scripting"\
+]
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-i18n.config
index ed2407f..be23cff 100644
--- a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n.config
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n.config
@@ -1,3 +1,3 @@
-user.mapping=[
- "org.apache.sling.i18n=sling-i18n"
+user.mapping=[\
+ "org.apache.sling.i18n\=sling-i18n"\
]
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_provider_jcr.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_provider_jcr.config
new file mode 100644
index 0000000..7e5759d
--- /dev/null
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_provider_jcr.config
@@ -0,0 +1,3 @@
+user.mapping=[\
+ "org.apache.sling.installer.provider.jcr\=sling-jcr-install"
+]
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-jcr_resource.config
new file mode 100644
index 0000000..ff20a64
--- /dev/null
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config
@@ -0,0 +1,3 @@
+user.mapping=[\
+ "org.apache.sling.jcr.resource:observation\=sling-readall"
+]
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-resourceresolver.config
new file mode 100644
index 0000000..f08494b
--- /dev/null
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver.config
@@ -0,0 +1,4 @@
+user.mapping=[\
+ "org.apache.sling.resourceresolver:mapping\=sling-mapping",\
+ "org.apache.sling.resourceresolver:read\=sling-readall"
+]
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-scripting.config
index dec50c7..7654b49 100644
--- a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting.config
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting.config
@@ -1,3 +1,3 @@
-user.mapping=[
- "org.apache.sling.scripting.core=sling-scripting"
+user.mapping=[\
+ "org.apache.sling.scripting.core\=sling-scripting"\
]
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly.config
index b69c73c..be235a8 100644
--- a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly.config
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly.config
@@ -1,3 +1,3 @@
-user.mapping=[
- "org.apache.sling.scripting.sightly.js.provider=sling-scripting"
+user.mapping=[\
+ "org.apache.sling.scripting.sightly.js.provider\=sling-scripting"\
]
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-scripting_thymeleaf.config
index 69091f4..9ff93ff 100644
--- 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-scripting_thymeleaf.config
@@ -1,3 +1,3 @@
-user.mapping=[
- "org.apache.sling.scripting.thymeleaf=sling-scripting"
+user.mapping=[\
+ "org.apache.sling.scripting.thymeleaf\=sling-scripting"\
]
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-xss.config
index 697cc19..0131c0f 100644
--- a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config
@@ -1,3 +1,3 @@
-user.mapping=[
- "org.apache.sling.xss=sling-xss"
+user.mapping=[\
+ "org.apache.sling.xss\=sling-xss"\
]
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.