Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5280F200BE7 for ; Tue, 20 Dec 2016 12:15:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 512C4160B29; Tue, 20 Dec 2016 11:15:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 99C73160B1B for ; Tue, 20 Dec 2016 12:15:55 +0100 (CET) Received: (qmail 39439 invoked by uid 500); 20 Dec 2016 11:15:54 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 39430 invoked by uid 99); 20 Dec 2016 11:15:54 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2016 11:15:54 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 140933A0216 for ; Tue, 20 Dec 2016 11:15:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1775261 - in /sling/trunk/bundles/servlets/resolver/src: main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java Date: Tue, 20 Dec 2016 11:15:53 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161220111554.140933A0216@svn01-us-west.apache.org> archived-at: Tue, 20 Dec 2016 11:15:56 -0000 Author: cziegeler Date: Tue Dec 20 11:15:53 2016 New Revision: 1775261 URL: http://svn.apache.org/viewvc?rev=1775261&view=rev Log: SLING-5237 : Remove getAdministrativeResourceResolver() usage from org.apache.sling.servlets.resolver Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?rev=1775261&r1=1775260&r2=1775261&view=diff ============================================================================== --- sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java (original) +++ sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java Tue Dec 20 11:15:53 2016 @@ -139,9 +139,6 @@ public class SlingServletResolver @Property(value=DEFAULT_SERVLET_ROOT) public static final String PROP_SERVLET_ROOT = "servletresolver.servletRoot"; - @Property - public static final String PROP_SCRIPT_USER = "servletresolver.scriptUser"; - @Property(intValue=DEFAULT_CACHE_SIZE) public static final String PROP_CACHE_SIZE = "servletresolver.cacheSize"; @@ -771,16 +768,6 @@ public class SlingServletResolver } } - private Map createAuthenticationInfo(final Dictionary props) { - final Map authInfo = new HashMap(); - // if a script user is configured we use this user to read the scripts - final String scriptUser = PropertiesUtil.toString(props.get(PROP_SCRIPT_USER), null); - if (scriptUser != null && scriptUser.length() > 0) { - authInfo.put(ResourceResolverFactory.USER_IMPERSONATION, scriptUser); - } - return authInfo; - } - // ---------- SCR Integration ---------------------------------------------- /** @@ -802,7 +789,7 @@ public class SlingServletResolver pendingServlets.clear(); this.sharedScriptResolver = - resourceResolverFactory.getAdministrativeResourceResolver(this.createAuthenticationInfo(context.getProperties())); + resourceResolverFactory.getServiceResourceResolver(Collections.singletonMap(ResourceResolverFactory.SUBSERVICE, (Object)"scripts")); this.searchPaths = this.sharedScriptResolver.getSearchPath(); servletResourceProviderFactory = new ServletResourceProviderFactory(servletRoot, this.searchPaths); @@ -1177,7 +1164,7 @@ public class SlingServletResolver ResourceResolver resourceResolver = null; try { - resourceResolver = resourceResolverFactory.getAdministrativeResourceResolver(null); + resourceResolver = resourceResolverFactory.getServiceResourceResolver(Collections.singletonMap(ResourceResolverFactory.SUBSERVICE, (Object)"scripts")); final PrintWriter pw = response.getWriter(); Modified: sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java?rev=1775261&r1=1775260&r2=1775261&view=diff ============================================================================== --- sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java (original) +++ sling/trunk/bundles/servlets/resolver/src/test/java/org/apache/sling/servlets/resolver/internal/SlingServletResolverTest.java Tue Dec 20 11:15:53 2016 @@ -121,8 +121,7 @@ public class SlingServletResolverTest { @Override public ResourceResolver getServiceResourceResolver(Map authenticationInfo) throws LoginException { - // TODO Auto-generated method stub - return null; + return mockResourceResolver; } @Override