jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1224974 - in /jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit: ItemImpl.java NodeImpl.java PropertyImpl.java state/TransientSpace.java
Date Tue, 27 Dec 2011 18:49:40 GMT
Author: mduerig
Date: Tue Dec 27 18:49:39 2011
New Revision: 1224974

URL: http://svn.apache.org/viewvc?rev=1224974&view=rev
Log:
Microkernel based prototype of JCR implementation (WIP)
- clean up

Modified:
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/ItemImpl.java
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/PropertyImpl.java
    jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientSpace.java

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/ItemImpl.java?rev=1224974&r1=1224973&r2=1224974&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/ItemImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/ItemImpl.java
Tue Dec 27 18:49:39 2011
@@ -20,7 +20,7 @@
 package org.apache.jackrabbit;
 
 import org.apache.jackrabbit.SessionImpl.Context;
-import org.apache.jackrabbit.state.ChangeTree;
+import org.apache.jackrabbit.state.ChangeTree.NodeDelta;
 
 import javax.jcr.Item;
 import javax.jcr.ItemNotFoundException;
@@ -149,7 +149,7 @@ abstract class ItemImpl implements Item 
         return !sessionContext.getRevision().equals(revision);
     }
 
-    protected final ChangeTree.NodeDelta getNodeDelta() throws ItemNotFoundException {
+    protected final NodeDelta getNodeDelta() throws ItemNotFoundException {
         return sessionContext.getTransientSpace().getNode(path);
     }
 

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java?rev=1224974&r1=1224973&r2=1224974&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/NodeImpl.java
Tue Dec 27 18:49:39 2011
@@ -28,7 +28,7 @@ import org.apache.jackrabbit.json.Unesca
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.spi.commons.iterator.Iterators;
 import org.apache.jackrabbit.spi.commons.iterator.Transformer;
-import org.apache.jackrabbit.state.ChangeTree;
+import org.apache.jackrabbit.state.ChangeTree.NodeDelta;
 import org.apache.jackrabbit.state.TransientSpace;
 import org.apache.jackrabbit.utils.Arrays;
 import org.apache.jackrabbit.utils.ChildItemCollector;
@@ -635,7 +635,7 @@ public class NodeImpl extends ItemImpl i
             return null;
         }
 
-        ChangeTree.NodeDelta delta;
+        NodeDelta delta;
         try {
             delta = sessionContext.getTransientSpace().getNode(path);
         }
@@ -665,12 +665,12 @@ public class NodeImpl extends ItemImpl i
         return node.getNode().value().entrySet().iterator();
     }
 
-    private static Iterator<Entry<String, JsonValue>> getAddedNodes(ChangeTree.NodeDelta
delta) {
+    private static Iterator<Entry<String, JsonValue>> getAddedNodes(NodeDelta
delta) {
         return Iterators.transformIterator(delta.getNodes(),
-                new Transformer<Entry<String, ChangeTree.NodeDelta>, Entry<String,
JsonValue>>() {
+                new Transformer<Entry<String, NodeDelta>, Entry<String, JsonValue>>()
{
 
                     @Override
-                    public Entry<String, JsonValue> transform(final Entry<String,
ChangeTree.NodeDelta> entry) {
+                    public Entry<String, JsonValue> transform(final Entry<String,
NodeDelta> entry) {
                         return new Entry<String, JsonValue>() {
                             @Override
                             public String getKey() {
@@ -692,7 +692,7 @@ public class NodeImpl extends ItemImpl i
                 });
     }
 
-    private static Iterator<Entry<String, JsonValue>> getProperties(ChangeTree.NodeDelta
delta) {
+    private static Iterator<Entry<String, JsonValue>> getProperties(NodeDelta
delta) {
         return delta.getProperties();
     }
 

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/PropertyImpl.java?rev=1224974&r1=1224973&r2=1224974&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/PropertyImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/PropertyImpl.java
Tue Dec 27 18:49:39 2011
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.json.JsonVa
 import org.apache.jackrabbit.json.JsonValue.Type;
 import org.apache.jackrabbit.json.UnescapingJsonTokenizer;
 import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.state.ChangeTree;
+import org.apache.jackrabbit.state.ChangeTree.NodeDelta;
 import org.apache.jackrabbit.state.TransientSpace;
 import org.apache.jackrabbit.utils.ValueConverter;
 
@@ -320,7 +320,7 @@ public class PropertyImpl extends ItemIm
             return null;
         }
 
-        ChangeTree.NodeDelta delta;
+        NodeDelta delta;
         try {
             delta = sessionContext.getTransientSpace().getNode(parentPath);
         }

Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientSpace.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientSpace.java?rev=1224974&r1=1224973&r2=1224974&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientSpace.java
(original)
+++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/state/TransientSpace.java
Tue Dec 27 18:49:39 2011
@@ -5,6 +5,7 @@ import org.apache.jackrabbit.json.JsonVa
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.mk.api.MicroKernelException;
 import org.apache.jackrabbit.state.ChangeTree.Listener;
+import org.apache.jackrabbit.state.ChangeTree.NodeDelta;
 import org.apache.jackrabbit.utils.Function1;
 
 import javax.jcr.ItemNotFoundException;
@@ -27,14 +28,14 @@ public class TransientSpace {
         });
     }
 
-    public ChangeTree.NodeDelta getNode(Path path) throws ItemNotFoundException {
-        return changeTree.getNode(path);
-    }
-
     public boolean nodeExists(Path path) {
         return changeTree.nodeExists(path);
     }
 
+    public NodeDelta getNode(Path path) throws ItemNotFoundException {
+        return changeTree.getNode(path);
+    }
+
     public String save() throws RepositoryException {
         try {
             final StringBuilder jsop = new StringBuilder();



Mime
View raw message