svn commit: r1133891 - in /jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel: RepositoryServiceImpl.java util/ItemInfos.java util/Json.java

[md...@apache.org]

Author: mduerig
Date: Thu Jun  9 14:30:40 2011
New Revision: 1133891

URL: http://svn.apache.org/viewvc?rev=1133891&view=rev
Log:
spi2microkernel prototype (WIP)
minor refactor

Added:
    jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java
      - copied, changed from r1133836, jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Json.java
Removed:
    jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Json.java
Modified:
    jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java

Modified: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1133891&r1=1133890&r2=1133891&view=diff
==============================================================================
--- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java (original)
+++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Thu Jun  9 14:30:40 2011
@@ -40,7 +40,7 @@ import org.apache.jackrabbit.spi.commons
 import org.apache.jackrabbit.spi.commons.ItemInfoCacheImpl;
 import org.apache.jackrabbit.spi.commons.batch.ConsolidatingChangeLog;
 import org.apache.jackrabbit.spi.commons.name.NameConstants;
-import org.apache.jackrabbit.spi2microkernel.util.Json;
+import org.apache.jackrabbit.spi2microkernel.util.ItemInfos;
 import org.apache.jackrabbit.spi2microkernel.util.JsonHandlerBase;
 import org.apache.jackrabbit.spi2microkernel.util.NodeTypes;
 import org.apache.jackrabbit.spi2microkernel.util.Paths;
@@ -186,7 +186,7 @@ public class RepositoryServiceImpl exten
 
             if (microKernel.nodeExists(mkPath, rev)) {
                 String json = microKernel.getNodes(mkPath, 1, rev);
-                return Json.buildItemInfos(path, json);
+                return ItemInfos.buildItemInfos(path, json);
             }
             else {
                 throw new PathNotFoundException(path.toString());
@@ -208,7 +208,7 @@ public class RepositoryServiceImpl exten
             NodeInfo info = null;
             if (microKernel.nodeExists(mkPath, rev)) {
                 String json = microKernel.getNodes(mkPath, 1, rev);
-                info = Json.buildNodeInfo(path, json);
+                info = ItemInfos.buildNodeInfo(path, json);
             }
 
             if (info == null) {
@@ -234,7 +234,7 @@ public class RepositoryServiceImpl exten
             PropertyInfo info = null;
             if (microKernel.nodeExists(mkPath, rev)) {
                 String json = microKernel.getNodes(mkPath, 0, rev);
-                info = Json.buildPropertyInfo(path, json);
+                info = ItemInfos.buildPropertyInfo(path, json);
             }
 
             if (info == null) {

Copied: jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java (from r1133836, jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Json.java)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java?p2=jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java&p1=jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Json.java&r1=1133836&r2=1133891&rev=1133891&view=diff
==============================================================================
--- jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Json.java (original)
+++ jackrabbit/sandbox/spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/ItemInfos.java Thu Jun  9 14:30:40 2011
@@ -41,8 +41,8 @@ import java.util.LinkedList;
 
 import static org.apache.jackrabbit.spi2microkernel.util.Exceptions.setCause;
 
-public final class Json {
-    private Json() {}
+public final class ItemInfos {
+    private ItemInfos() {}
 
     public static Iterator<? extends ItemInfo> buildItemInfos(Path path, String json) throws RepositoryException {
         final LinkedList<ItemInfo> itemInfos = new LinkedList<ItemInfo>();