You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/01/28 08:22:42 UTC
svn commit: r1780636 - in /sling/trunk/bundles/extensions/i18n: pom.xml
src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
Author: olli
Date: Sat Jan 28 08:22:42 2017
New Revision: 1780636
URL: http://svn.apache.org/viewvc?rev=1780636&view=rev
Log:
SLING-6495 Use ServiceUserMapped to ensure presence of service user mapping
Modified:
sling/trunk/bundles/extensions/i18n/pom.xml
sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
Modified: sling/trunk/bundles/extensions/i18n/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/pom.xml?rev=1780636&r1=1780635&r2=1780636&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/i18n/pom.xml (original)
+++ sling/trunk/bundles/extensions/i18n/pom.xml Sat Jan 28 08:22:42 2017
@@ -221,6 +221,12 @@
<version>2.4.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>javax.jcr</groupId>
Modified: sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java?rev=1780636&r1=1780635&r2=1780636&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java (original)
+++ sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundleProvider.java Sat Jan 28 08:22:42 2017
@@ -55,6 +55,7 @@ import org.apache.sling.commons.osgi.Pro
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.i18n.ResourceBundleProvider;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
@@ -96,6 +97,9 @@ public class JcrResourceBundleProvider i
@Reference
private ResourceResolverFactory resourceResolverFactory;
+ @Reference
+ private ServiceUserMapped serviceUserMapped;
+
/**
* The default Locale as configured with the <i>locale.default</i>
* configuration property. This defaults to <code>Locale.ENGLISH</code> if