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/11/25 09:41:43 UTC
[sling-org-apache-sling-karaf-configs] branch master updated
(3b3f31e -> f08dec8)
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 3b3f31e SLING-8990 Switch configurations to OSGi R7 configuration format
new d665ba3 add configs for contentloader and adjust whitelist
new f08dec8 SLING-3027 Improve Launchpad Karaf Features
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 | 10 ++++++++++
...internal.LoginAdminWhitelist.fragment~composum_nodes.config | 5 +++--
...base.internal.LoginAdminWhitelist.fragment~sling_jcr.config | 1 -
...poinit.RepositoryInitializer~sling_jcr_contentloader.config | 6 ++++++
...erviceUserMapperImpl.amended~sling_jcr_contentloader.config | 3 +++
5 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config
create mode 100644 src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.config
[sling-org-apache-sling-karaf-configs] 02/02: SLING-3027 Improve
Launchpad Karaf Features
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 f08dec8954f094a1bc6f5e5cb844f9e35097df0d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Nov 25 10:39:13 2020 +0100
SLING-3027 Improve Launchpad Karaf Features
update Composum Nodes
---
....base.internal.LoginAdminWhitelist.fragment~composum_nodes.config | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config
index 0ef8206..eb4c89f 100644
--- a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config
+++ b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum_nodes.config
@@ -1,5 +1,6 @@
whitelist.name="composum-nodes"
whitelist.bundles=[\
- "com.composum.core.commons",\
- "com.composum.core.pckgmgr"\
+ "com.composum.nodes.commons",\
+ "com.composum.nodes.pckgmgr",\
+ "com.composum.nodes.usermgr"\
]
[sling-org-apache-sling-karaf-configs] 01/02: add configs for
contentloader and adjust whitelist
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 d665ba39f179d1a3bad9b929e9cf58ed01ebd0d3
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Nov 8 11:10:44 2020 +0100
add configs for contentloader and adjust whitelist
---
pom.xml | 10 ++++++++++
...base.internal.LoginAdminWhitelist.fragment~sling_jcr.config | 1 -
...poinit.RepositoryInitializer~sling_jcr_contentloader.config | 6 ++++++
...erviceUserMapperImpl.amended~sling_jcr_contentloader.config | 3 +++
4 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index da55b29..7d26208 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,6 +168,11 @@
<type>config</type>
</artifact>
<artifact>
+ <classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader</classifier>
+ <file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config</file>
+ <type>config</type>
+ </artifact>
+ <artifact>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping</classifier>
<file>src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_mapping.config</file>
<type>config</type>
@@ -223,6 +228,11 @@
<type>config</type>
</artifact>
<artifact>
+ <classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader</classifier>
+ <file>src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.config</file>
+ <type>config</type>
+ </artifact>
+ <artifact>
<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>
diff --git a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.config b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.config
index 9544d07..a2f0ae2 100644
--- a/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.config
+++ b/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~sling_jcr.config
@@ -2,7 +2,6 @@ whitelist.name="sling-jcr"
whitelist.bundles=[\
"org.apache.sling.jcr.base",\
"org.apache.sling.jcr.classloader",\
- "org.apache.sling.jcr.contentloader",\
"org.apache.sling.jcr.jackrabbit.usermanager",\
"org.apache.sling.jcr.oak.server",\
"org.apache.sling.jcr.repoinit",\
diff --git a/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config
new file mode 100644
index 0000000..10fca90
--- /dev/null
+++ b/src/main/resources/org.apache.sling.jcr.repoinit.RepositoryInitializer~sling_jcr_contentloader.config
@@ -0,0 +1,6 @@
+scripts=[\
+ "create service user sling-jcr-contentloader with path system/sling\n\
+ set ACL for sling-jcr-contentloader\n\
+ allow jcr:all on /\n\
+ end"\
+]
diff --git a/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.config b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.config
new file mode 100644
index 0000000..242a857
--- /dev/null
+++ b/src/main/resources/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling_jcr_contentloader.config
@@ -0,0 +1,3 @@
+user.mapping=[\
+ "org.apache.sling.jcr.contentloader\=sling-jcr-contentloader"\
+]