svn commit: r1784473 - in /sling/trunk/bundles/extensions/validation/core: ./ src/main/java/org/apache/sling/validation/impl/ src/main/java/org/apache/sling/validation/impl/resourcemodel/

[olli]

Author: olli
Date: Sun Feb 26 19:10:50 2017
New Revision: 1784473

URL: http://svn.apache.org/viewvc?rev=1784473&view=rev
Log:
SLING-6562 Remove getAdministrativeResourceResolver from Sling Validation

ensure service user mapping is present when using service resource resolver

Modified:
    sling/trunk/bundles/extensions/validation/core/pom.xml
    
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java
    
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java

Modified: sling/trunk/bundles/extensions/validation/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/pom.xml?rev=1784473&r1=1784472&r2=1784473&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/pom.xml (original)
+++ sling/trunk/bundles/extensions/validation/core/pom.xml Sun Feb 26 19:10:50 
2017
@@ -128,6 +128,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.serviceusermapper</artifactId>
+            <version>1.2.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>provided</scope>

Modified: 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java?rev=1784473&r1=1784472&r2=1784473&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationModelRetrieverImpl.java
 Sun Feb 26 19:10:50 2017
@@ -30,6 +30,7 @@ import org.apache.sling.api.resource.Log
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.commons.osgi.RankedServices;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.apache.sling.validation.impl.model.MergedValidationModel;
 import org.apache.sling.validation.impl.util.Trie;
 import org.apache.sling.validation.model.ValidationModel;
@@ -72,6 +73,9 @@ public class ValidationModelRetrieverImp
     @Reference
     private ResourceResolverFactory resourceResolverFactory;
 
+    @Reference
+    private ServiceUserMapped serviceUserMapped;
+
     private static final Logger LOG = 
LoggerFactory.getLogger(ValidationModelRetrieverImpl.class);
 
     /*

Modified: 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java?rev=1784473&r1=1784472&r2=1784473&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java
 Sun Feb 26 19:10:50 2017
@@ -38,6 +38,7 @@ import org.apache.sling.api.resource.Val
 import org.apache.sling.commons.osgi.PropertiesUtil;
 import org.apache.sling.commons.threads.ThreadPool;
 import org.apache.sling.commons.threads.ThreadPoolManager;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.apache.sling.validation.impl.model.ChildResourceImpl;
 import org.apache.sling.validation.impl.model.ParameterizedValidatorImpl;
 import org.apache.sling.validation.impl.model.ResourcePropertyImpl;
@@ -98,6 +99,9 @@ public class ResourceValidationModelProv
 
     private ServiceRegistration eventHandlerRegistration;
 
+    @Reference
+    private ServiceUserMapped serviceUserMapped;
+
     @Activate
     protected void activate(ComponentContext componentContext) throws 
LoginException {
         threadPool = tpm.get("Validation Service Thread Pool");