[sling-org-apache-sling-jcr-contentloader] branch master updated: SLING-10015 Use ServiceUserMapped to ensure presence of service user mapping

[enorman]

This is an automated email from the ASF dual-hosted git repository.

enorman pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git


The following commit(s) were added to refs/heads/master by this push:
     new 235a16e  SLING-10015 Use ServiceUserMapped to ensure presence of 
service user mapping
235a16e is described below

commit 235a16eaa8cb6ed0fde56b1966e6506d1edae46f
Author: Eric Norman <enor...@apache.org>
AuthorDate: Sun Dec 20 19:48:12 2020 -0800

    SLING-10015 Use ServiceUserMapped to ensure presence of service user
    mapping
---
 pom.xml                                                            | 6 ++++++
 .../sling/jcr/contentloader/hc/BundleContentLoadedCheck.java       | 7 +++++++
 .../jcr/contentloader/internal/BundleContentLoaderListener.java    | 7 +++++++
 3 files changed, 20 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8cf6a7e..da1ecde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,6 +143,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.serviceusermapper</artifactId>
+            <version>1.3.4</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.api</artifactId>
             <version>2.3.0</version>
             <scope>provided</scope>
diff --git 
a/src/main/java/org/apache/sling/jcr/contentloader/hc/BundleContentLoadedCheck.java
 
b/src/main/java/org/apache/sling/jcr/contentloader/hc/BundleContentLoadedCheck.java
index b16af0a..10a3692 100644
--- 
a/src/main/java/org/apache/sling/jcr/contentloader/hc/BundleContentLoadedCheck.java
+++ 
b/src/main/java/org/apache/sling/jcr/contentloader/hc/BundleContentLoadedCheck.java
@@ -33,6 +33,7 @@ import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.contentloader.internal.BundleHelper;
 import org.apache.sling.jcr.contentloader.internal.BundleContentLoaderListener;
 import org.apache.sling.jcr.contentloader.internal.PathEntry;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
@@ -86,6 +87,12 @@ public class BundleContentLoadedCheck implements HealthCheck 
{
     boolean useCriticalForNotLoaded;
 
     /**
+     * SLING-10015 - To require a service user before becoming active
+     */
+    @Reference
+    private ServiceUserMapped serviceUserMapped;
+
+    /**
      * The JCR Repository we access to resolve resources
      */
     @Reference
diff --git 
a/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderListener.java
 
b/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderListener.java
index b671133..4cc37cb 100644
--- 
a/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderListener.java
+++ 
b/src/main/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderListener.java
@@ -35,6 +35,7 @@ import javax.jcr.lock.LockManager;
 
 import org.apache.sling.commons.mime.MimeTypeService;
 import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.apache.sling.settings.SlingSettingsService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
@@ -77,6 +78,12 @@ public class BundleContentLoaderListener implements 
SynchronousBundleListener, B
     final Logger log = LoggerFactory.getLogger(getClass());
 
     /**
+     * SLING-10015 - To require a service user before becoming active
+     */
+    @Reference
+    private ServiceUserMapped serviceUserMapped;
+
+    /**
      * The JCR Repository we access to resolve resources
      */
     @Reference