jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1158373 - in /jackrabbit/sandbox/jackrabbit-mk: jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jc...
Date Tue, 16 Aug 2011 17:03:52 GMT
Author: mduerig
Date: Tue Aug 16 17:03:52 2011
New Revision: 1158373

URL: http://svn.apache.org/viewvc?rev=1158373&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)

Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/benchmark/ReadPerformanceTest.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java?rev=1158373&r1=1158372&r2=1158373&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
Tue Aug 16 17:03:52 2011
@@ -85,20 +85,20 @@ public class WorkspaceItemStateFactory e
 
         try {
             Entry<NodeInfo> cached = cache.getNodeInfo(nodeId);
-            NodeInfo info;
+            ItemInfo info;
             if (isUpToDate(cached, entry)) {
                 info = cached.info;
             } else {
                 // otherwise retreive item info from service and cache the whole batch
                 Iterator<? extends ItemInfo> infos = service.getItemInfos(sessionInfo,
nodeId);
                 info = first(infos, cache, entry.getGeneration());
-                if (info == null) {
+                if (info == null || !info.denotesNode()) {
                     throw new ItemNotFoundException("NodeId: " + nodeId);
                 }
             }
 
             assertMatchingPath(info, entry);
-            return createNodeState(info, entry);
+            return createNodeState((NodeInfo) info, entry);
         }
         catch (PathNotFoundException e) {
             throw new ItemNotFoundException(e);
@@ -116,12 +116,12 @@ public class WorkspaceItemStateFactory e
             // Get item info from cache
             Iterator<? extends ItemInfo> infos = null;
             Entry<NodeInfo> cached = cache.getNodeInfo(nodeId);
-            NodeInfo info;
+            ItemInfo info;
             if (cached == null) {
                 // or from service if not in cache
                 infos = service.getItemInfos(sessionInfo, nodeId);
                 info = first(infos, null, 0);
-                if (info == null) {
+                if (info == null || !info.denotesNode()) {
                     throw new ItemNotFoundException("NodeId: " + nodeId);
                 }
             } else {
@@ -147,7 +147,7 @@ public class WorkspaceItemStateFactory e
                 }
 
                 assertMatchingPath(info, entry);
-                return createNodeState(info, (NodeEntry) entry);
+                return createNodeState((NodeInfo) info, (NodeEntry) entry);
             }
         }
         catch (PathNotFoundException e) {
@@ -164,17 +164,20 @@ public class WorkspaceItemStateFactory e
         try {
             // Get item info from cache and use it if up to date
             Entry<PropertyInfo> cached = cache.getPropertyInfo(propertyId);
-            PropertyInfo info;
+            ItemInfo info;
             if (isUpToDate(cached, entry)) {
                 info = cached.info;
             } else {
                 // otherwise retreive item info from service and cache the whole batch
-                info = service.getPropertyInfo(sessionInfo, propertyId);
-                cache.put(info, entry.getGeneration());
+                Iterator<? extends ItemInfo> infos = service.getItemInfos(sessionInfo,
propertyId);
+                info = first(infos, cache, entry.getGeneration());
+                if (info == null || info.denotesNode()) {
+                    throw new ItemNotFoundException("PropertyId: " + propertyId);
+                }
             }
 
             assertMatchingPath(info, entry);
-            return createPropertyState(info, entry);
+            return createPropertyState((PropertyInfo) info, entry);
         }
         catch (PathNotFoundException e) {
             throw new ItemNotFoundException(e);
@@ -190,30 +193,39 @@ public class WorkspaceItemStateFactory e
 
         try {
             // Get item info from cache
+            Iterator<? extends ItemInfo> infos = null;
             Entry<PropertyInfo> cached = cache.getPropertyInfo(propertyId);
-            PropertyInfo info;
+            ItemInfo info;
             if (cached == null) {
                 // or from service if not in cache
-                info = service.getPropertyInfo(sessionInfo, propertyId);
+                infos = service.getItemInfos(sessionInfo, propertyId);
+                info = first(infos, null, 0);
+                if (info == null || info.denotesNode()) {
+                    throw new ItemNotFoundException("PropertyId: " + propertyId);
+                }
             } else {
                 info = cached.info;
             }
 
             // Build the hierarchy entry for the item info
             HierarchyEntry entry = createHierarchyEntries(info, anyParent);
-
             if (entry == null || entry.denotesNode()) {
                 throw new ItemNotFoundException(
                         "HierarchyEntry does not belong to any existing ItemInfo. No ItemState
was created.");
             } else {
+                long generation = entry.getGeneration();
                 if (isOutdated(cached, entry)) {
                     // if not, retreive the item info from the service and put the whole
batch into the cache
-                    info = service.getPropertyInfo(sessionInfo, propertyId);
-                    cache.put(info, entry.getGeneration());
+                    infos = service.getItemInfos(sessionInfo, propertyId);
+                    info = first(infos, cache, generation);
+                } else if (infos != null) {
+                    // Otherwise put the whole batch retrieved from the service earlier into
the cache
+                    cache.put(info, generation);
+                    first(infos, cache, generation);
                 }
 
                 assertMatchingPath(info, entry);
-                return createPropertyState(info, (PropertyEntry) entry);
+                return createPropertyState((PropertyInfo) info, (PropertyEntry) entry);
             }
 
         } catch (PathNotFoundException e) {
@@ -250,22 +262,17 @@ public class WorkspaceItemStateFactory e
     //------------------------------------------------------------< private >---
 
     /**
-     * Returns the first item in the iterator if it exists and denotes a node.
-     * Otherwise returns <code>null</code>. If <code>cache</code>
is not
-     * <code>null</code>, caches all items by the given <code>generation</code>.
-     * @param generation
+     * Returns the first item in the iterator if it exists. Otherwise returns <code>null</code>.
+     * If <code>cache</code> is not <code>null</code>, caches all
items by the given
+     * <code>generation</code>.
      */
-    private static NodeInfo first(Iterator<? extends ItemInfo> infos, ItemInfoCache
cache, long generation) {
+    private static ItemInfo first(Iterator<? extends ItemInfo> infos, ItemInfoCache
cache, long generation) {
         ItemInfo first = null;
         if (infos.hasNext()) {
             first = infos.next();
             if (cache != null) {
                 cache.put(first, generation);
             }
-
-            if (!first.denotesNode()) {
-                first = null;
-            }
         }
 
         if (cache != null) {
@@ -274,7 +281,7 @@ public class WorkspaceItemStateFactory e
             }
         }
 
-        return (NodeInfo) first;
+        return first;
     }
 
     /**

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java?rev=1158373&r1=1158372&r2=1158373&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractJCR2SPITest.java
Tue Aug 16 17:03:52 2011
@@ -154,10 +154,10 @@ public abstract class AbstractJCR2SPITes
                 return AbstractJCR2SPITest.this.createRootNodeDefinition();
             }
 
-            public Iterator<? extends ItemInfo> getItemInfos(SessionInfo sessionInfo,
NodeId nodeId)
+            public Iterator<? extends ItemInfo> getItemInfos(SessionInfo sessionInfo,
ItemId itemId)
                     throws ItemNotFoundException, RepositoryException {
 
-                return AbstractJCR2SPITest.this.getItemInfos(sessionInfo, nodeId);
+                return AbstractJCR2SPITest.this.getItemInfos(sessionInfo, itemId);
             }
 
             public Iterator<ChildInfo> getChildInfos(SessionInfo sessionInfo, NodeId
parentId)
@@ -316,7 +316,7 @@ public abstract class AbstractJCR2SPITes
 
     public abstract NodeInfo getNodeInfo(SessionInfo sessionInfo, NodeId nodeId) throws RepositoryException;
 
-    public abstract Iterator<? extends ItemInfo> getItemInfos(SessionInfo sessionInfo,
NodeId nodeId) throws ItemNotFoundException, RepositoryException;
+    public abstract Iterator<? extends ItemInfo> getItemInfos(SessionInfo sessionInfo,
ItemId itemId) throws ItemNotFoundException, RepositoryException;
 
     public abstract Iterator<ChildInfo> getChildInfos(SessionInfo sessionInfo, NodeId
parentId) throws ItemNotFoundException, RepositoryException;
 

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java?rev=1158373&r1=1158372&r2=1158373&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java
Tue Aug 16 17:03:52 2011
@@ -16,11 +16,8 @@
  */
 package org.apache.jackrabbit.jcr2spi;
 
-import static org.apache.jackrabbit.spi.commons.iterator.Iterators.filterIterator;
-import static org.apache.jackrabbit.spi.commons.iterator.Iterators.iteratorChain;
-import static org.apache.jackrabbit.spi.commons.iterator.Iterators.singleton;
-
 import org.apache.jackrabbit.spi.ChildInfo;
+import org.apache.jackrabbit.spi.ItemId;
 import org.apache.jackrabbit.spi.ItemInfo;
 import org.apache.jackrabbit.spi.NodeId;
 import org.apache.jackrabbit.spi.NodeInfo;
@@ -39,9 +36,12 @@ import javax.jcr.Node;
 import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-
 import java.util.Iterator;
 
+import static org.apache.jackrabbit.spi.commons.iterator.Iterators.filterIterator;
+import static org.apache.jackrabbit.spi.commons.iterator.Iterators.iteratorChain;
+import static org.apache.jackrabbit.spi.commons.iterator.Iterators.singleton;
+
 /**
  * Test cases for {@link RepositoryService#getItemInfos(SessionInfo, NodeId)}. Specifically
  * for JCR-1797.
@@ -150,14 +150,14 @@ public class GetItemsTest extends Abstra
     }
 
     @Override
-    public Iterator<ItemInfo> getItemInfos(SessionInfo sessionInfo, final NodeId nodeId)
+    public Iterator<ItemInfo> getItemInfos(SessionInfo sessionInfo, final ItemId itemId)
             throws RepositoryException {
-
+        
         return iteratorChain(
-                singleton(itemInfoStore.getNodeInfo(nodeId)),
+                singleton(itemInfoStore.getItemInfo(itemId)),
                 filterIterator(itemInfoStore.getItemInfos(), new Predicate<ItemInfo>()
{
                     public boolean evaluate(ItemInfo info) {
-                        return !nodeId.equals(info.getId());
+                        return !itemId.equals(info.getId());
                     }
                 }));
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/benchmark/ReadPerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/benchmark/ReadPerformanceTest.java?rev=1158373&r1=1158372&r2=1158373&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/benchmark/ReadPerformanceTest.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/benchmark/ReadPerformanceTest.java
Tue Aug 16 17:03:52 2011
@@ -16,12 +16,9 @@
  */
 package org.apache.jackrabbit.jcr2spi.benchmark;
 
-import static org.apache.jackrabbit.spi.commons.iterator.Iterators.filterIterator;
-import static org.apache.jackrabbit.spi.commons.iterator.Iterators.iteratorChain;
-import static org.apache.jackrabbit.spi.commons.iterator.Iterators.singleton;
-
 import org.apache.jackrabbit.jcr2spi.AbstractJCR2SPITest;
 import org.apache.jackrabbit.spi.ChildInfo;
+import org.apache.jackrabbit.spi.ItemId;
 import org.apache.jackrabbit.spi.ItemInfo;
 import org.apache.jackrabbit.spi.ItemInfoCache;
 import org.apache.jackrabbit.spi.NodeId;
@@ -42,7 +39,6 @@ import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -51,6 +47,10 @@ import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.Callable;
 
+import static org.apache.jackrabbit.spi.commons.iterator.Iterators.filterIterator;
+import static org.apache.jackrabbit.spi.commons.iterator.Iterators.iteratorChain;
+import static org.apache.jackrabbit.spi.commons.iterator.Iterators.singleton;
+
 /**
  * Utility for testing jcr2spi read performance
  */
@@ -320,12 +320,12 @@ public class ReadPerformanceTest extends
     }
 
     @Override
-    public Iterator<? extends ItemInfo> getItemInfos(SessionInfo sessionInfo, NodeId
nodeId)
+    public Iterator<? extends ItemInfo> getItemInfos(SessionInfo sessionInfo, ItemId
itemId)
             throws ItemNotFoundException, RepositoryException {
 
         roundTripCount++;
-        NodeInfo nodeInfo = itemInfoStore.getNodeInfo(nodeId);
-        return iteratorChain(singleton(nodeInfo), getBatch());
+        ItemInfo itemInfo = itemInfoStore.getItemInfo(itemId);
+        return iteratorChain(singleton(itemInfo), getBatch());
     }
 
     @Override

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java?rev=1158373&r1=1158372&r2=1158373&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/logging/RepositoryServiceLogger.java
Tue Aug 16 17:03:52 2011
@@ -203,24 +203,14 @@ public class RepositoryServiceLogger ext
         }, "getPropertyDefinition(SessionInfo, PropertyId)", new Object[]{unwrap(sessionInfo),
propertyId});
     }
 
-    public NodeInfo getNodeInfo(final SessionInfo sessionInfo, final NodeId nodeId)
-            throws RepositoryException {
-
-        return (NodeInfo) execute(new Callable() {
-            public Object call() throws RepositoryException {
-                return service.getNodeInfo(unwrap(sessionInfo), nodeId);
-            }
-        }, "getNodeInfo(SessionInfo, NodeId)", new Object[]{unwrap(sessionInfo), nodeId});
-    }
-
-    public Iterator<? extends ItemInfo> getItemInfos(final SessionInfo sessionInfo,
final NodeId nodeId)
+    public Iterator<? extends ItemInfo> getItemInfos(final SessionInfo sessionInfo,
final ItemId itemId)
             throws RepositoryException {
 
         return (Iterator<? extends ItemInfo>) execute(new Callable() {
             public Object call() throws RepositoryException {
-                return service.getItemInfos(unwrap(sessionInfo), nodeId);
+                return service.getItemInfos(unwrap(sessionInfo), itemId);
             }
-        }, "getItemInfos(SessionInfo, NodeId)", new Object[]{unwrap(sessionInfo), nodeId});
+        }, "getItemInfos(SessionInfo, NodeId)", new Object[]{unwrap(sessionInfo), itemId});
     }
 
     public Iterator<ChildInfo> getChildInfos(final SessionInfo sessionInfo, final NodeId
parentId)
@@ -241,16 +231,6 @@ public class RepositoryServiceLogger ext
         }, "getReferences(SessionInfo, NodeId, Name, boolean)", new Object[]{unwrap(sessionInfo),
nodeId, propertyName, weakReferences});
     }
 
-    public PropertyInfo getPropertyInfo(final SessionInfo sessionInfo, final PropertyId propertyId)
-            throws RepositoryException {
-
-        return (PropertyInfo) execute(new Callable() {
-            public Object call() throws RepositoryException {
-                return service.getPropertyInfo(unwrap(sessionInfo), propertyId);
-            }
-        }, "getPropertyInfo(SessionInfo,PropertyId)", new Object[]{unwrap(sessionInfo), propertyId});
-    }
-
     public Batch createBatch(final SessionInfo sessionInfo, final ItemId itemId) throws RepositoryException
{
         return (Batch) execute(new Callable() {
             public Object call() throws RepositoryException {

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java?rev=1158373&r1=1158372&r2=1158373&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
Tue Aug 16 17:03:52 2011
@@ -249,42 +249,18 @@ public interface RepositoryService {
     public QPropertyDefinition getPropertyDefinition(SessionInfo sessionInfo, PropertyId
propertyId) throws RepositoryException;
 
     /**
-     * Retrieve the <code>NodeInfo</code> for the node identified by the given
-     * <code>NodeId</code>. See {@link #getItemInfos(SessionInfo, NodeId)} for
-     * a similar method that in addition may return <code>ItemInfo</code>s of
-     * children <code>Item</code>s.
-     *
-     * @param sessionInfo
-     * @param nodeId
-     * @return The <code>NodeInfo</code> for the node identified by the given
id.
-     * @throws javax.jcr.ItemNotFoundException
-     * @throws javax.jcr.RepositoryException
-     * @see javax.jcr.Session#getItem(String)
-     * @see javax.jcr.Node#getNode(String)
-     * @see javax.jcr.version.VersionHistory#getAllVersions()
-     * @see javax.jcr.version.VersionHistory#getVersion(String)
-     * @see javax.jcr.version.VersionHistory#getVersionByLabel(String)
-     * @see javax.jcr.version.VersionHistory#getRootVersion()
-     * @see javax.jcr.Node#getBaseVersion()
-     * @see javax.jcr.Node#getVersionHistory()
-     * @see javax.jcr.version.Version#getContainingHistory()
-     * @deprecated Use {@link #getItemInfos(SessionInfo, NodeId)} 
-     */
-    public NodeInfo getNodeInfo(SessionInfo sessionInfo, NodeId nodeId) throws ItemNotFoundException,
RepositoryException;
-
-    /**
      * Method used to 'batch-read' from the persistent storage. It returns the
-     * <code>NodeInfo</code> for the given <code>NodeId</code> as
the first
+     * <code>ItemInfo</code> for the given <code>ItemId</code> as
the first
      * element in the <code>Iterator</code>. In addition the iterator may contain
      * arbitrary <code>ItemInfo</code>s.
      *
      * @param sessionInfo
-     * @param nodeId
+     * @param itemId
      * @return An <code>Iterator</code> of <code>ItemInfo</code>s
containing
-     * at least a single element: the <code>NodeInfo</code> that represents
-     * the Node identified by the given <code>NodeId</code>. If the Iterator
-     * contains multiple elements, the first is expected to represent the Node
-     * identified by the given <code>NodeId</code>.
+     * at least a single element: the <code>ItemInfo</code> that represents
+     * the Item identified by the given <code>ItemId</code>. If the Iterator
+     * contains multiple elements, the first is expected to represent the Item
+     * identified by the given <code>ItemId</code>.
      * @throws javax.jcr.ItemNotFoundException
      * @throws javax.jcr.RepositoryException
      * @see javax.jcr.Session#getItem(String)
@@ -297,7 +273,7 @@ public interface RepositoryService {
      * @see javax.jcr.Node#getVersionHistory()
      * @see javax.jcr.version.Version#getContainingHistory()
      */
-    public Iterator<? extends ItemInfo> getItemInfos(SessionInfo sessionInfo, NodeId
nodeId) throws ItemNotFoundException, RepositoryException;
+    public Iterator<? extends ItemInfo> getItemInfos(SessionInfo sessionInfo, ItemId
itemId) throws ItemNotFoundException, RepositoryException;
 
     /**
      * Returns an Iterator of <code>ChildInfo</code>s present on the
@@ -336,21 +312,6 @@ public interface RepositoryService {
      */
     public Iterator<PropertyId> getReferences(SessionInfo sessionInfo, NodeId nodeId,
Name propertyName, boolean weakReferences) throws ItemNotFoundException, RepositoryException;
 
-    /**
-     * Returns the <code>PropertyInfo</code> for the <code>Property</code>
-     * identified by the given id.
-     *
-     * @param sessionInfo
-     * @param propertyId
-     * @return The <code>PropertyInfo</code> for the <code>Property</code>
-     * identified by the given id.
-     * @throws javax.jcr.ItemNotFoundException
-     * @throws javax.jcr.RepositoryException
-     * @see javax.jcr.Session#getItem(String)
-     * @see javax.jcr.Node#getProperty(String)
-     */
-    public PropertyInfo getPropertyInfo(SessionInfo sessionInfo, PropertyId propertyId) throws
ItemNotFoundException, RepositoryException;
-
     //-----------------------------------------------< general modification >---
     /**
      * Indicates the start of a set of operations that cause modifications



Mime
View raw message