svn commit: r1792750 - in /sling/trunk/bundles/servlets/resolver: pom.xml src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java

[kwin]

Author: kwin
Date: Wed Apr 26 14:28:14 2017
New Revision: 1792750

URL: http://svn.apache.org/viewvc?rev=1792750&view=rev
Log:
SLING-6798 defer starting until the service user mapping is available

Modified:
    sling/trunk/bundles/servlets/resolver/pom.xml
    
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java

Modified: sling/trunk/bundles/servlets/resolver/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/pom.xml?rev=1792750&r1=1792749&r2=1792750&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/resolver/pom.xml (original)
+++ sling/trunk/bundles/servlets/resolver/pom.xml Wed Apr 26 14:28:14 2017
@@ -89,6 +89,13 @@
             <version>2.16.2</version>
             <scope>provided</scope>
         </dependency>
+        <!-- for ServiceUserMapped (SLING-4312) -->
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.serviceusermapper</artifactId>
+            <version>1.2.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.event</artifactId>

Modified: 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?rev=1792750&r1=1792749&r2=1792750&view=diff
==============================================================================
--- 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
 (original)
+++ 
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
 Wed Apr 26 14:28:14 2017
@@ -78,6 +78,7 @@ import org.apache.sling.api.servlets.Opt
 import org.apache.sling.api.servlets.ServletResolver;
 import org.apache.sling.api.servlets.ServletResolverConstants;
 import org.apache.sling.engine.servlets.ErrorHandler;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import 
org.apache.sling.servlets.resolver.internal.defaults.DefaultErrorHandlerServlet;
 import org.apache.sling.servlets.resolver.internal.defaults.DefaultServlet;
 import 
org.apache.sling.servlets.resolver.internal.helper.AbstractResourceCollector;
@@ -180,6 +181,12 @@ public class SlingServletResolver
     @Reference
     private ResourceResolverFactory resourceResolverFactory;
 
+    @Reference(target="(subServiceName=scripts)")
+    private ServiceUserMapped scriptServiceUserMapped;
+
+    @Reference(target="(subServiceName=console)")
+    private ServiceUserMapped consoleServiceUserMapped;
+
     private ResourceResolver sharedScriptResolver;
 
     private final Map<ServiceReference<Servlet>, ServletReg> 
servletsByReference = new HashMap<>();