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 2020/07/23 01:33:02 UTC
[sling-org-apache-sling-app-cms] 01/01: Updating to bring the PM
closer to Sling 12
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch SLING-8913-multiple-instance-types
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit cd7ab57abac4e93f9d1fd478b4b355b2a916117f
Author: Dan Klco <dk...@apache.org>
AuthorDate: Wed Jul 22 21:32:37 2020 -0400
Updating to bring the PM closer to Sling 12
---
builder/src/main/provisioning/cms.txt | 4 ++-
builder/src/main/provisioning/composum.txt | 1 -
builder/src/main/provisioning/healthcheck.txt | 8 ++---
builder/src/main/provisioning/repoinit.txt | 7 +++++
builder/src/main/provisioning/sling-rewriter.txt | 38 ------------------------
5 files changed, 14 insertions(+), 44 deletions(-)
diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index ce7725d..f928e47 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -48,9 +48,12 @@
org.apache.sling/org.apache.sling.cms.reference/${cms.version}
org.apache.sling/org.apache.sling.cms.transformer/${cms.version}
org.apache.sling/org.apache.sling.commons.crypto/1.0.0
+ org.apache.sling/org.apache.sling.commons.html/1.1.0
org.apache.sling/org.apache.sling.commons.messaging.mail/1.0.0
org.apache.sling/org.apache.sling.commons.messaging/1.0.0
+ org.apache.sling/org.apache.sling.rewriter/1.2.2
org.apache.tika/tika-bundle/1.22
+ org.codehaus.groovy/groovy-all/2.4.19
[:repoinit]
@@ -77,7 +80,6 @@
allow jcr:read on /etc/usergenerated
end
-
# Groups
create path (rep:AuthorizableFolder) /home/groups
create path (rep:AuthorizableFolder) /home/groups/sling-cms
diff --git a/builder/src/main/provisioning/composum.txt b/builder/src/main/provisioning/composum.txt
index 8e85e85..e33d9f5 100644
--- a/builder/src/main/provisioning/composum.txt
+++ b/builder/src/main/provisioning/composum.txt
@@ -20,7 +20,6 @@
composum.nodes.version=1.12.0
[artifacts startLevel=20]
- org.codehaus.groovy/groovy-all/2.4.19
com.composum.sling.core/composum-sling-core-commons/${composum.nodes.version}
com.composum.sling.core/composum-sling-core-console/${composum.nodes.version}
com.composum.sling.core/composum-sling-core-jslibs/${composum.nodes.version}
diff --git a/builder/src/main/provisioning/healthcheck.txt b/builder/src/main/provisioning/healthcheck.txt
index b487486..faecc88 100644
--- a/builder/src/main/provisioning/healthcheck.txt
+++ b/builder/src/main/provisioning/healthcheck.txt
@@ -20,10 +20,10 @@
# startlevel 5 together with jetty (to allow use during startup)
[artifacts startLevel=5]
- org.apache.felix/org.apache.felix.healthcheck.api/2.0.2
- org.apache.felix/org.apache.felix.healthcheck.core/2.0.6
- org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.4
- org.apache.felix/org.apache.felix.healthcheck.webconsoleplugin/2.0.0
+ org.apache.felix/org.apache.felix.healthcheck.api/2.0.4
+ org.apache.felix/org.apache.felix.healthcheck.core/2.0.8
+ org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.6
+ org.apache.felix/org.apache.felix.healthcheck.webconsoleplugin/2.0.2
# sling health check bundles at startlevel 20
[artifacts startLevel=20]
diff --git a/builder/src/main/provisioning/repoinit.txt b/builder/src/main/provisioning/repoinit.txt
index 2ffed83..2730768 100644
--- a/builder/src/main/provisioning/repoinit.txt
+++ b/builder/src/main/provisioning/repoinit.txt
@@ -71,6 +71,13 @@
allow rep:write on /apps/sling/install
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
[configurations]
org.apache.sling.jcr.repoinit.impl.RepositoryInitializer
references="model@repoinit:context:/resources/provisioning/model.txt"
diff --git a/builder/src/main/provisioning/sling-rewriter.txt b/builder/src/main/provisioning/sling-rewriter.txt
deleted file mode 100644
index 65ebf3d..0000000
--- a/builder/src/main/provisioning/sling-rewriter.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# 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.
-#
-#
-[feature name=sling-rewriter]
-
-[artifacts]
- org.apache.sling/org.apache.sling.commons.html/1.1.0
- org.apache.sling/org.apache.sling.rewriter/1.2.2
-
-[:repoinit]
- create service user sling-rewriter
-
- set ACL for sling-rewriter
- allow jcr:read on /
- end
-
-
-[configurations]
- org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-sling.rewriter
- user.mapping=[
- "org.apache.sling.rewriter\=sling-rewriter"
- ]
\ No newline at end of file