Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E6D079DCC for ; Tue, 6 Mar 2012 17:46:59 +0000 (UTC) Received: (qmail 61145 invoked by uid 500); 6 Mar 2012 17:46:59 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 61076 invoked by uid 500); 6 Mar 2012 17:46:59 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 61068 invoked by uid 99); 6 Mar 2012 17:46:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 17:46:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2012 17:46:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 136A22388847; Tue, 6 Mar 2012 17:46:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1297596 - in /jackrabbit/sandbox/jackrabbit-microkernel: ./ src/main/java/org/apache/jackrabbit/ src/main/java/org/apache/jackrabbit/query/reader/ src/test/java/org/apache/jackrabbit/state/ Date: Tue, 06 Mar 2012 17:46:34 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120306174635.136A22388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Tue Mar 6 17:46:34 2012 New Revision: 1297596 URL: http://svn.apache.org/viewvc?rev=1297596&view=rev Log: Microkernel based prototype of JCR implementation (WIP) - upgrading dependency from microkernel in sandbox to oak Modified: jackrabbit/sandbox/jackrabbit-microkernel/pom.xml jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/WorkspaceImpl.java jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/ChangeLogFuzzTest.java jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceFuzzTest.java Modified: jackrabbit/sandbox/jackrabbit-microkernel/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/pom.xml?rev=1297596&r1=1297595&r2=1297596&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/pom.xml (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/pom.xml Tue Mar 6 17:46:34 2012 @@ -58,7 +58,7 @@ org.apache.jackrabbit - microkernel + oak-core 0.1-SNAPSHOT @@ -71,6 +71,11 @@ slf4j-api 1.6.1 + + com.h2database + h2 + 1.3.158 + Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/WorkspaceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/WorkspaceImpl.java?rev=1297596&r1=1297595&r2=1297596&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/WorkspaceImpl.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/WorkspaceImpl.java Tue Mar 6 17:46:34 2012 @@ -134,7 +134,7 @@ public class WorkspaceImpl implements Wo public String[] getAccessibleWorkspaceNames() throws RepositoryException { MicroKernel microKernel = sessionContext.getMicrokernel(); String revision = sessionContext.getRevision(); - String json = microKernel.getNodes("/", revision, 0, 0, -1); + String json = microKernel.getNodes("/", revision, 0, 0, -1, null); JsonObject jsonObject = FullJsonParser.parseObject(new UnescapingJsonTokenizer(json)); List workspaces = new ArrayList(); Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java?rev=1297596&r1=1297595&r2=1297596&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/query/reader/TraversingCursor.java Tue Mar 6 17:46:34 2012 @@ -13,11 +13,12 @@ */ package org.apache.jackrabbit.query.reader; -import java.util.ArrayList; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.simple.NodeImpl; import org.apache.jackrabbit.mk.util.PathUtils; +import java.util.ArrayList; + /** * A cursor that reads all nodes in a given subtree. */ @@ -39,7 +40,7 @@ public class TraversingCursor implements } private boolean loadChildren(String path, long offset) { - String s = mk.getNodes(path, revisionId, 0, offset, childBlockSize); + String s = mk.getNodes(path, revisionId, 0, offset, childBlockSize, null); NodeCursor c = new NodeCursor(); c.node = NodeImpl.parse(s); c.node.setPath(path); Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/ChangeLogFuzzTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/ChangeLogFuzzTest.java?rev=1297596&r1=1297595&r2=1297596&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/ChangeLogFuzzTest.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/ChangeLogFuzzTest.java Tue Mar 6 17:46:34 2012 @@ -373,7 +373,7 @@ public class ChangeLogFuzzTest { private Path chooseNode(final Path parent) { final List nodes = new ArrayList(); - String json = mk1.getNodes(parent.toMkPath(), mk1.getHeadRevision(), 0, 0, -1); + String json = mk1.getNodes(parent.toMkPath(), mk1.getHeadRevision(), 0, 0, -1, null); new JsonParser(new JsonHandler(){ @Override public void object(JsonParser parser, Token key, JsonTokenizer tokenizer) { @@ -393,7 +393,7 @@ public class ChangeLogFuzzTest { private Path chooseProperty(final Path parent) { final List properties = new ArrayList(); - String json = mk1.getNodes(parent.toMkPath(), mk1.getHeadRevision(), 0, 0, -1); + String json = mk1.getNodes(parent.toMkPath(), mk1.getHeadRevision(), 0, 0, -1, null); new JsonParser(new JsonHandler(){ @Override public void atom(Token key, Token value) { @@ -440,7 +440,7 @@ public class ChangeLogFuzzTest { private static void collectItems(MicroKernel microKernel, Path path, final Set nodeNames, final Map properties) { - String json = microKernel.getNodes(path.toMkPath(), microKernel.getHeadRevision(), 0, 0, -1); + String json = microKernel.getNodes(path.toMkPath(), microKernel.getHeadRevision(), 0, 0, -1, null); new JsonParser(new JsonHandler(){ @Override public void object(JsonParser parser, Token key, JsonTokenizer tokenizer) { Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceFuzzTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceFuzzTest.java?rev=1297596&r1=1297595&r2=1297596&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceFuzzTest.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/test/java/org/apache/jackrabbit/state/TransientSpaceFuzzTest.java Tue Mar 6 17:46:34 2012 @@ -372,7 +372,7 @@ public class TransientSpaceFuzzTest { private Path chooseNode(final Path parent) { final List nodes = new ArrayList(); - String json = mk1.getNodes(parent.toMkPath(), mk1.getHeadRevision(), 0, 0, -1); + String json = mk1.getNodes(parent.toMkPath(), mk1.getHeadRevision(), 0, 0, -1, null); new JsonParser(new JsonHandler(){ @Override public void object(JsonParser parser, Token key, JsonTokenizer tokenizer) { @@ -392,7 +392,7 @@ public class TransientSpaceFuzzTest { private Path chooseProperty(final Path parent) { final List properties = new ArrayList(); - String json = mk1.getNodes(parent.toMkPath(), mk1.getHeadRevision(), 0, 0, -1); + String json = mk1.getNodes(parent.toMkPath(), mk1.getHeadRevision(), 0, 0, -1, null); new JsonParser(new JsonHandler(){ @Override public void atom(Token key, Token value) { @@ -439,7 +439,7 @@ public class TransientSpaceFuzzTest { private static void collectItems(MicroKernel microKernel, Path path, final Set nodeNames, final Map properties) { - String json = microKernel.getNodes(path.toMkPath(), microKernel.getHeadRevision(), 0, 0, -1); + String json = microKernel.getNodes(path.toMkPath(), microKernel.getHeadRevision(), 0, 0, -1, null); new JsonParser(new JsonHandler(){ @Override public void object(JsonParser parser, Token key, JsonTokenizer tokenizer) {