You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2021/02/17 05:04:34 UTC
[sling-org-apache-sling-app-cms] branch master updated: Minor:
updating dependencies and structure to sync with starter
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new 27c1299 Minor: updating dependencies and structure to sync with starter
27c1299 is described below
commit 27c1299dc4fa8c2737e7881eb887e3fdca2bd19d
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Feb 17 00:04:10 2021 -0500
Minor: updating dependencies and structure to sync with starter
---
docker/cms/Dockerfile | 2 +-
feature/pom.xml | 6 +-
feature/src/main/features/base-repoinit.txt | 80 ++++++++++++++++
feature/src/main/features/base.json | 111 ++++++-----------------
feature/src/main/features/boot.json | 8 +-
feature/src/main/features/caconfig-repoinit.txt | 20 ++++
feature/src/main/features/caconfig.json | 8 +-
feature/src/main/features/cms/cms-repoinit.txt | 87 ++++++++++++++++++
feature/src/main/features/cms/cms.json | 80 +---------------
feature/src/main/features/cms/dependencies.json | 10 +-
feature/src/main/features/cms/reference.json | 11 +--
feature/src/main/features/discovery-repoinit.txt | 27 ++++++
feature/src/main/features/discovery.json | 17 +---
feature/src/main/features/event-repoinit.txt | 27 ++++++
feature/src/main/features/event.json | 15 +--
feature/src/main/features/healthcheck.json | 7 +-
feature/src/main/features/maintenance.json | 4 +-
feature/src/main/features/oak/oak_base.json | 3 -
feature/src/main/features/scripting.json | 53 +++++++----
feature/src/main/features/validation.json | 15 +--
20 files changed, 340 insertions(+), 251 deletions(-)
diff --git a/docker/cms/Dockerfile b/docker/cms/Dockerfile
index efaf5e9..5d60694 100644
--- a/docker/cms/Dockerfile
+++ b/docker/cms/Dockerfile
@@ -18,7 +18,7 @@ ARG ADDITIONAL_FEATURE_COORDINATE=
ARG CMS_GROUP_ID=org.apache.sling
ARG CMS_ARTIFACT_ID=org.apache.sling.cms.feature
ARG CMS_VERSION=0.16.3-SNAPSHOT
-ARG LAUNCHER_VERSION=1.1.10
+ARG LAUNCHER_VERSION=1.1.16
ARG FM_SEED_CLASSIFIER=slingcms-composite-seed
ARG RUNMODE=standalone
ARG FM_RUNTIME_CLASSIFIER=slingcms-composite-runtime
diff --git a/feature/pom.xml b/feature/pom.xml
index d3877e5..7d64bb6 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>slingfeature-maven-plugin</artifactId>
- <version>1.3.0</version>
+ <version>1.4.24</version>
<extensions>true</extensions>
<configuration>
<framework>
@@ -157,7 +157,7 @@
<goal>attach-featurearchives</goal>
</goals>
<configuration>
- <replacePropertyVariables>cms-version,composum-version,groovy-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io-version,tika-version,pdfbox-version,httpclient-version,org-apache-sling-caconfig-api-version,jsoup-version [...]
+ <replacePropertyVariables>org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-version,groovy-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io-version,tika-version,pdfbox-ver [...]
</configuration>
</execution>
</executions>
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.launcher</artifactId>
- <version>1.1.14</version>
+ <version>1.1.16</version>
</dependency>
</dependencies>
</project>
diff --git a/feature/src/main/features/base-repoinit.txt b/feature/src/main/features/base-repoinit.txt
new file mode 100644
index 0000000..dc4a7e8
--- /dev/null
+++ b/feature/src/main/features/base-repoinit.txt
@@ -0,0 +1,80 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# general
+create path (sling:OrderedFolder) /content
+set ACL for everyone
+ allow jcr:read on /content
+end
+
+# sling-readall
+create service user sling-readall with path system/sling
+
+set principal ACL for sling-readall
+ allow jcr:read on /
+end
+
+# sling-xss
+create service user sling-xss with path system/sling
+
+create path (sling:Folder) /apps/sling/xss
+
+set principal ACL for sling-xss
+ allow jcr:read on /apps/sling/xss
+end
+
+# sling-jcr-install
+create service user sling-jcr-install with path system/sling
+
+# used for config OSGi writeback
+create path (sling:Folder) /apps/sling/install
+
+set principal ACL for sling-jcr-install
+ allow rep:write on /apps/sling/install
+end
+
+# content-package installer
+create service user sling-package-install with path system/sling
+
+set principal ACL for sling-package-install
+ allow jcr:all on /
+ allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository
+end
+#<<< SLING-5848 - Define service user and ACLs for Scripting
+create service user sling-search-path-reader with path system/sling
+
+create path (sling:Folder) /libs
+create path (sling:Folder) /apps
+
+set principal ACL for sling-search-path-reader
+ allow jcr:read on /libs,/apps
+end
+# SLING-5848 - Define service user and ACLs for Scripting >>>
+#<<< SLING-9735 - Define service user and ACLs for jcr.contentloader
+create service user sling-jcr-content-loader with path system/sling
+set principal ACL for sling-jcr-content-loader
+ allow jcr:all on /
+end
+# SLING-9735 - Define service user and ACLs for jcr.contentloader >>>
+#<<< SLING-9809 - Define service user and ACLs for jcr.usermanager
+create service user sling-jcr-usermanager with path system/sling
+set principal ACL for sling-jcr-usermanager
+ allow jcr:read,jcr:readAccessControl,jcr:modifyAccessControl,rep:write,rep:userManagement on /home
+end
+# SLING-9809 - Define service user and ACLs for jcr.usermanager >>>
diff --git a/feature/src/main/features/base.json b/feature/src/main/features/base.json
index 77b8be4..6eecf65 100644
--- a/feature/src/main/features/base.json
+++ b/feature/src/main/features/base.json
@@ -98,7 +98,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:1.7.0",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:1.7.2",
"start-order":"20"
},
{
@@ -110,7 +110,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.servlets.post:2.3.36",
+ "id":"org.apache.sling:org.apache.sling.servlets.post:2.4.2",
"start-order":"20"
},
{
@@ -202,7 +202,7 @@
"start-order":"10"
},
{
- "id":"io.dropwizard.metrics:metrics-core:3.2.5",
+ "id":"io.dropwizard.metrics:metrics-core:3.2.6",
"start-order":"15"
},
{
@@ -273,6 +273,7 @@
"org.apache.sling.extensions.webconsolesecurityprovider",
"org.apache.sling.i18n",
"org.apache.sling.jcr.base",
+ "org.apache.sling.jcr.contentloader",
"org.apache.sling.jcr.jackrabbit.usermanager",
"org.apache.sling.jcr.oak.server",
"org.apache.sling.jcr.repoinit",
@@ -283,116 +284,58 @@
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~i18n":{
"user.mapping":[
- "org.apache.sling.i18n=sling-i18n"
+ "org.apache.sling.i18n=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~installer-factories":{
"user.mapping":[
- "org.apache.sling.installer.factory.packages=sling-package-install"
- ]
- },
- "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-contentloader":{
- "user.mapping":[
- "org.apache.sling.jcr.contentloader=sling-jcr-contentloader"
+ "org.apache.sling.installer.factory.packages=[sling-package-install]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-install":{
"user.mapping":[
- "org.apache.sling.installer.provider.jcr=sling-jcr-install"
+ "org.apache.sling.installer.provider.jcr=[sling-readall,sling-jcr-install]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-resource":{
"user.mapping":[
- "org.apache.sling.jcr.resource:validation=sling-readall"
+ "org.apache.sling.jcr.resource:validation=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~observation":{
"user.mapping":[
- "org.apache.sling.jcr.resource:observation=sling-readall"
+ "org.apache.sling.jcr.resource:observation=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~resourceresolver":{
"user.mapping":[
- "org.apache.sling.resourceresolver:mapping=sling-mapping",
- "org.apache.sling.resourceresolver:hierarchy=sling-readall",
- "org.apache.sling.resourceresolver:observation=sling-readall",
- "org.apache.sling.resourceresolver:console=sling-readall"
+ "org.apache.sling.resourceresolver:mapping=[sling-readall]",
+ "org.apache.sling.resourceresolver:hierarchy=[sling-readall]",
+ "org.apache.sling.resourceresolver:observation=[sling-readall]",
+ "org.apache.sling.resourceresolver:console=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~servletsresolver":{
"user.mapping":[
- "org.apache.sling.servlets.resolver:console=sling-readall",
- "org.apache.sling.servlets.resolver:scripts=sling-scripting"
+ "org.apache.sling.servlets.resolver:console=[sling-readall]",
+ "org.apache.sling.servlets.resolver:scripts=[sling-search-path-reader]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~xss":{
"user.mapping":[
- "org.apache.sling.xss=sling-xss"
+ "org.apache.sling.xss=[sling-xss]"
+ ]
+ },
+ "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-usermanager":{
+ "user.mapping":[
+ "org.apache.sling.jcr.jackrabbit.usermanager=[sling-jcr-usermanager]"
+ ]
+ },
+ "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~jcr-contentloader":{
+ "user.mapping":[
+ "org.apache.sling.jcr.contentloader=[sling-jcr-content-loader]"
]
}
},
- "repoinit:TEXT|true":[
- "# general",
- "create path (sling:OrderedFolder) /content",
- "set ACL for everyone",
- "allow jcr:read on /content",
- "end",
- "",
- "# sling-mapping",
- "create service user sling-mapping",
- "",
- "set ACL for sling-mapping",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-readall",
- "create service user sling-readall",
- "",
- "set ACL for sling-readall",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-xss",
- "create service user sling-xss",
- "",
- "create path (sling:Folder) /apps/sling/xss",
- "",
- "set ACL for sling-xss",
- "allow jcr:read on /apps/sling/xss",
- "end",
- "",
- "# sling-i18n",
- "create service user sling-i18n",
- "",
- "set ACL for sling-i18n",
- "allow jcr:read on /",
- "end",
- "",
- "# sling-jcr-install",
- "create service user sling-jcr-install",
- "",
- "# used for config OSGi writeback",
- "create path (sling:Folder) /apps/sling/install",
- "",
- "set ACL for sling-jcr-install",
- "allow jcr:read on /",
- "allow rep:write on /apps/sling/install",
- "end",
- "",
- "# jcr-contentloader",
- "create service user sling-jcr-contentloader",
- "",
- "set ACL for sling-jcr-contentloader",
- "allow jcr:all on /",
- "allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
- "end",
- "",
- "# content-package installer",
- "create service user sling-package-install",
- "",
- "set ACL for sling-package-install",
- "allow jcr:all on /",
- "allow jcr:namespaceManagement,jcr:nodeTypeDefinitionManagement on :repository",
- "end"
- ]
+ "repoinit:TEXT|true":"@file"
}
diff --git a/feature/src/main/features/boot.json b/feature/src/main/features/boot.json
index eccfb4b..7118384 100644
--- a/feature/src/main/features/boot.json
+++ b/feature/src/main/features/boot.json
@@ -66,6 +66,10 @@
},
{
"id": "org.apache.sling:org.apache.sling.commons.logservice:1.1.0",
+ "start-order":"1"
+ },
+ {
+ "id":"org.apache.felix:org.apache.felix.log:1.2.4",
"start-order": "1"
},
{
@@ -77,7 +81,7 @@
"start-order": "1"
},
{
- "id": "org.apache.sling:org.apache.sling.installer.factory.configuration:1.3.2",
+ "id": "org.apache.sling:org.apache.sling.installer.factory.configuration:1.3.4",
"start-order": "1"
},
{
@@ -129,4 +133,4 @@
"start-order": "1"
}
]
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/caconfig-repoinit.txt b/feature/src/main/features/caconfig-repoinit.txt
new file mode 100644
index 0000000..db8d2a5
--- /dev/null
+++ b/feature/src/main/features/caconfig-repoinit.txt
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+create path (sling:Folder) /conf
\ No newline at end of file
diff --git a/feature/src/main/features/caconfig.json b/feature/src/main/features/caconfig.json
index 4d34392..444e5a9 100644
--- a/feature/src/main/features/caconfig.json
+++ b/feature/src/main/features/caconfig.json
@@ -17,11 +17,9 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-caconfig":{
"user.mapping":[
- "org.apache.sling.caconfig.impl=sling-readall"
+ "org.apache.sling.caconfig.impl=[sling-readall]"
]
}
},
- "repoinit:TEXT|true":[
- "create path (sling:Folder) /conf"
- ]
-}
\ No newline at end of file
+ "repoinit:TEXT|true": "@file"
+}
diff --git a/feature/src/main/features/cms/cms-repoinit.txt b/feature/src/main/features/cms/cms-repoinit.txt
new file mode 100644
index 0000000..600ab1d
--- /dev/null
+++ b/feature/src/main/features/cms/cms-repoinit.txt
@@ -0,0 +1,87 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# CMS root paths
+create path (sling:OrderedFolder) /etc/i18n
+set ACL for everyone
+ allow jcr:read on /etc/i18n
+end
+create path (sling:OrderedFolder) /etc/taxonomy
+set ACL for everyone
+ allow jcr:read on /etc/taxonomy
+end
+create path (sling:OrderedFolder) /static
+set ACL for everyone
+ allow jcr:read on /static
+end
+create path (sling:OrderedFolder) /conf
+set ACL for everyone
+ allow jcr:read on /conf
+end
+create path (sling:OrderedFolder) /content
+create path (sling:OrderedFolder) /etc/usergenerated
+set ACL for everyone
+ allow jcr:read on /etc/usergenerated
+end
+
+# Groups
+create path (rep:AuthorizableFolder) /home/groups
+create path (rep:AuthorizableFolder) /home/groups/sling-cms
+create group administrators with path sling-cms
+set ACL for administrators
+ allow jcr:all on /
+end
+create group authors with path sling-cms
+set ACL for authors
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /content
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /static
+ allow jcr:read on /
+end
+create group job-users with path sling-cms
+create group taxonomy-users with path sling-cms
+set ACL for taxonomy-users
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /etc/taxonomy
+end
+create group ugc-users with path sling-cms
+set ACL for ugc-users
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /etc/usergenerated
+end
+
+# Service users
+create service user sling-cms-metadata
+set ACL for sling-cms-metadata
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /content
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /static
+ allow jcr:read on /
+end
+create service user sling-cms-transformer
+set ACL for sling-cms-transformer
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /content
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /static
+ allow jcr:read on /
+end
+create service user sling-cms-ugc
+set ACL for sling-cms-ugc
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /etc/usergenerated
+end
+create service user sling-cms-versionmgr
+set ACL for sling-cms-versionmgr
+ allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /
+ allow jcr:read on /jcr:system/jcr:versionStorage
+end
\ No newline at end of file
diff --git a/feature/src/main/features/cms/cms.json b/feature/src/main/features/cms/cms.json
index aa203a7..617664d 100644
--- a/feature/src/main/features/cms/cms.json
+++ b/feature/src/main/features/cms/cms.json
@@ -164,8 +164,8 @@
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-error": {
"user.mapping": [
- "org.apache.sling.cms.core:sling-cms-error=sling-cms-error",
- "org.apache.sling.models.impl:sling-cms-error=sling-cms-error"
+ "org.apache.sling.cms.core:sling-cms-error=[sling-readall]",
+ "org.apache.sling.models.impl:sling-cms-error=[sling-readall]"
]
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling-cms-metadata": {
@@ -189,79 +189,5 @@
]
}
},
- "repoinit:TEXT|true": [
- "",
- "# CMS root paths",
- "create path (sling:OrderedFolder) /etc/i18n",
- "set ACL for everyone",
- "allow jcr:read\ton /etc/i18n",
- "end",
- "create path (sling:OrderedFolder) /etc/taxonomy",
- "set ACL for everyone",
- "allow jcr:read\ton /etc/taxonomy",
- "end",
- "create path (sling:OrderedFolder) /static",
- "set ACL for everyone",
- "allow jcr:read\ton /static",
- "end",
- "create path (sling:OrderedFolder) /conf",
- "set ACL for everyone",
- "allow jcr:read\ton /conf",
- "end",
- "create path (sling:OrderedFolder) /content",
- "create path (sling:OrderedFolder) /etc/usergenerated",
- "set ACL for everyone",
- "allow jcr:read on /etc/usergenerated",
- "end",
- "",
- "# Groups",
- "create path (rep:AuthorizableFolder) /home/groups",
- "create path (rep:AuthorizableFolder) /home/groups/sling-cms",
- "create group administrators with path sling-cms",
- "set ACL for administrators",
- "allow jcr:all on /",
- "end",
- "create group authors with path sling-cms",
- "set ACL for authors",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /content",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /static",
- "allow jcr:read on /",
- "end",
- "create group job-users with path sling-cms",
- "create group taxonomy-users with path sling-cms",
- "set ACL for taxonomy-users",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /etc/taxonomy",
- "end",
- "create group ugc-users with path sling-cms",
- "set ACL for ugc-users",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /etc/usergenerated",
- "end",
- "",
- "# Service users",
- "create service user sling-cms-error",
- "set ACL for sling-cms-error",
- "allow\tjcr:read\ton /",
- "end",
- "create service user sling-cms-metadata",
- "set ACL for sling-cms-metadata",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /content",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /static",
- "allow jcr:read on /",
- "end",
- "create service user sling-cms-transformer",
- "set ACL for sling-cms-transformer",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /content",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /static",
- "allow jcr:read on /",
- "end",
- "create service user sling-cms-ugc",
- "set ACL for sling-cms-ugc",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /etc/usergenerated",
- "end",
- "create service user sling-cms-versionmgr",
- "set ACL for sling-cms-versionmgr",
- "allow jcr:write,jcr:nodeTypeManagement,jcr:versionManagement on /",
- "allow jcr:read on /jcr:system/jcr:versionStorage",
- "end"
- ]
+ "repoinit:TEXT|true": "@file"
}
\ No newline at end of file
diff --git a/feature/src/main/features/cms/dependencies.json b/feature/src/main/features/cms/dependencies.json
index 967ba7e..8577edd 100644
--- a/feature/src/main/features/cms/dependencies.json
+++ b/feature/src/main/features/cms/dependencies.json
@@ -236,7 +236,7 @@
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling.rewriter": {
"user.mapping": [
- "org.apache.sling.rewriter=sling-rewriter"
+ "org.apache.sling.rewriter=[sling-readall]"
]
},
"org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~serviceuser-webconsole": {
@@ -245,11 +245,5 @@
],
"whitelist.name": "org.apache.sling.serviceuser.webconsole"
}
- },
- "repoinit:TEXT|true": [
- "create service user sling-rewriter",
- "set ACL for sling-rewriter",
- "allow jcr:read on /",
- "end"
- ]
+ }
}
\ No newline at end of file
diff --git a/feature/src/main/features/cms/reference.json b/feature/src/main/features/cms/reference.json
index 54555c9..3574fd0 100644
--- a/feature/src/main/features/cms/reference.json
+++ b/feature/src/main/features/cms/reference.json
@@ -13,15 +13,8 @@
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~slingcms-reference-usermanager": {
"user.mapping": [
- "org.apache.sling.cms.reference:slingcms-reference-usermanager=slingcms-reference-usermanager"
+ "org.apache.sling.cms.reference:slingcms-reference-usermanager=[sling-jcr-usermanager]"
]
}
- },
- "repoinit:TEXT|true": [
- "# Service users",
- "create service user slingcms-reference-usermanager",
- "set ACL for slingcms-reference-usermanager",
- " allow\tjcr:all\ton /home",
- "end"
- ]
+ }
}
\ No newline at end of file
diff --git a/feature/src/main/features/discovery-repoinit.txt b/feature/src/main/features/discovery-repoinit.txt
new file mode 100644
index 0000000..17b5f0f
--- /dev/null
+++ b/feature/src/main/features/discovery-repoinit.txt
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+create service user sling-discovery with path system/sling
+
+create path (sling:Folder) /var/discovery
+create path (sling:Folder) /var/discovery/oak
+
+set principal ACL for sling-discovery
+ allow jcr:read,rep:write on /var/discovery
+end
\ No newline at end of file
diff --git a/feature/src/main/features/discovery.json b/feature/src/main/features/discovery.json
index 7e0a558..9a8bf34 100644
--- a/feature/src/main/features/discovery.json
+++ b/feature/src/main/features/discovery.json
@@ -25,20 +25,11 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~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"
+ "org.apache.sling.discovery.commons=[sling-discovery]",
+ "org.apache.sling.discovery.base=[sling-discovery]",
+ "org.apache.sling.discovery.oak=[sling-discovery]"
]
}
},
- "repoinit:TEXT|true":[
- "create service user sling-discovery",
- "",
- "create path (sling:Folder) /var/discovery",
- "create path (sling:Folder) /var/discovery/oak",
- "",
- "set ACL for sling-discovery",
- "allow jcr:read,rep:write on /var/discovery",
- "end"
- ]
+ "repoinit:TEXT|true": "@file"
}
diff --git a/feature/src/main/features/event-repoinit.txt b/feature/src/main/features/event-repoinit.txt
new file mode 100644
index 0000000..7ad7244
--- /dev/null
+++ b/feature/src/main/features/event-repoinit.txt
@@ -0,0 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+create service user sling-event with path system/sling
+
+create path (sling:Folder) /var
+create path (sling:Folder) /var/eventing
+
+set principal ACL for sling-event
+ allow jcr:read,rep:write on /var/eventing
+end
\ No newline at end of file
diff --git a/feature/src/main/features/event.json b/feature/src/main/features/event.json
index 19fdb93..c0f55b1 100644
--- a/feature/src/main/features/event.json
+++ b/feature/src/main/features/event.json
@@ -13,19 +13,10 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~sling.event":{
"user.mapping":[
- "org.apache.sling.event=sling-event",
- "org.apache.sling.event.dea=sling-event"
+ "org.apache.sling.event=[sling-event]",
+ "org.apache.sling.event.dea=[sling-event]"
]
}
},
- "repoinit:TEXT|true":[
- "create service user sling-event",
- "",
- "create path (sling:Folder) /var",
- "create path (sling:Folder) /var/eventing",
- "",
- "set ACL for sling-event",
- "allow jcr:read,rep:write on /var/eventing",
- "end"
- ]
+ "repoinit:TEXT|true": "@file"
}
diff --git a/feature/src/main/features/healthcheck.json b/feature/src/main/features/healthcheck.json
index fa30554..1331704 100644
--- a/feature/src/main/features/healthcheck.json
+++ b/feature/src/main/features/healthcheck.json
@@ -51,7 +51,7 @@
"hc.tags": [
"systemalive"
],
- "targetStartLevel": 30
+ "targetStartLevel:Integer":"30"
},
"org.apache.felix.hc.generalchecks.MemoryCheck": {
"hc.tags": [
@@ -100,10 +100,13 @@
"useCriticalForNotLoaded": true,
"excludesRegex": ""
},
+ "org.apache.felix.hc.core.impl.servlet.HealthCheckExecutorServlet~default": {
+ "servletPath": "/system/health"
+ },
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~hc-support": {
"user.mapping": [
"org.apache.sling.hc.support=sling-readall"
]
}
}
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/maintenance.json b/feature/src/main/features/maintenance.json
index 2f39777..6fd3e12 100644
--- a/feature/src/main/features/maintenance.json
+++ b/feature/src/main/features/maintenance.json
@@ -1,5 +1,5 @@
{
"prototype": {
- "id": "org.apache.sling:org.apache.sling.jcr.maintenance:slingosgifeature:default:1.0.0-SNAPSHOT"
+ "id": "org.apache.sling:org.apache.sling.jcr.maintenance:slingosgifeature:default:1.0.0"
}
-}
\ No newline at end of file
+}
diff --git a/feature/src/main/features/oak/oak_base.json b/feature/src/main/features/oak/oak_base.json
index 9b41098..90ccc73 100644
--- a/feature/src/main/features/oak/oak_base.json
+++ b/feature/src/main/features/oak/oak_base.json
@@ -151,9 +151,6 @@
}
],
"configurations":{
- "org.apache.felix.hc.core.impl.servlet.HealthCheckExecutorServlet~default": {
- "servletPath": "/system/health"
- },
"org.apache.felix.jaas.ConfigurationSpi":{
"jaas.defaultRealmName":"jackrabbit.oak",
"jaas.configProviderName":"FelixJaasProvider"
diff --git a/feature/src/main/features/scripting.json b/feature/src/main/features/scripting.json
index 019a536..2cf71ea 100644
--- a/feature/src/main/features/scripting.json
+++ b/feature/src/main/features/scripting.json
@@ -58,7 +58,39 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.6-1.4.0",
+ "id":"org.apache.sling:org.apache.sling.scripting.sightly:1.4.4-1.4.0",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.scripting.freemarker:1.0.4",
+ "start-order":"20"
+ },
+ {
+ "id": "org.freemarker:freemarker:2.3.30",
+ "start-order": "20"
+ },
+ {
+ "id":"org.apache.sling:org.apache.sling.scripting.thymeleaf:2.0.2",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.thymeleaf:3.0.11.RELEASE_1",
+ "start-order":"20"
+ },
+ {
+ "id":"org.attoparser:attoparser:2.0.5.RELEASE",
+ "start-order":"20"
+ },
+ {
+ "id":"org.unbescape:unbescape:1.1.6.RELEASE",
+ "start-order":"20"
+ },
+ {
+ "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl:3.2.1_1",
+ "start-order":"20"
+ },
+ {
+ "id":"org.javassist:javassist:3.27.0-GA",
"start-order":"20"
}
],
@@ -70,22 +102,9 @@
},
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~scripting":{
"user.mapping":[
- "org.apache.sling.scripting.core=sling-scripting",
- "org.apache.sling.scripting.sightly.js.provider=sling-scripting"
+ "org.apache.sling.scripting.core=[sling-search-path-reader]",
+ "org.apache.sling.scripting.sightly.js.provider=[sling-search-path-reader]"
]
}
- },
- "repoinit:TEXT|true":[
- "#<<< SLING-5848 - Define service user and ACLs for Scripting",
- "create service user sling-scripting",
- "",
- "create path (sling:Folder) /libs",
- "create path (sling:Folder) /apps",
- "",
- "set ACL for sling-scripting",
- "deny jcr:all on /",
- "allow jcr:read on /libs,/apps",
- "end",
- "# SLING-5848 - Define service user and ACLs for Scripting >>>"
- ]
+ }
}
diff --git a/feature/src/main/features/validation.json b/feature/src/main/features/validation.json
index 73d7be6..4d241b3 100644
--- a/feature/src/main/features/validation.json
+++ b/feature/src/main/features/validation.json
@@ -17,19 +17,8 @@
"configurations":{
"org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended~validation":{
"user.mapping":[
- "org.apache.sling.validation.core=sling-validation"
+ "org.apache.sling.validation.core=[sling-search-path-reader]"
]
}
- },
- "repoinit:TEXT|true":[
- "create service user sling-validation",
- "",
- "create path (sling:Folder) /apps",
- "create path (sling:Folder) /libs",
- "",
- "set ACL for sling-validation",
- "allow jcr:read on /apps",
- "allow jcr:read on /libs",
- "end"
- ]
+ }
}