Author: radu
Date: Tue Oct 4 15:06:52 2016
New Revision: 1763287
URL: http://svn.apache.org/viewvc?rev=1763287&view=rev
Log:
SLING-6096 - Extract Sling scripting specific provisioning model configurations
into a separate file
Added:
sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt
Modified:
sling/trunk/launchpad/builder/src/main/provisioning/repoinit.txt
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Modified: sling/trunk/launchpad/builder/src/main/provisioning/repoinit.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/repoinit.txt?rev=1763287&r1=1763286&r2=1763287&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/repoinit.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/repoinit.txt Tue Oct 4
15:06:52 2016
@@ -22,13 +22,3 @@
org.apache.sling/org.apache.sling.repoinit.parser/1.0.4
org.apache.sling/org.apache.sling.jcr.repoinit/1.0.2
org.apache.sling/org.apache.sling.provisioning.model/1.4.4
-
-[:repoinit]
-create path (sling:Folder) /libs
-create path (sling:Folder) /apps
-create service user sling-scripting
-
-set ACL for sling-scripting
- deny jcr:all on /libs,/apps
- allow jcr:read on /libs,/apps
-end
Added: sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt?rev=1763287&view=auto
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt (added)
+++ sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt Tue Oct
4 15:06:52 2016
@@ -0,0 +1,49 @@
+#
+# 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]
+
+[artifacts]
+ org.apache.sling/org.apache.sling.scripting.api/2.1.8
+ org.apache.sling/org.apache.sling.scripting.core/2.0.38
+ org.apache.sling/org.apache.sling.scripting.javascript/2.0.30
+ org.apache.sling/org.apache.sling.scripting.jsp/2.1.8
+ org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.6
+ org.apache.sling/org.apache.sling.scripting.sightly/1.0.18
+ org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.10
+ org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.0
+ org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.2
+
+[:repoinit]
+ #<<< SLING-5848 - Define service user and ACLs for Scripting
+ create path (sling:Folder) /libs
+ create path (sling:Folder) /apps
+ create service user sling-scripting
+
+ set ACL for sling-scripting
+ deny jcr:all on /libs,/apps
+ allow jcr:read on /libs,/apps
+ end
+ # SLING-5848 - Define service user and ACLs for Scripting >>>
+
+
+[configurations]
+ # configure the ScriptCache for scripts used by
org.apache.sling.scripting.sightly.js.provider
+ org.apache.sling.scripting.core.impl.ScriptCacheImpl
+ org.apache.sling.scripting.cache.additional_extensions=["js"]
Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1763287&r1=1763286&r2=1763287&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Tue Oct 4
15:06:52 2016
@@ -65,15 +65,6 @@
org.apache.sling/org.apache.sling.models.api/1.2.2
org.apache.sling/org.apache.sling.models.impl/1.2.8
org.apache.sling/org.apache.sling.resourceresolver/1.4.18
- org.apache.sling/org.apache.sling.scripting.api/2.1.8
- org.apache.sling/org.apache.sling.scripting.core/2.0.38
- org.apache.sling/org.apache.sling.scripting.javascript/2.0.30
- org.apache.sling/org.apache.sling.scripting.jsp/2.1.8
- org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.6
- org.apache.sling/org.apache.sling.scripting.sightly/1.0.18
- org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.10
- org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.0
- org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.2
org.apache.sling/org.apache.sling.serviceusermapper/1.2.2
org.apache.sling/org.apache.sling.servlets.get/2.1.18
org.apache.sling/org.apache.sling.servlets.post/2.3.14
@@ -160,10 +151,6 @@
org.apache.sling.commons.log.file="logs/request.log"
org.apache.sling.commons.log.level="info"
- # configure the ScriptCache for scripts used by
org.apache.sling.scripting.sightly.js.provider
- org.apache.sling.scripting.core.impl.ScriptCacheImpl
- org.apache.sling.scripting.cache.additional_extensions=["js"]
-
# WebDAV servlet requires config now
org.apache.sling.jcr.webdav.impl.servlets.SimpleWebDavServlet
dav.root="/dav"
