You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2014/12/09 14:14:58 UTC

svn commit: r1644043 - in /sling/trunk/testing/mocks: sling-mock-jackrabbit/pom.xml sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java

Author: sseifert
Date: Tue Dec  9 13:14:58 2014
New Revision: 1644043

URL: http://svn.apache.org/r1644043
Log:
SLING-4108 default to getAdministrativeResourceResolver in sling-mock to support jackrabbit resource resolver adapter as well

Modified:
    sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
    sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java

Modified: sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml?rev=1644043&r1=1644042&r2=1644043&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml Tue Dec  9 13:14:58 2014
@@ -49,14 +49,14 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1-SNAPSHOT</version>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java?rev=1644043&r1=1644042&r2=1644043&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java Tue Dec  9 13:14:58 2014
@@ -109,7 +109,7 @@ public final class MockSling {
     public static ResourceResolver newResourceResolver(final ResourceResolverType type) {
         ResourceResolverFactory factory = newResourceResolverFactory(type);
         try {
-            return factory.getResourceResolver(null);
+            return factory.getAdministrativeResourceResolver(null);
         } catch (LoginException ex) {
             throw new RuntimeException("Mock resource resolver factory implementation seems to require login.", ex);
         }