jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1164713 - in /jackrabbit/sandbox/jackrabbit-mk: jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ jackrabbit-spi-commons/src/main/java/org/apach...
Date Fri, 02 Sep 2011 21:19:00 GMT
Author: mduerig
Date: Fri Sep  2 21:18:59 2011
New Revision: 1164713

URL: http://svn.apache.org/viewvc?rev=1164713&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
clean up: remove deprecated api

Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathOrderByTest.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
Fri Sep  2 21:18:59 2011
@@ -337,14 +337,11 @@ public class NodeTypeImpl extends Abstra
     @Override
     public boolean canRemoveItem(String itemName) {
         try {
-            ent.checkRemoveItemConstraints(resolver().getQName(itemName));
-            return true;
-        } catch (NameException be) {
-            // implementation specific exception, fall through
+            Name qName = resolver().getQName(itemName);
+            return !(ent.hasRemoveNodeConstraint(qName) || ent.hasRemovePropertyConstraint(qName));
         } catch (RepositoryException re) {
-            // fall through
+            return false;
         }
-        return false;
     }
 
     /**

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/EventImpl.java
Fri Sep  2 21:18:59 2011
@@ -78,16 +78,6 @@ public class EventImpl implements Event,
 
     /**
      * Creates a new serializable event.
-     * @deprecated
-     */
-    public EventImpl(int type, Path path, ItemId itemId, NodeId parentId,
-                     Name primaryNodeTypeName, Name[] mixinTypeNames,
-                     String userId) {
-        this(type, path, itemId, parentId, primaryNodeTypeName, mixinTypeNames, userId, null,
Long.MIN_VALUE, Collections.EMPTY_MAP);
-    }
-
-    /**
-     * Creates a new serializable event.
      */
     public EventImpl(int type, Path path, ItemId itemId, NodeId parentId,
                      Name primaryNodeTypeName, Name[] mixinTypeNames,

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/ItemInfoImpl.java
Fri Sep  2 21:18:59 2011
@@ -42,21 +42,6 @@ public abstract class ItemInfoImpl imple
     /**
      * Creates a new item info from the given name, path and boolean flag.
      *
-     * @param parentId the parent id.
-     * @param name     the name of this item.
-     * @param path     the path to this item.
-     * @param isNode   if this item is a node.
-     * @deprecated Use {@link #ItemInfoImpl(Path, boolean)} instead. The
-     * parentId is not used any more and the corresponding getter has been
-     * removed.
-     */
-    public ItemInfoImpl(NodeId parentId, Name name, Path path, boolean isNode) {
-        this(path, isNode);
-    }
-    
-    /**
-     * Creates a new item info from the given name, path and boolean flag.
-     *
      * @param path     the path to this item.
      * @param isNode   if this item is a node.
      */

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/LockInfoImpl.java
Fri Sep  2 21:18:59 2011
@@ -69,21 +69,6 @@ public class LockInfoImpl implements Loc
      * @param lockOwner the lock owner
      * @param isDeep whether this lock is deep or not
      * @param isSessionScoped whether this lock is session scoped or not
-     * @param nodeId the node id of the locked node.
-     * @deprecated Use {@link #LockInfoImpl(String, String, boolean, boolean, long, boolean,
NodeId)} instaed.
-     */
-    public LockInfoImpl(String lockToken, String lockOwner, boolean isDeep,
-                        boolean isSessionScoped, NodeId nodeId) {
-        this(lockToken, lockOwner, isDeep, isSessionScoped, Long.MAX_VALUE, lockToken !=
null, nodeId);
-    }
-
-    /**
-     * Creates a new lock info for the given <code>lock</code> info.
-     *
-     * @param lockToken the lock token
-     * @param lockOwner the lock owner
-     * @param isDeep whether this lock is deep or not
-     * @param isSessionScoped whether this lock is session scoped or not
      * @param secondsRemaining Number of seconds until the lock timeout is reached.
      * @param isLockOwner <code>true</code> if the calling session is lock
      * owner; <code>false</code> otherwise.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/NodeInfoImpl.java
Fri Sep  2 21:18:59 2011
@@ -72,91 +72,6 @@ public class NodeInfoImpl extends ItemIn
     private final List<ChildInfo> childInfos;
 
     /**
-     * Creates a new serializable <code>NodeInfo</code> for the given
-     * <code>NodeInfo</code>.
-     *
-     * @param nodeInfo
-     */
-    public static NodeInfo createSerializableNodeInfo(
-            NodeInfo nodeInfo, final IdFactory idFactory) {
-        if (nodeInfo instanceof Serializable) {
-            return nodeInfo;
-        } else {
-            List<PropertyId> serRefs = new ArrayList<PropertyId>();
-            for (PropertyId ref : nodeInfo.getReferences()) {
-                NodeId parentId = ref.getParentId();
-                parentId = idFactory.createNodeId(
-                        parentId.getUniqueID(), parentId.getPath());
-                serRefs.add(idFactory.createPropertyId(parentId, ref.getName()));
-            }
-            NodeId nodeId = nodeInfo.getId();
-            nodeId = idFactory.createNodeId(nodeId.getUniqueID(), nodeId.getPath());
-            final Iterator<PropertyId> propIds = nodeInfo.getPropertyIds();
-            final Iterator<ChildInfo> childInfos = nodeInfo.getChildInfos();
-            return new NodeInfoImpl(nodeInfo.getPath(), nodeId,
-                    nodeInfo.getIndex(), nodeInfo.getNodetype(),
-                    nodeInfo.getMixins(), serRefs.iterator(),
-                    new Iterator<PropertyId>() {
-                        public boolean hasNext() {
-                            return propIds.hasNext();
-                        }
-                        public PropertyId next() {
-                            PropertyId propId = propIds.next();
-                            NodeId parentId = propId.getParentId();
-                            idFactory.createNodeId(
-                                    parentId.getUniqueID(), parentId.getPath());
-                            return idFactory.createPropertyId(
-                                    parentId, propId.getName());
-                        }
-                        public void remove() {
-                            throw new UnsupportedOperationException();
-                        }
-                    },
-                    ((childInfos == null) ? null :
-                    new Iterator<ChildInfo>() {
-                        public boolean hasNext() {
-                            return childInfos.hasNext();
-                        }
-                        public ChildInfo next() {
-                            ChildInfo cInfo = childInfos.next();
-                            if (cInfo instanceof Serializable) {
-                                return cInfo;
-                            } else {
-                                return new ChildInfoImpl(cInfo.getName(), cInfo.getUniqueID(),
cInfo.getIndex());
-                            }
-                        }
-                        public void remove() {
-                            throw new UnsupportedOperationException();
-                        }
-                    })
-            );
-        }
-    }
-
-    /**
-     * Creates a new node info from the given parameters.
-     *
-     * @param parentId        the parent id.
-     * @param name            the name of this item.
-     * @param path            the path to this item.
-     * @param id              the id of this item.
-     * @param index           the index of this item.
-     * @param primaryTypeName the name of the primary node type.
-     * @param mixinNames      the names of the assigned mixins.
-     * @param references      the references to this node.
-     * @param propertyIds     the properties of this node.
-     * @param childInfos      the child infos of this node or <code>null</code>.
-     * @deprecated Use {@link #NodeInfoImpl(Path, NodeId, int, Name, Name[], Iterator, Iterator,
Iterator)}
-     * instead. The parentId is not used any more.
-     */
-    public NodeInfoImpl(NodeId parentId, Name name, Path path, NodeId id,
-                        int index, Name primaryTypeName, Name[] mixinNames,
-                        Iterator<PropertyId> references, Iterator<PropertyId>
propertyIds,
-                        Iterator<ChildInfo> childInfos) {
-         this(path, id, index, primaryTypeName, mixinNames, references, propertyIds, childInfos);
-    }
-
-    /**
      * Creates a new node info from the given parameters.
      *
      * @param path            the path to this item.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/PropertyInfoImpl.java
Fri Sep  2 21:18:59 2011
@@ -77,25 +77,6 @@ public class PropertyInfoImpl extends It
     /**
      * Creates a new property info for the given parameters.
      *
-     * @param parentId      the parent id.
-     * @param name          the name of this property.
-     * @param path          the path to this property.
-     * @param id            the id of this property.
-     * @param type          the type of this property.
-     * @param isMultiValued whether this property is multi-valued.
-     * @param values        the values.
-     * @deprecated Use {@link #PropertyInfoImpl(Path, PropertyId, int, boolean, QValue[])}
-     * instead. The parentId is not used any more.
-     */
-    public PropertyInfoImpl(NodeId parentId, Name name, Path path,
-                            PropertyId id, int type, boolean isMultiValued,
-                            QValue[] values) {
-        this(path, id, type, isMultiValued, values);
-    }
-
-    /**
-     * Creates a new property info for the given parameters.
-     *
      * @param path          the path to this property.
      * @param id            the id of this property.
      * @param type          the type of this property.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/OrderQueryNode.java
Fri Sep  2 21:18:59 2011
@@ -130,18 +130,6 @@ public class OrderQueryNode extends Quer
     /**
      * Adds an order specification to this query node.
      *
-     * @param property  the name of the property.
-     * @param ascending if <code>true</code> values of this properties are
-     *                  ordered ascending; descending if <code>false</code>.
-     * @deprecated use {@link #addOrderSpec(Path , boolean)} instead.
-     */
-    public void addOrderSpec(Name property, boolean ascending) {
-        addOrderSpec(createPath(property), ascending);
-    }
-
-    /**
-     * Adds an order specification to this query node.
-     *
      * @param property  the relative path of the property.
      * @param ascending if <code>true</code> values of this properties are
      *                  ordered ascending; descending if <code>false</code>.
@@ -227,18 +215,6 @@ public class OrderQueryNode extends Quer
         /**
          * Creates a new <code>OrderSpec</code> for <code>property</code>.
          *
-         * @param property  the name of the property.
-         * @param ascending if <code>true</code> the property is ordered
-         *                  ascending, otherwise descending.
-         * @deprecated use {@link OrderSpec#OrderSpec(Path, boolean)} instead.
-         */
-        public OrderSpec(Name property, boolean ascending) {
-            this(createPath(property), ascending);
-        }
-
-        /**
-         * Creates a new <code>OrderSpec</code> for <code>property</code>.
-         *
          * @param property  the relative path of the property.
          * @param ascending if <code>true</code> the property is ordered
          *                  ascending, otherwise descending.
@@ -249,16 +225,6 @@ public class OrderQueryNode extends Quer
         }
 
         /**
-         * Returns the name of the property.
-         *
-         * @return the name of the property.
-         * @deprecated use {@link #getPropertyPath()} instead.
-         */
-        public Name getProperty() {
-            return property.getName();
-        }
-
-        /**
          * Returns the relative path of the property.
          *
          * @return the relative path of the property.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/TextsearchQueryNode.java
Fri Sep  2 21:18:59 2011
@@ -89,37 +89,6 @@ public class TextsearchQueryNode extends
     }
 
     /**
-     * Returns a property name if the scope is limited to just a single property
-     * or <code>null</code> if the scope is spawned across all properties of
a
-     * node. Please note that this method does not return the full relative path
-     * that reference the item to match, but only the name of the final name
-     * element of the path returned by {@link #getRelativePath()}.
-     *
-     * @return property name or <code>null</code>.
-     * @deprecated Use {@link #getRelativePath()} instead.
-     */
-    public Name getPropertyName() {
-        return relPath == null ? null : relPath.getName();
-    }
-
-    /**
-     * Sets a new name as the search scope for this fulltext query.
-     *
-     * @param property the name of the property.
-     * @deprecated Use {@link #setRelativePath(Path)} instead.
-     */
-    public void setPropertyName(Name property) {
-        PathBuilder builder = new PathBuilder();
-        builder.addLast(property);
-        try {
-            this.relPath = builder.getPath();
-            this.propertyRef = true;
-        } catch (MalformedPathException e) {
-            // path is always valid
-        }
-    }
-
-    /**
      * @return the relative path that references the item where the textsearch
      *         is performed. Returns <code>null</code> if the textsearch is
      *         performed on the context node.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/sql/JCRSQLQueryBuilder.java
Fri Sep  2 21:18:59 2011
@@ -528,10 +528,17 @@ public class JCRSQLQueryBuilder implemen
             }
         }, data);
 
-        OrderQueryNode.OrderSpec spec = new OrderQueryNode.OrderSpec(identifier[0], true);
-        order.addOrderSpec(spec);
-
-        node.childrenAccept(this, spec);
+        try {
+            PathBuilder builder = new PathBuilder();
+            builder.addLast(identifier[0]);
+            Path relPath = builder.getPath();
+            OrderQueryNode.OrderSpec spec = new OrderQueryNode.OrderSpec(relPath, true);
+            order.addOrderSpec(spec);
+            node.childrenAccept(this, spec);
+        }
+        catch (MalformedPathException e) {
+            // path is always valid
+        }
 
         return data;
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathQueryBuilder.java
Fri Sep  2 21:18:59 2011
@@ -661,7 +661,7 @@ public class XPathQueryBuilder implement
                     } else if (queryNode.getType() == QueryNode.TYPE_PATH) {
                         root.addSelectProperty(name);
                     } else if (queryNode.getType() == QueryNode.TYPE_ORDER) {
-                        root.getOrderNode().addOrderSpec(name, true);
+                        root.getOrderNode().addOrderSpec(PATH_FACTORY.create(name), true);
                     } else if (queryNode.getType() == QueryNode.TYPE_TEXTSEARCH) {
                         TextsearchQueryNode ts = (TextsearchQueryNode) queryNode;
                         ts.addPathElement(PATH_FACTORY.createElement(name));

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathOrderByTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathOrderByTest.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathOrderByTest.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/test/java/org/apache/jackrabbit/spi/commons/query/xpath/XPathOrderByTest.java
Fri Sep  2 21:18:59 2011
@@ -50,7 +50,7 @@ public class XPathOrderByTest extends Te
         OrderQueryNode.OrderSpec[] specs = root.getOrderNode().getOrderSpecs();
         assertEquals(1, specs.length);
         assertTrue(specs[0].isAscending());
-        checkName(Name.NS_DEFAULT_URI, "bar", specs[0].getProperty());
+        checkName(Name.NS_DEFAULT_URI, "bar", specs[0].getPropertyPath().getName());
         Path propPath = specs[0].getPropertyPath();
         assertEquals(1, propPath.getLength());
         checkName(Name.NS_DEFAULT_URI, "bar", propPath.getName());
@@ -79,7 +79,7 @@ public class XPathOrderByTest extends Te
         OrderQueryNode.OrderSpec[] specs = root.getOrderNode().getOrderSpecs();
         assertEquals(1, specs.length);
         assertTrue(specs[0].isAscending());
-        checkName(Name.NS_DEFAULT_URI, "bar", specs[0].getProperty());
+        checkName(Name.NS_DEFAULT_URI, "bar", specs[0].getPropertyPath().getName());
         Path propPath = specs[0].getPropertyPath();
         Path.Element[] elements = propPath.getElements();
         assertEquals(2, elements.length);

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java?rev=1164713&r1=1164712&r2=1164713&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java
(original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/NodeInfo.java
Fri Sep  2 21:18:59 2011
@@ -61,18 +61,6 @@ public interface NodeInfo extends ItemIn
     Name[] getMixins();
 
     /**
-     * Return the {@link PropertyId Id}s of the properties that are referencing the
-     * node based on this info object.
-     * 
-     * @return {@link PropertyId Id}s of the properties that are referencing the
-     * node based on this info object or an empty array if the node is not
-     * referenceable or no references exist.
-     * @see PropertyInfo#getId()
-     * @deprecated Use {@link RepositoryService#getReferences(SessionInfo, NodeId, Name,
boolean)} instead.
-     */
-    PropertyId[] getReferences();
-
-    /**
      * @return {@link PropertyId Id}s of children properties
      * @see PropertyInfo#getId()
      */



Mime
View raw message