jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1342597 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/ oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/ oak-core/src/test/java/org/apache/jackrabbit/mk/ oak-core/src/test/java/org/apache/j...
Date Fri, 25 May 2012 12:38:48 GMT
Author: stefan
Date: Fri May 25 12:38:46 2012
New Revision: 1342597

URL: http://svn.apache.org/viewvc?rev=1342597&view=rev
Log:
OAK-113: drop MicroKernel getNodes(String, String) convenience signature

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/PropertyContentIndex.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/MultiMkTestBase.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeCreator.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/MoveNodeIT.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
    jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/client/Client.java
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java
    jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java
    jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java
Fri May 25 12:38:46 2012
@@ -115,19 +115,6 @@ public class LogWrapper implements Micro
     }
 
     @Override
-    public String getNodes(String path, String revisionId) {
-        try {
-            logMethod("getNodes", path, revisionId);
-            String result = mk.getNodes(path, revisionId);
-            logResult(result);
-            return result;
-        } catch (Exception e) {
-            logException(e);
-            throw convert(e);
-        }
-    }
-
-    @Override
     public String getNodes(String path, String revisionId, int depth, long offset, int count,
String filter) {
         try {
             logMethod("getNodes", path, revisionId, depth, offset, count, filter);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/MicroKernelWrapperBase.java
Fri May 25 12:38:46 2012
@@ -39,16 +39,6 @@ public abstract class MicroKernelWrapper
     }
 
     @Override
-    public final String getNodes(String path, String revisionId) {
-        JsopReader reader = getNodesStream(path, revisionId);
-        if (reader != null) {
-            return reader.toString();
-        } else {
-            return null;
-        }
-    }
-
-    @Override
     public final String getNodes(String path, String revisionId, int depth, long offset,
int count, String filter) {
         JsopReader reader =
                 getNodesStream(path, revisionId, depth, offset, count, filter);
@@ -96,7 +86,7 @@ public abstract class MicroKernelWrapper
 
             @Override
             public JsopReader getNodesStream(String path, String revisionId) {
-                String json = wrapped.getNodes(path, revisionId);
+                String json = wrapped.getNodes(path, revisionId, 1, 0, -1, null);
                 if (json != null) {
                     return new JsopTokenizer(json);
                 } else {
@@ -166,11 +156,6 @@ public abstract class MicroKernelWrapper
             }
 
             @Override
-            public String getNodes(String path, String revisionId) {
-                return wrapped.getNodes(path, revisionId);
-            }
-
-            @Override
             public String getNodes(String path, String revisionId, int depth, long offset,
int count, String filter) {
                 return wrapped.getNodes(path, revisionId, depth, offset, count, filter);
             }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java
Fri May 25 12:38:46 2012
@@ -62,7 +62,7 @@ public class SecurityWrapper extends Mic
         this.mk = MicroKernelWrapperBase.wrap(mk);
         // TODO security for the index mechanism
 
-        String role = mk.getNodes("/:user/" + user, mk.getHeadRevision());
+        String role = mk.getNodes("/:user/" + user, mk.getHeadRevision(), 1, 0, -1, null);
         NodeMap map = new NodeMap();
         JsopReader t = new JsopTokenizer(role);
         t.read('{');

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java
Fri May 25 12:38:46 2012
@@ -78,7 +78,7 @@ public class VirtualRepositoryWrapper ex
 
         String head = mk.getHeadRevision();
         if (mk.nodeExists(MOUNT, head)) {
-            String mounts = mk.getNodes(MOUNT, head);
+            String mounts = mk.getNodes(MOUNT, head, 1, 0, -1, null);
             NodeMap map = new NodeMap();
             JsopReader t = new JsopTokenizer(mounts);
             t.read('{');

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/PropertyContentIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/PropertyContentIndex.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/PropertyContentIndex.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/PropertyContentIndex.java
Fri May 25 12:38:46 2012
@@ -106,7 +106,7 @@ public class PropertyContentIndex implem
                 if (currentPath == null) {
                     return null;
                 }
-                currentNode = NodeImpl.parse(mk.getNodes(currentPath, revisionId));
+                currentNode = NodeImpl.parse(mk.getNodes(currentPath, revisionId, 1, 0, -1,
null));
                 currentNode.setPath(currentPath);
             }
             return currentNode;

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java
Fri May 25 12:38:46 2012
@@ -59,7 +59,7 @@ public class TraversingCursor implements
             if (currentPath == null) {
                 return null;
             }
-            String s = mk.getNodes(currentPath, revisionId);
+            String s = mk.getNodes(currentPath, revisionId, 1, 0, -1, null);
             if (s == null) {
                 return null;
             }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/MultiMkTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/MultiMkTestBase.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/MultiMkTestBase.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/MultiMkTestBase.java
Fri May 25 12:38:46 2012
@@ -58,7 +58,7 @@ public class MultiMkTestBase {
         mk = MicroKernelFactory.getInstance(url + ";clean");
         cleanRepository(mk);
 
-        String root = mk.getNodes("/", mk.getHeadRevision());
+        String root = mk.getNodes("/", mk.getHeadRevision(), 1, 0, -1, null);
         NodeImpl rootNode = NodeImpl.parse(root);
         if (rootNode.getPropertyCount() > 0) {
             System.out.println("Last mk not disposed: " + root);

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/hash/HashTest.java
Fri May 25 12:38:46 2012
@@ -61,10 +61,10 @@ public class HashTest extends MultiMkTes
 
         head = mk.commit("/", "+ \"test1\": { \"id\": 1 }", mk.getHeadRevision(), "");
         head = mk.commit("/", "+ \"test2\": { \"id\": 1 }", mk.getHeadRevision(), "");
-        NodeImpl r = NodeImpl.parse(mk.getNodes("/", head));
+        NodeImpl r = NodeImpl.parse(mk.getNodes("/", head, 1, 0, -1, null));
         assertTrue(r.getHash() != null);
-        NodeImpl t1 = NodeImpl.parse(mk.getNodes("/test1", head));
-        NodeImpl t2 = NodeImpl.parse(mk.getNodes("/test2", head));
+        NodeImpl t1 = NodeImpl.parse(mk.getNodes("/test1", head, 1, 0, -1, null));
+        NodeImpl t2 = NodeImpl.parse(mk.getNodes("/test2", head, 1, 0, -1, null));
         assertTrue(Arrays.equals(t1.getHash(), t2.getHash()));
         assertFalse(Arrays.equals(t1.getHash(), r.getHash()));
     }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java
Fri May 25 12:38:46 2012
@@ -37,7 +37,7 @@ public class PrefixIndexTest {
         String head = mk.getHeadRevision();
 
         // meta data
-        String meta = mk.getNodes("/index", head);
+        String meta = mk.getNodes("/index", head, 1, 0, -1, null);
         Assert.assertEquals("{\":childNodeCount\":1,\"prefix:d:\":{\":childNodeCount\":0}}",
meta);
 
         Assert.assertEquals("", getPathList(index, "d:1", head));

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java
Fri May 25 12:38:46 2012
@@ -36,7 +36,7 @@ public class PropertyIndexTest {
         String head = mk.getHeadRevision();
 
         // meta data
-        String meta = mk.getNodes("/index", head);
+        String meta = mk.getNodes("/index", head, 1, 0, -1, null);
         Assert.assertEquals("{\":childNodeCount\":1,\"id:id\":{\":childNodeCount\":0}}",
meta);
 
         String oldHead = head;

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/LargeNodeTest.java
Fri May 25 12:38:46 2012
@@ -57,7 +57,7 @@ public class LargeNodeTest extends Multi
     @Test
     public void getNodes() {
         head = mk.commit("/", "+\"x0\" : {\"x\": 0, \"x1\":{\"x\":1, \"x2\": {\"x\": -3}}}",
head, null);
-        String s = mk.getNodes("/x0", head);
+        String s = mk.getNodes("/x0", head, 1, 0, -1, null);
         Assert.assertEquals("{\"x\":0,\":childNodeCount\":1,\"x1\":{\"x\":1,\":childNodeCount\":1,\"x2\":{}}}",
s);
         s = mk.getNodes("/x0", head, 1, 0, -1, null);
         Assert.assertEquals("{\"x\":0,\":childNodeCount\":1,\"x1\":{\"x\":1,\":childNodeCount\":1,\"x2\":{}}}",
s);
@@ -75,13 +75,13 @@ public class LargeNodeTest extends Multi
         }
         int max = 90;
         head = mk.commit("/:root/head/config", "^ \"maxMemoryChildren\":" + max, head, "");
-        Assert.assertEquals("{\"maxMemoryChildren\":"+max+",\":childNodeCount\":0}", mk.getNodes("/:root/head/config",
head));
+        Assert.assertEquals("{\"maxMemoryChildren\":"+max+",\":childNodeCount\":0}", mk.getNodes("/:root/head/config",
head, 1, 0, -1, null));
         head = mk.commit("/", "+ \"test\": {}", head, "");
         for (int i = 0; i < 100; i++) {
             head = mk.commit("/", "+ \"test/" + i + "\": {\"x\":" + i + "}\n", head, "");
         }
         Assert.assertTrue(mk.nodeExists("/test", head));
-        mk.getNodes("/test", head);
+        mk.getNodes("/test", head, 1, 0, -1, null);
     }
 
     @Test
@@ -89,7 +89,7 @@ public class LargeNodeTest extends Multi
         if (isSimpleKernel(mk)) {
             int max = 2000;
             head = mk.commit("/:root/head/config", "^ \"maxMemoryChildren\":" + max, head,
"");
-            Assert.assertEquals("{\"maxMemoryChildren\":"+max+",\":childNodeCount\":0}",
mk.getNodes("/:root/head/config", head));
+            Assert.assertEquals("{\"maxMemoryChildren\":"+max+",\":childNodeCount\":0}",
mk.getNodes("/:root/head/config", head, 1, 0, -1, null));
         }
         head = mk.commit("/", "+ \"test\": {}", head, "");
 
@@ -126,7 +126,7 @@ public class LargeNodeTest extends Multi
         }
 
         head = mk.commit("/:root/head/config", "^ \"maxMemoryChildren\": 10", head, "");
-        Assert.assertEquals("{\"maxMemoryChildren\":10,\":childNodeCount\":0}", mk.getNodes("/:root/head/config",
head));
+        Assert.assertEquals("{\"maxMemoryChildren\":10,\":childNodeCount\":0}", mk.getNodes("/:root/head/config",
head, 1, 0, -1, null));
         for (int i = 0; i < 100; i++) {
             head = mk.commit("/", "+ \"t" + i + "\": {\"x\":" + i + "}", head, "");
         }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/ManyRevisionsTest.java
Fri May 25 12:38:46 2012
@@ -58,7 +58,7 @@ public class ManyRevisionsTest extends M
         int i = 0;
         String last = first;
         for (String rev : revs) {
-            String n = mk.getNodes("/test", rev);
+            String n = mk.getNodes("/test", rev, 1, 0, -1, null);
             NodeImpl node = NodeImpl.parse(n);
             assertEquals(i, Integer.parseInt(node.getProperty("id")));
             String journal = mk.getJournal(last, rev, null);

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeCreator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeCreator.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeCreator.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeCreator.java
Fri May 25 12:38:46 2012
@@ -109,7 +109,7 @@ public class NodeCreator {
             if (!mk.nodeExists("/" + p, head)) {
                 break;
             }
-            mk.getNodes("/" + p, head);
+            mk.getNodes("/" + p, head, 1, 0, -1, null);
             count++;
             if (depth > 0) {
                 traverse(p, depth - 1);

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/MoveNodeIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/MoveNodeIT.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/MoveNodeIT.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/MoveNodeIT.java
Fri May 25 12:38:46 2012
@@ -246,7 +246,7 @@ public class MoveNodeIT {
     }
 
     private String getNode(String node) {
-        String s = mk.getNodes(node, mk.getHeadRevision());
+        String s = mk.getNodes(node, mk.getHeadRevision(), 1, 0, -1, null);
         s = s.replaceAll("\"", "").replaceAll(":childNodeCount:.", "");
         s = s.replaceAll("\\{\\,", "\\{").replaceAll("\\,\\}", "\\}");
         s = s.replaceAll("\\:\\{\\}", "");

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java
Fri May 25 12:38:46 2012
@@ -37,7 +37,7 @@ public class NodeVersionTest {
         head = mk.commit("/", "+ \"test1\": { \"id\": 1 }", head, "");
         head = mk.commit("/", "+ \"test2\": { \"id\": 1 }", head, "");
 
-        NodeImpl n = NodeImpl.parse(mk.getNodes("/", head));
+        NodeImpl n = NodeImpl.parse(mk.getNodes("/", head, 1, 0, -1, null));
         String vra = n.getNodeVersion();
         String v1a = n.getNode("test1").getNodeVersion();
         String v2a = n.getNode("test2").getNodeVersion();
@@ -45,7 +45,7 @@ public class NodeVersionTest {
         // changes the node version
         head = mk.commit("/", "^ \"test2/id\": 2", head, "");
 
-        n = NodeImpl.parse(mk.getNodes("/", head));
+        n = NodeImpl.parse(mk.getNodes("/", head, 1, 0, -1, null));
         String vrb = n.getNodeVersion();
         String v1b = n.getNode("test1").getNodeVersion();
         String v2b = n.getNode("test2").getNodeVersion();

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java
Fri May 25 12:38:46 2012
@@ -36,8 +36,8 @@ public class IndexWrapperTest {
 
     @Test
     public void getNodes() {
-        assertNull(mk.getNodes("/jcr:system/indexes/unknown", head));
-        assertNull(mk.getNodes("/unknown", head));
+        assertNull(mk.getNodes("/jcr:system/indexes/unknown", head, 1, 0, -1, null));
+        assertNull(mk.getNodes("/unknown", head, 1, 0, -1, null));
     }
 
     @Test
@@ -47,11 +47,11 @@ public class IndexWrapperTest {
         head = mk.commit("/", "+ \"n2\": { \"value\":\"x:yes\" }", head, "");
         head = mk.commit("/", "+ \"n3\": { \"value\":\"x:a\" }", head, "");
         head = mk.commit("/", "+ \"n4\": { \"value\":\"x:a\" }", head, "");
-        String empty = mk.getNodes("/jcr:system/indexes/prefix:x?x:no", head);
+        String empty = mk.getNodes("/jcr:system/indexes/prefix:x?x:no", head, 1, 0, -1, null);
         assertEquals("[]", empty);
-        String yes = mk.getNodes("/jcr:system/indexes/prefix:x?x:yes", head);
+        String yes = mk.getNodes("/jcr:system/indexes/prefix:x?x:yes", head, 1, 0, -1, null);
         assertEquals("[\"/n2/value\"]", yes);
-        String a = mk.getNodes("/jcr:system/indexes/prefix:x?x:a", head);
+        String a = mk.getNodes("/jcr:system/indexes/prefix:x?x:a", head, 1, 0, -1, null);
         assertEquals("[\"/n3/value\",\"/n4/value\"]", a);
     }
 
@@ -60,9 +60,9 @@ public class IndexWrapperTest {
         head = mk.commit("/jcr:system/indexes", "+ \"property:id,unique\": {}", head, "");
         head = mk.commit("/", "+ \"n1\": { \"value\":\"empty\" }", head, "");
         head = mk.commit("/", "+ \"n2\": { \"id\":\"1\" }", head, "");
-        String empty = mk.getNodes("/jcr:system/indexes/property:id,unique?0", head);
+        String empty = mk.getNodes("/jcr:system/indexes/property:id,unique?0", head, 1, 0,
-1, null);
         assertEquals("[]", empty);
-        String one = mk.getNodes("/jcr:system/indexes/property:id,unique?1", head);
+        String one = mk.getNodes("/jcr:system/indexes/property:id,unique?1", head, 1, 0,
-1, null);
         assertEquals("[\"/n2\"]", one);
     }
 
@@ -72,11 +72,11 @@ public class IndexWrapperTest {
         head = mk.commit("/", "+ \"n1\": { \"ref\":\"a\" }", head, "");
         head = mk.commit("/", "+ \"n2\": { \"ref\":\"b\" }", head, "");
         head = mk.commit("/", "+ \"n3\": { \"ref\":\"b\" }", head, "");
-        String empty = mk.getNodes("/jcr:system/indexes/property:ref?no", head);
+        String empty = mk.getNodes("/jcr:system/indexes/property:ref?no", head, 1, 0, -1,
null);
         assertEquals("[]", empty);
-        String one = mk.getNodes("/jcr:system/indexes/property:ref?a", head);
+        String one = mk.getNodes("/jcr:system/indexes/property:ref?a", head, 1, 0, -1, null);
         assertEquals("[\"/n1\"]", one);
-        String two = mk.getNodes("/jcr:system/indexes/property:ref?b", head);
+        String two = mk.getNodes("/jcr:system/indexes/property:ref?b", head, 1, 0, -1, null);
         assertEquals("[\"/n2\",\"/n3\"]", two);
     }
 

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java
Fri May 25 12:38:46 2012
@@ -104,16 +104,16 @@ public class SecurityWrapperTest {
         head = mk.getHeadRevision();
         assertTrue(mkAdmin.nodeExists("/:user", head));
         assertFalse(mkGuest.nodeExists("/:user", head));
-        assertNull(mkGuest.getNodes("/:user", head));
+        assertNull(mkGuest.getNodes("/:user", head, 1, 0, -1, null));
         head = mkAdmin.commit("/", "^ \":rights\": \"read\"", head, "");
         head = mkAdmin.commit("/", "+ \"test\": { \"data\": \"Hello\" }", head, "");
         assertTrue(mkAdmin.nodeExists("/", head));
-        assertNull(mkGuest.getNodes("/unknown", head));
-        assertNull(mkGuest.getNodes("/unknown/node", head));
+        assertNull(mkGuest.getNodes("/unknown", head, 1, 0, -1, null));
+        assertNull(mkGuest.getNodes("/unknown/node", head, 1, 0, -1, null));
         assertTrue(mkGuest.nodeExists("/", head));
-        assertNull(mkGuest.getNodes("/unknown", head));
-        assertEquals("{\":rights\":\"read\",\":childNodeCount\":2,\":user\":{\":rights\":\"admin\",\":childNodeCount\":2,\"guest\":{},\"sa\":{}},\"test\":{\"data\":\"Hello\",\":childNodeCount\":0}}",
mkAdmin.getNodes("/", head));
-        assertEquals("{\":childNodeCount\":1,\"test\":{\"data\":\"Hello\",\":childNodeCount\":0}}",
mkGuest.getNodes("/", head));
+        assertNull(mkGuest.getNodes("/unknown", head, 1, 0, -1, null));
+        assertEquals("{\":rights\":\"read\",\":childNodeCount\":2,\":user\":{\":rights\":\"admin\",\":childNodeCount\":2,\"guest\":{},\"sa\":{}},\"test\":{\"data\":\"Hello\",\":childNodeCount\":0}}",
mkAdmin.getNodes("/", head, 1, 0, -1, null));
+        assertEquals("{\":childNodeCount\":1,\"test\":{\"data\":\"Hello\",\":childNodeCount\":0}}",
mkGuest.getNodes("/", head, 1, 0, -1, null));
     }
 
     private String filterJournal(String journal) {

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java
Fri May 25 12:38:46 2012
@@ -94,41 +94,41 @@ public class VirtualRepositoryWrapperTes
         head = mkVirtual.commit("/", "+ \"data/b\": { \"data\": \"World\" }", head, "");
 
         // get nodes
-        String m1 = mkRep1.getNodes("/data", mkRep1.getHeadRevision());
+        String m1 = mkRep1.getNodes("/data", mkRep1.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\":childNodeCount\":1,\"a\":{\"data\":\"Hello\",\":childNodeCount\":0}}",
m1);
-        String m2 = mkRep2.getNodes("/data", mkRep2.getHeadRevision());
+        String m2 = mkRep2.getNodes("/data", mkRep2.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\":childNodeCount\":1,\"b\":{\"data\":\"World\",\":childNodeCount\":0}}",
m2);
-        String m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision());
+        String m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\"data\":\"Hello\",\":childNodeCount\":0}", m);
-        m = mkVirtual.getNodes("/data/b", mkVirtual.getHeadRevision());
+        m = mkVirtual.getNodes("/data/b", mkVirtual.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\"data\":\"World\",\":childNodeCount\":0}", m);
 
         // get nodes on unknown nodes
-        m = mkVirtual.getNodes("/notMapped", mkVirtual.getHeadRevision());
+        m = mkVirtual.getNodes("/notMapped", mkVirtual.getHeadRevision(), 1, 0, -1, null);
         assertNull(m);
-        m = mkVirtual.getNodes("/data/a/notExist", mkVirtual.getHeadRevision());
+        m = mkVirtual.getNodes("/data/a/notExist", mkVirtual.getHeadRevision(), 1, 0, -1,
null);
         assertNull(m);
 
         // set property
         head = mkVirtual.commit("/", "^ \"data/a/data\": \"Hallo\"", head, "");
         head = mkVirtual.commit("/", "^ \"data/b/data\": \"Welt\"", head, "");
-        m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision());
+        m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\"data\":\"Hallo\",\":childNodeCount\":0}", m);
-        m = mkVirtual.getNodes("/data/b", mkVirtual.getHeadRevision());
+        m = mkVirtual.getNodes("/data/b", mkVirtual.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\"data\":\"Welt\",\":childNodeCount\":0}", m);
 
         // add property
         head = mkVirtual.commit("/", "+ \"data/a/lang\": \"de\"", head, "");
-        m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision());
+        m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\"data\":\"Hallo\",\"lang\":\"de\",\":childNodeCount\":0}", m);
         head = mkVirtual.commit("/", "^ \"data/a/lang\": null", head, "");
-        m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision());
+        m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\"data\":\"Hallo\",\":childNodeCount\":0}", m);
 
         // move
         head = mkVirtual.commit("/", "+ \"data/a/sub\": {}", head, "");
         head = mkVirtual.commit("/", "> \"data/a/sub\": \"data/a/sub2\"", head, "");
-        m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision());
+        m = mkVirtual.getNodes("/data/a", mkVirtual.getHeadRevision(), 1, 0, -1, null);
         assertEquals("{\"data\":\"Hallo\",\":childNodeCount\":1,\"sub2\":{\":childNodeCount\":0}}",
m);
         head = mkVirtual.commit("/", "- \"data/a/sub2\"", head, "");
 

Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
(original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
Fri May 25 12:38:46 2012
@@ -507,7 +507,7 @@ public class MicroKernelIT extends Abstr
         assertEquals(child.size(), 0);
 
         // getNodes(path, revId) must return same result as getNodes(path, revId, 1, 0, -1,
null)
-        obj = parseJSONObject(mk.getNodes("/testRoot", null));
+        obj = parseJSONObject(mk.getNodes("/testRoot", null, 1, 0, -1, null));
         JSONObject obj1 = parseJSONObject(mk.getNodes("/testRoot", null, 1, 0, -1, null));
         assertEquals(obj, obj1);
     }
@@ -601,7 +601,7 @@ public class MicroKernelIT extends Abstr
         assertTrue(mk.nodeExists("/test", head));
         try {
             String path = "/test/";
-            mk.getNodes(path, head);
+            mk.getNodes(path, head, 1, 0, -1, null);
             fail("Success with invalid path: " + path);
         } catch (AssertionError e) {
             // expected
@@ -634,7 +634,7 @@ public class MicroKernelIT extends Abstr
         head = mk.commit("/",
                 "+\"fuu\" : {} \n" +
                         "^\"fuu/bar\" : 42", head, "");
-        JSONObject obj = parseJSONObject(mk.getNodes("/fuu", head));
+        JSONObject obj = parseJSONObject(mk.getNodes("/fuu", head, 1, 0, -1, null));
         assertPropertyValue(obj, "bar", 42L);
     }
 
@@ -701,7 +701,7 @@ public class MicroKernelIT extends Abstr
         head = mk.commit("/", "+\"" + node + "\" : {\"child\":{}}", head, "");
 
         head = mk.commit('/' + node, "-\"child\"", head, "");
-        JSONObject obj = parseJSONObject(mk.getNodes('/' + node, head));
+        JSONObject obj = parseJSONObject(mk.getNodes('/' + node, head, 1, 0, -1, null));
         assertPropertyValue(obj, ":childNodeCount", 0L);
     }
 
@@ -789,7 +789,7 @@ public class MicroKernelIT extends Abstr
         head = mk.commit("/", "+\"" + node + "\" : {\"prop\":\"value\"}", head, "");
 
         head = mk.commit("/", "^\"" + node + "/prop\" : null", head, "");
-        JSONObject obj = parseJSONObject(mk.getNodes('/' + node, head));
+        JSONObject obj = parseJSONObject(mk.getNodes('/' + node, head, 1, 0, -1, null));
         assertPropertyValue(obj, ":childNodeCount", 0L);
     }
 

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
(original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
Fri May 25 12:38:46 2012
@@ -197,10 +197,9 @@ public interface MicroKernel {
      * Returns the number of child nodes of the specified node.
      * <p/>
      * This is a convenience method since this information could gathered by
-     * calling {@code getNodes(path, revisionId, 0, 0, 0)} and evaluating
+     * calling {@code getNodes(path, revisionId, 0, 0, 0, null)} and evaluating
      * the {@code :childNodeCount} property.
      *
-     *
      * @param path       path denoting node
      * @param revisionId revision id, if {@code null} the current head revision is assumed
      * @return the number of child nodes
@@ -209,45 +208,6 @@ public interface MicroKernel {
     long getChildNodeCount(String path, String revisionId) throws MicroKernelException;
 
     /**
-     * Returns the node tree rooted at the specified parent node with depth 1.
-     * Depth 1 means all properties of the node are returned, including the direct
-     * child nodes and their properties (including
-     * {@code :childNodeCount}). Example:
-     * <pre>
-     * {
-     *   "someprop" : "someval",
-     *   ":childNodeCount" : 2,
-     *   "child1" : {
-     *      "prop1" : 123,
-     *      ":childNodeCount" : 2
-     *    },
-     *    "child2" : {
-     *      "prop1" : "bar",
-     *      ":childNodeCount" : 0
-     *    }
-     * }
-     * </pre>
-     * Remarks:
-     * <ul>
-     * <li>If the property {@code :childNodeCount} equals 0, then the
-     * node does not have any child nodes.
-     * <li>If the value of {@code :childNodeCount} is larger than the number
-     * of returned child nodes, then the node has more child nodes than those
-     * included in the tree. Large number of child nodes can be retrieved in
-     * chunks using {@link #getNodes(String, String, int, long, int, String)}</li>
-     * </ul>
-     * This method is a convenience method for
-     * {@code getNodes(path, revisionId, 1, 0, -1, null)}
-     *
-     * @param path       path denoting root of node tree to be retrieved
-     * @param revisionId revision id, if {@code null} the current head revision is assumed
-     * @return node tree in JSON format or {@code null} if the specified node does not exist
-     * @throws MicroKernelException if the specified revision does not exist or if another
error occurs
-     * @see #getNodes(String, String, int, long, int, String)
-     */
-    String /* jsonTree */ getNodes(String path, String revisionId) throws MicroKernelException;
-
-    /**
      * Returns the node tree rooted at the specified parent node with the
      * specified depth, maximum child node count and offset. The depth of the
      * returned tree is governed by the {@code depth} parameter:
@@ -301,8 +261,7 @@ public interface MicroKernel {
      * node does not have any child nodes.
      * <li>If the value of {@code :childNodeCount} is larger than the number
      * of returned child nodes, then the node has more child nodes than those
-     * included in the tree. Large number of child nodes can be retrieved in
-     * chunks using {@link #getNodes(String, String, int, long, int, String)}</li>
+     * included in the tree.</li>
      * </ul>
      * The {@code offset} and {@code count} parameters are only applied to the
      * direct child nodes of the root of the returned node tree.

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/client/Client.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/client/Client.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/client/Client.java
(original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/client/Client.java
Fri May 25 12:38:46 2012
@@ -222,13 +222,6 @@ public class Client implements MicroKern
     }
 
     @Override
-    public String getNodes(String path, String revisionId)
-            throws MicroKernelException {
-
-        return getNodes(path, revisionId, 1, 0, -1, null);
-    }
-
-    @Override
     public String getNodes(String path, String revisionId, int depth,
             long offset, int count, String filter) throws MicroKernelException {
         

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java
Fri May 25 12:38:46 2012
@@ -314,10 +314,6 @@ public class MicroKernelImpl implements 
         }
     }
 
-    public String getNodes(String path, String revisionId) throws MicroKernelException {
-        return getNodes(path, revisionId, 1, 0, -1, null);
-    }
-
     public String getNodes(String path, String revisionId, int depth, long offset, int count,
String filter) throws MicroKernelException {
         if (rep == null) {
             throw new IllegalStateException("this instance has already been disposed");

Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java
(original)
+++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentTest.java
Fri May 25 12:38:46 2012
@@ -40,7 +40,7 @@ public class ConcurrentTest {
                 Assert.assertTrue(!newRev.equals(rev));
                 mk.getJournal(rev, newRev, null);
                 mk.getRevisionHistory(start, 100, null);
-                mk.getNodes("/" + i, newRev);
+                mk.getNodes("/" + i, newRev, 1, 0, -1, null);
                 mk.getNodes("/" + i, newRev, 0, 0, 0, null);
                 Assert.assertFalse(mk.nodeExists("/" + i, rev));
                 Assert.assertTrue(mk.nodeExists("/" + i, newRev));

Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java?rev=1342597&r1=1342596&r2=1342597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java
(original)
+++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java
Fri May 25 12:38:46 2012
@@ -84,12 +84,12 @@ public class DefaultRevisionStoreTest {
         mk.commit("/a/c", "+\"f\" : {}", mk.getHeadRevision(), null);
         
         String headRevision = mk.getHeadRevision();
-        String contents = mk.getNodes("/", headRevision);
+        String contents = mk.getNodes("/", headRevision, 1, 0, -1, null);
 
         rs.gc();
         
         assertEquals(headRevision, mk.getHeadRevision());
-        assertEquals(contents, mk.getNodes("/", headRevision));
+        assertEquals(contents, mk.getNodes("/", headRevision, 1, 0, -1, null));
         
         String history = mk.getRevisionHistory(Long.MIN_VALUE, Integer.MIN_VALUE, null);
         assertEquals(1, ((JsopArray) Jsop.parse(history)).size());



Mime
View raw message