svn commit: r164068 - in /incubator/jackrabbit/trunk/src: java/org/apache/jackrabbit/core/Constants.java java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionedChild.txt

[st...@apache.org]

Author: stefan
Date: Thu Apr 21 07:35:57 2005
New Revision: 164068

URL: http://svn.apache.org/viewcvs?rev=164068&view=rev
Log:
forgot to rename jcr:child to jcr:childVersionHistory as per spec 0.16.3

Modified:
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml
    incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java
    incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionedChild.txt

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java?rev=164068&r1=164067&r2=164068&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Constants.java Thu Apr 21 07:35:57 2005
@@ -182,9 +182,9 @@
     QName JCR_BASEVERSION = new QName(NS_JCR_URI, "baseVersion");
 
     /**
-     * jcr:child
+     * jcr:childVersionHistory
      */
-    QName JCR_CHILD = new QName(NS_JCR_URI, "child");
+    QName JCR_CHILDVERSIONHISTORY = new QName(NS_JCR_URI, "childVersionHistory");
 
     /**
      * jcr:rootVersion

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml?rev=164068&r1=164067&r2=164068&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/builtin_nodetypes.xml Thu Apr 21 07:35:57 2005
@@ -248,7 +248,7 @@
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <propertyDefinition name="jcr:child" requiredType="Reference" autoCreated="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false">
+        <propertyDefinition name="jcr:childVersionHistory" requiredType="Reference" autoCreated="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false">
             <valueConstraints>
                 <valueConstraint>nt:versionHistory</valueConstraint>
             </valueConstraints>

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java?rev=164068&r1=164067&r2=164068&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java Thu Apr 21 07:35:57 2005
@@ -215,8 +215,8 @@
                         id.getUUID(),
                         NT_VERSIONEDCHILD);
                 // IMO, this should be exposed aswell
-                // state.setPropertyValue(JCR_BASE_VERSION, InternalValue.create(UUID.fromString(fn.getBaseVersionId())));
-                state.setPropertyValue(JCR_CHILD, InternalValue.create(UUID.fromString(fn.getVersionHistoryId())));
+                // state.setPropertyValue(JCR_BASEVERSION, InternalValue.create(UUID.fromString(fn.getBaseVersionId())));
+                state.setPropertyValue(JCR_CHILDVERSIONHISTORY, InternalValue.create(UUID.fromString(fn.getVersionHistoryId())));
             } else {
                 // not found, throw
                 throw new NoSuchItemStateException(id.toString());

Modified: incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionedChild.txt
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionedChild.txt?rev=164068&r1=164067&r2=164068&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionedChild.txt (original)
+++ incubator/jackrabbit/trunk/src/test/org/apache/jackrabbit/test/api/nodetype/spec/nt-versionedChild.txt Thu Apr 21 07:35:57 2005
@@ -9,7 +9,7 @@
 PrimaryItemName
   null
 PropertyDefinition
-  Name jcr:child
+  Name jcr:childVersionHistory
   RequiredType REFERENCE
   ValueConstraints [nt:versionHistory]
   DefaultValues null