You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2013/02/26 15:05:01 UTC
svn commit: r1450170 - 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/RepositoryTest.java
Author: jukka
Date: Tue Feb 26 14:05:01 2013
New Revision: 1450170
URL: http://svn.apache.org/r1450170
Log:
OAK-657: Add oak:unstructured
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/RepositoryTest.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=1450170&r1=1450169&r2=1450170&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:05:01 2013
@@ -263,6 +263,11 @@
- * (UNDEFINED)
+ * (nt:base) = nt:unstructured sns VERSION
+[oak:unstructured]
+ - * (UNDEFINED) multiple
+ - * (UNDEFINED)
+ + * (nt:base) = oak:unstructured VERSION
+
//------------------------------------------------------------------------------
// R E F E R E N C E A B L E
//------------------------------------------------------------------------------
@@ -507,7 +512,7 @@
// J A C K R A B B I T I N T E R N A L S
//------------------------------------------------------------------------------
-[rep:root] > nt:unstructured
+[rep:root] > oak: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/RepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java?rev=1450170&r1=1450169&r2=1450170&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java Tue Feb 26 14:05:01 2013
@@ -1651,8 +1651,8 @@ public class RepositoryTest extends Abst
@Test
public void setPrimaryType() throws RepositoryException {
Node testNode = getNode(TEST_PATH);
- assertEquals("nt:unstructured", testNode.getPrimaryNodeType().getName());
- assertEquals("nt:unstructured", testNode.getProperty("jcr:primaryType").getString());
+ assertEquals("oak:unstructured", testNode.getPrimaryNodeType().getName());
+ assertEquals("oak:unstructured", testNode.getProperty("jcr:primaryType").getString());
testNode.setPrimaryType("nt:folder");
getAdminSession().save();