jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
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 GMT
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 @@
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>microkernel</artifactId>
+            <artifactId>oak-core</artifactId>
             <version>0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
@@ -71,6 +71,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.6.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.3.158</version>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>

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<String> workspaces = new ArrayList<String>();

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<Path> nodes = new ArrayList<Path>();
-        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<Path> properties = new ArrayList<Path>();
-        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<String>
nodeNames,
             final Map<String, JsonAtom> 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<Path> nodes = new ArrayList<Path>();
-        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<Path> properties = new ArrayList<Path>();
-        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<String>
nodeNames,
             final Map<String, JsonAtom> 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) {



Mime
View raw message