jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1356358 - in /jackrabbit/oak/trunk: oak-jcr/pom.xml oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java oak-parent/pom.xml
Date Mon, 02 Jul 2012 17:08:19 GMT
Author: jukka
Date: Mon Jul  2 17:08:18 2012
New Revision: 1356358

URL: http://svn.apache.org/viewvc?rev=1356358&view=rev
Log:
0.3: Switch back to Jackrabbit 2.6-SNAPSHOT

Modified:
    jackrabbit/oak/trunk/oak-jcr/pom.xml
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
    jackrabbit/oak/trunk/oak-parent/pom.xml

Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1356358&r1=1356357&r2=1356358&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Mon Jul  2 17:08:18 2012
@@ -33,8 +33,6 @@
 
   <properties>
     <known.issues>
-org.apache.jackrabbit.test.api.observation.NodeRemovedTest <!-- TODO: Remove when we're
back to 2.6-SNAPSHOT -->
-org.apache.jackrabbit.test.api.query.qom.GetQueryTest <!-- TODO: Remove when we're back
to 2.6-SNAPSHOT -->
 org.apache.jackrabbit.test.api.SessionTest#testMoveConstraintViolationExceptionSrc<!--OAK-132-->
 org.apache.jackrabbit.test.api.SessionTest#testMoveConstraintViolationExceptionDest<!--OAK-132-->
 org.apache.jackrabbit.test.api.SessionTest#testSaveConstraintViolationException

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java?rev=1356358&r1=1356357&r2=1356358&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeImpl.java
Mon Jul  2 17:08:18 2012
@@ -449,15 +449,8 @@ public class NodeImpl extends ItemImpl i
         checkStatus();
 
         Iterator<NodeDelegate> children = dlg.getChildren();
-        final long size = dlg.getChildCount();
-        return new NodeIteratorAdapter(nodeIterator(children)) {
-            @Override
-            public long getSize() {
-                return size;
-            }
-        };
-        // TODO: Restore the following when we're back on 2.6-SNAPSHOT
-        // return new NodeIteratorAdapter(nodeIterator(children), size);
+        long size = dlg.getChildCount();
+        return new NodeIteratorAdapter(nodeIterator(children), size);
     }
 
     @Override
@@ -521,15 +514,8 @@ public class NodeImpl extends ItemImpl i
         checkStatus();
 
         Iterator<PropertyDelegate> properties = dlg.getProperties();
-        final long size = dlg.getPropertyCount();
-        return new PropertyIteratorAdapter(propertyIterator(properties)) {
-            @Override
-            public long getSize() {
-                return size;
-            }
-        };
-        // TODO: Restore the following when we're back on 2.6-SNAPSHOT
-        // return new PropertyIteratorAdapter(propertyIterator(properties), size);
+        long size = dlg.getPropertyCount();
+        return new PropertyIteratorAdapter(propertyIterator(properties), size);
     }
 
     @Override

Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1356358&r1=1356357&r2=1356358&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Jul  2 17:08:18 2012
@@ -39,7 +39,7 @@
     <project.reporting.outputEncoding>
       ${project.build.sourceEncoding}
     </project.reporting.outputEncoding>
-    <jackrabbit.version>2.5.0</jackrabbit.version>
+    <jackrabbit.version>2.6-SNAPSHOT</jackrabbit.version>
   </properties>
 
   <issueManagement>



Mime
View raw message