jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1450193 - in /jackrabbit/oak/trunk: oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/TestContentLoader.java
Date Tue, 26 Feb 2013 14:45:07 GMT
Author: jukka
Date: Tue Feb 26 14:45:06 2013
New Revision: 1450193

URL: http://svn.apache.org/r1450193
Log:
OAK-657: Add oak:unstructured

More TCK trouble. Revert the rep:root change for now.

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/TestContentLoader.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd?rev=1450193&r1=1450192&r2=1450193&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/resources/org/apache/jackrabbit/oak/plugins/nodetype/write/builtin_nodetypes.cnd
Tue Feb 26 14:45:06 2013
@@ -512,7 +512,7 @@
 // J A C K R A B B I T   I N T E R N A L S
 //------------------------------------------------------------------------------
 
-[rep:root] > oak:unstructured
+[rep:root] > nt:unstructured
   + jcr:system (rep:system) = rep:system mandatory IGNORE
 
 [rep:system]

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/TestContentLoader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/TestContentLoader.java?rev=1450193&r1=1450192&r2=1450193&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/TestContentLoader.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/TestContentLoader.java
Tue Feb 26 14:45:06 2013
@@ -50,7 +50,8 @@ public class TestContentLoader {
 
         registerTestNodeTypes(session);
 
-        Node data = getOrAddNode(session.getRootNode(), "testdata", "nt:unstructured");
+        Node root = session.getRootNode();
+        Node data = getOrAddNode(root, "testdata");
         addPropertyTestData(getOrAddNode(data, "property"));
         addQueryTestData(getOrAddNode(data, "query"));
         addNodeTestData(getOrAddNode(data, "node"));
@@ -75,15 +76,6 @@ public class TestContentLoader {
         }
     }
 
-    private static Node getOrAddNode(Node node, String name, String type)
-            throws RepositoryException {
-        try {
-            return node.getNode(name);
-        } catch (PathNotFoundException e) {
-            return node.addNode(name, type);
-        }
-    }
-
     private static Node getOrAddNode(Node node, String name) throws RepositoryException {
         try {
             return node.getNode(name);



Mime
View raw message