Author: olli
Date: Sat Jan 28 08:23:58 2017
New Revision: 1780638
URL: http://svn.apache.org/viewvc?rev=1780638&view=rev
Log:
SLING-6497 Use ServiceUserMapped to ensure presence of service user mapping
Modified:
sling/trunk/bundles/extensions/dea/pom.xml
sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java
Modified: sling/trunk/bundles/extensions/dea/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea/pom.xml?rev=1780638&r1=1780637&r2=1780638&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/dea/pom.xml (original)
+++ sling/trunk/bundles/extensions/dea/pom.xml Sat Jan 28 08:23:58 2017
@@ -99,6 +99,12 @@
<version>2.11.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>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
Modified:
sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java?rev=1780638&r1=1780637&r2=1780638&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java
(original)
+++
sling/trunk/bundles/extensions/dea/src/main/java/org/apache/sling/event/dea/impl/DistributedEventAdminImpl.java
Sat Jan 28 08:23:58 2017
@@ -19,6 +19,7 @@
package org.apache.sling.event.dea.impl;
import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
@@ -55,6 +56,9 @@ public class DistributedEventAdminImpl {
@Reference
private EventAdmin eventAdmin;
+ @Reference
+ private ServiceUserMapped serviceUserMapped;
+
/** Default repository path. */
public static final String DEFAULT_REPOSITORY_PATH =
"/var/eventing/distribution";