svn commit: r1775286 - in /sling/trunk/contrib/extensions/tenant: pom.xml src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java

[tmaret]

Author: tmaret
Date: Tue Dec 20 12:41:50 2016
New Revision: 1775286

URL: http://svn.apache.org/viewvc?rev=1775286&view=rev
Log:
SLING-5240 - Remove getAdministrativeResourceResolver() usage from 
org.apache.sling.tenant

* Applying Carsten Ziegeler's patch, thanks!

Modified:
    sling/trunk/contrib/extensions/tenant/pom.xml
    
sling/trunk/contrib/extensions/tenant/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
    
sling/trunk/contrib/extensions/tenant/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java

Modified: sling/trunk/contrib/extensions/tenant/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tenant/pom.xml?rev=1775286&r1=1775285&r2=1775286&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/tenant/pom.xml (original)
+++ sling/trunk/contrib/extensions/tenant/pom.xml Tue Dec 20 12:41:50 2016
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.3.0</version>
+            <version>2.5.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: 
sling/trunk/contrib/extensions/tenant/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tenant/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java?rev=1775286&r1=1775285&r2=1775286&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/tenant/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
 (original)
+++ 
sling/trunk/contrib/extensions/tenant/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java
 Tue Dec 20 12:41:50 2016
@@ -422,7 +422,7 @@ public class TenantProviderImpl implemen
         T result = null;
 
         try {
-            resolver = factory.getAdministrativeResourceResolver(null);
+            resolver = factory.getServiceResourceResolver(null);
             result = task.call(resolver);
         } catch (LoginException le) {
             // unexpected, thus ignore

Modified: 
sling/trunk/contrib/extensions/tenant/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/tenant/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java?rev=1775286&r1=1775285&r2=1775286&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/tenant/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/tenant/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java
 Tue Dec 20 12:41:50 2016
@@ -38,7 +38,7 @@ public class TenantProviderImplTest {
         final ResourceResolverFactory rrf = 
Mockito.mock(ResourceResolverFactory.class);
         final BundleContext context = Mockito.mock(BundleContext.class);
         final ResourceResolver rr = Mockito.mock(ResourceResolver.class);
-        Mockito.when(rrf.getAdministrativeResourceResolver(
+        Mockito.when(rrf.getServiceResourceResolver(
                 Mockito.anyMapOf(String.class, Object.class))).thenReturn(rr);
         set(provider, "factory", rrf);
         provider.activate(context, new HashMap<String, Object>());