Author: olli
Date: Sat Jan 28 08:21:53 2017
New Revision: 1780635
URL: http://svn.apache.org/viewvc?rev=1780635&view=rev
Log:
SLING-6494 Use ServiceUserMapped to ensure presence of service user mapping
Modified:
sling/trunk/installer/providers/jcr/pom.xml
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
Modified: sling/trunk/installer/providers/jcr/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/pom.xml?rev=1780635&r1=1780634&r2=1780635&view=diff
==============================================================================
--- sling/trunk/installer/providers/jcr/pom.xml (original)
+++ sling/trunk/installer/providers/jcr/pom.xml Sat Jan 28 08:21:53 2017
@@ -119,6 +119,12 @@
<version>2.1.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.serviceusermapper</artifactId>
+ <version>1.2.0</version>
+ <scope>provided</scope>
+ </dependency>
<!-- We use a class from the config admin implementation to read config
files -->
<dependency>
<groupId>org.apache.felix</groupId>
Modified:
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java?rev=1780635&r1=1780634&r2=1780635&view=diff
==============================================================================
---
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
(original)
+++
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
Sat Jan 28 08:21:53 2017
@@ -53,6 +53,7 @@ import org.apache.sling.installer.api.Os
import org.apache.sling.installer.api.UpdateHandler;
import org.apache.sling.installer.api.UpdateResult;
import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
@@ -163,6 +164,9 @@ public class JcrInstaller implements Upd
@Reference
private OsgiInstaller installer;
+ @Reference
+ private ServiceUserMapped serviceUserMapped;
+
/** The component context. */
private volatile ComponentContext componentContext;
