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 2015/06/01 23:05:17 UTC

svn commit: r1683004 - in /sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling: ResourceResolverType.java context/ContextResourceResolverFactory.java

Author: sseifert
Date: Mon Jun  1 21:05:16 2015
New Revision: 1683004

URL: http://svn.apache.org/r1683004
Log:
SLING-4605 javadoc updates and add initializing for ContextResourceResolverFactory

Modified:
    sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
    sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java

Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java?rev=1683004&r1=1683003&r2=1683004&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverType.java Mon Jun  1 21:05:16 2015
@@ -75,9 +75,7 @@ public enum ResourceResolverType {
      * <li>The JCR repository is started on first access, this may take some
      * seconds.</li>
      * <li>The <tt>MemoryNodeStore</tt> implementation is used, with no 
-     * customisations</li>
-     * <li>Beware: The repository is not cleared for each unit test, so make
-     * sure us use a unique node path for each unit test.</li>
+     * customizations.</li>
      * </ul>
      */
     JCR_OAK("org.apache.sling.testing.mock.sling.oak.OakMockResourceResolverAdapter",

Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java?rev=1683004&r1=1683003&r2=1683004&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/ContextResourceResolverFactory.java Mon Jun  1 21:05:16 2015
@@ -54,6 +54,9 @@ final class ContextResourceResolverFacto
             case JCR_JACKRABBIT:
                 initializeJcrJackrabbit(factory);
                 break;
+            case JCR_OAK:
+                initializeJcrOak(factory);
+                break;
             case RESOURCERESOLVER_MOCK:
                 initializeResourceResolverMock(factory);
                 break;
@@ -83,6 +86,10 @@ final class ContextResourceResolverFacto
         // register sling node types?
     }
 
+    private static void initializeJcrOak(ResourceResolverFactory factory) {
+        // register sling node types?
+    }
+
     private static void initializeResourceResolverMock(ResourceResolverFactory factory) {
         // nothing to do
     }