jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1440458 - in /jackrabbit/branches/2.6: ./ jackrabbit-core/pom.xml jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java jackrabbit-jcr2dav/pom.xml jackrabbit-spi2jcr/pom.xml
Date Wed, 30 Jan 2013 15:16:00 GMT
Author: jukka
Date: Wed Jan 30 15:15:59 2013
New Revision: 1440458

URL: http://svn.apache.org/viewvc?rev=1440458&view=rev
Log:
2.6: Merged revision 1440456 (JCR-3493)

Modified:
    jackrabbit/branches/2.6/   (props changed)
    jackrabbit/branches/2.6/jackrabbit-core/pom.xml
    jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java
    jackrabbit/branches/2.6/jackrabbit-jcr2dav/pom.xml
    jackrabbit/branches/2.6/jackrabbit-spi2jcr/pom.xml

Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1440456

Modified: jackrabbit/branches/2.6/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/pom.xml?rev=1440458&r1=1440457&r2=1440458&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/pom.xml Wed Jan 30 15:15:59 2013
@@ -114,6 +114,8 @@ org.apache.jackrabbit.test.api.lock.Sess
 org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderMove
 org.apache.jackrabbit.core.data.ConcurrentGcTest#testDatabases
 org.apache.jackrabbit.core.data.GarbageCollectorTest#testCloseSessionWhileRunningGc
+org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testRightOuterJoin1<!--JCR-3493,
JCR-3498-->
+org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testLeftOuterJoin2<!--JCR-3493,
JCR-3498-->
               </value>
             </property>
             <property>

Modified: jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java?rev=1440458&r1=1440457&r2=1440458&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java
(original)
+++ jackrabbit/branches/2.6/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java
Wed Jan 30 15:15:59 2013
@@ -63,7 +63,7 @@ public class EquiJoinConditionTest exten
         JoinCondition c = qf.equiJoinCondition(
                 LEFT, propertyName1, RIGHT, propertyName2);
         QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER,
c);
-        checkQOM(qom, new Node[][]{{n1, n2}, {n2, n2}});
+        checkQOM(qom, new Node[][]{{null, n1}, {n1, n2}, {n2, n2}});
     }
 
     public void testRightOuterJoin2() throws RepositoryException {
@@ -85,6 +85,6 @@ public class EquiJoinConditionTest exten
         JoinCondition c = qf.equiJoinCondition(
                 LEFT, propertyName2, RIGHT, propertyName1);
         QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER,
c);
-        checkQOM(qom, new Node[][]{{n2, n1}, {n2, n2}});
+        checkQOM(qom, new Node[][]{{n1, null}, {n2, n1}, {n2, n2}});
     }
 }

Modified: jackrabbit/branches/2.6/jackrabbit-jcr2dav/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-jcr2dav/pom.xml?rev=1440458&r1=1440457&r2=1440458&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-jcr2dav/pom.xml (original)
+++ jackrabbit/branches/2.6/jackrabbit-jcr2dav/pom.xml Wed Jan 30 15:15:59 2013
@@ -96,6 +96,8 @@
                            No notification about changes to registered namespace(s) -->
                       
                       org.apache.jackrabbit.jcr2spi.name.NamespaceRegistryTest#testReRegisteredNamespace
                       org.apache.jackrabbit.jcr2spi.name.NamespaceRegistryTest#testReRegisteredNamespaceVisibility
+org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testRightOuterJoin1<!--JCR-3493,
JCR-3498-->
+org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testLeftOuterJoin2<!--JCR-3493,
JCR-3498-->
                   </value>
                 </property>
                 <property>

Modified: jackrabbit/branches/2.6/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-spi2jcr/pom.xml?rev=1440458&r1=1440457&r2=1440458&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/branches/2.6/jackrabbit-spi2jcr/pom.xml Wed Jan 30 15:15:59 2013
@@ -60,6 +60,8 @@
                 org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderMove
                 org.apache.jackrabbit.test.api.version.simple
                 org.apache.jackrabbit.test.api.LifecycleTest
+org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testRightOuterJoin1<!--JCR-3493,
JCR-3498-->
+org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testLeftOuterJoin2<!--JCR-3493,
JCR-3498-->
               </value>
             </property>
           </systemProperties>



Mime
View raw message