jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r770735 - in /jackrabbit/trunk: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/ jackrabbit-spi-commons/src/main/java/org/apache/jack...
Date Fri, 01 May 2009 16:01:27 GMT
Author: jukka
Date: Fri May  1 16:01:27 2009
New Revision: 770735

URL: http://svn.apache.org/viewvc?rev=770735&view=rev
Log:
JCR-1104: JSR 283 support

Update method names to match JCR 2.0 PFD versions

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ChildNodeConstraint.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/DescendantNodeConstraint.java
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ChildNodeImpl.java
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ChildNodeConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ChildNodeConstraint.java?rev=770735&r1=770734&r2=770735&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ChildNodeConstraint.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/ChildNodeConstraint.java
Fri May  1 16:01:27 2009
@@ -41,7 +41,7 @@
      */
     public ChildNodeConstraint(ChildNodeImpl constraint,
                                SelectorImpl selector) {
-        super(constraint.getPath(), selector);
+        super(constraint.getParentPath(), selector);
     }
 
     /**

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/DescendantNodeConstraint.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/DescendantNodeConstraint.java?rev=770735&r1=770734&r2=770735&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/DescendantNodeConstraint.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/constraint/DescendantNodeConstraint.java
Fri May  1 16:01:27 2009
@@ -42,7 +42,7 @@
      */
     public DescendantNodeConstraint(DescendantNodeImpl constraint,
                                     SelectorImpl selector) {
-        super(constraint.getPath(), selector);
+        super(constraint.getAncestorPath(), selector);
     }
 
     /**

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java?rev=770735&r1=770734&r2=770735&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/query/qom/QueryObjectModelFactoryTest.java
Fri May  1 16:01:27 2009
@@ -123,7 +123,7 @@
     public void testChildNode() throws RepositoryException {
         ChildNode childNode = qomFactory.childNode(SELECTOR_NAME1, testRootNode.getPath());
         assertEquals("Wrong path", testRootNode.getPath(), childNode.getParentPath());
-        assertNull("Selector must be null", childNode.getSelectorName());
+        assertEquals("Wrong selector name", SELECTOR_NAME1, childNode.getSelectorName());
     }
 
     /**

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ChildNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ChildNodeImpl.java?rev=770735&r1=770734&r2=770735&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ChildNodeImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/ChildNodeImpl.java
Fri May  1 16:01:27 2009
@@ -64,7 +64,7 @@
      *
      * @return the path; non-null
      */
-    public String getPath() {
+    public String getParentPath() {
         return getJCRPath(path);
     }
 
@@ -86,11 +86,6 @@
         return path;
     }
 
-    public String getParentPath() {
-        // TODO
-        throw new RuntimeException("Not implemented yet - see JCR-2092");
-    }
-
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**

Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeImpl.java?rev=770735&r1=770734&r2=770735&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/DescendantNodeImpl.java
Fri May  1 16:01:27 2009
@@ -68,7 +68,7 @@
      *
      * @return the path; non-null
      */
-    public String getPath() {
+    public String getAncestorPath() {
         return getJCRPath(path);
     }
 
@@ -90,11 +90,6 @@
         return path;
     }
 
-    public String getAncestorPath() {
-        // TODO
-        throw new RuntimeException("Not implemented yet - see JCR-2092");
-    }
-
     //------------------------< AbstractQOMNode >-------------------------------
 
     /**



Mime
View raw message