You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2017/04/26 13:58:57 UTC

svn commit: r1792747 - in /sling/trunk/launchpad/builder/src/main/provisioning: scripting.txt sling.txt

Author: kwin
Date: Wed Apr 26 13:58:56 2017
New Revision: 1792747

URL: http://svn.apache.org/viewvc?rev=1792747&view=rev
Log:
SLING-6791 consolidate user mapping for servlet resolver

Modified:
    sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt
    sling/trunk/launchpad/builder/src/main/provisioning/sling.txt

Modified: 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=1792747&r1=1792746&r2=1792747&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/scripting.txt Wed Apr 26 13:58:56 2017
@@ -58,5 +58,4 @@
         user.mapping=[
             "org.apache.sling.scripting.core\=sling-scripting",
             "org.apache.sling.scripting.sightly.js.provider\=sling-scripting",
-            "org.apache.sling.servlets.resolver:scripts\=sling-scripting"
         ]

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=1792747&r1=1792746&r2=1792747&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Wed Apr 26 13:58:56 2017
@@ -183,9 +183,11 @@
       "org.apache.sling.resourceresolver:console\=sling-readall"
     ]
 
+  # the user mapping for the servlet resolver, subservice "console" namely the user sling-scripting is created in scripting.txt
   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.serviceusermapping.impl.ServiceUserMapperImpl.amended-observation