This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tenant.git
commit 13f756a89d38e0692da44d07073acc08d03b1b90 Author: Timothée Maret <[email protected]> AuthorDate: Tue Dec 20 12:41:50 2016 +0000 SLING-5240 - Remove getAdministrativeResourceResolver() usage from org.apache.sling.tenant * Applying Carsten Ziegeler's patch, thanks! git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1775286 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java | 2 +- .../java/org/apache/sling/tenant/internal/TenantProviderImplTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 12aaba9..3ada5d3 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java b/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java index ad9ad82..a70c137 100644 --- a/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java +++ b/src/main/java/org/apache/sling/tenant/internal/TenantProviderImpl.java @@ -422,7 +422,7 @@ public class TenantProviderImpl implements TenantProvider, TenantManager { T result = null; try { - resolver = factory.getAdministrativeResourceResolver(null); + resolver = factory.getServiceResourceResolver(null); result = task.call(resolver); } catch (LoginException le) { // unexpected, thus ignore diff --git a/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java b/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java index 495d103..c3ff612 100644 --- a/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java +++ b/src/test/java/org/apache/sling/tenant/internal/TenantProviderImplTest.java @@ -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>()); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
