jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r161260 [4/7] - in incubator/jackrabbit/trunk: ./ applications/test/ applications/test/repository/nodetypes/ contrib/orm-persistence/applications/test/ contrib/orm-persistence/applications/test/repository/nodetypes/ src/java/org/apache/jackrabbit/core/ src/java/org/apache/jackrabbit/core/lock/ src/java/org/apache/jackrabbit/core/nodetype/ src/java/org/apache/jackrabbit/core/nodetype/virtual/ src/java/org/apache/jackrabbit/core/nodetype/xml/ src/java/org/apache/jackrabbit/core/observation/ src/java/org/apache/jackrabbit/core/search/ src/java/org/apache/jackrabbit/core/search/lucene/ src/java/org/apache/jackrabbit/core/security/ src/java/org/apache/jackrabbit/core/util/ src/java/org/apache/jackrabbit/core/version/ src/java/org/apache/jackrabbit/core/virtual/ src/java/org/apache/jackrabbit/core/xml/ src/test/org/apache/jackrabbit/core/nodetype/xml/ src/test/org/apache/jackrabbit/core/observation/ src/test/org/apache/jackrabbit/core/search/ src/test/org/apache/jackrabbit/test/api/ src/test/org/apache/jackrabbit/test/api/lock/ src/test/org/apache/jackrabbit/test/api/nodetype/ src/test/org/apache/jackrabbit/test/api/nodetype/spec/ src/test/org/apache/jackrabbit/test/api/observation/ src/test/org/apache/jackrabbit/test/api/query/ src/test/org/apache/jackrabbit/test/api/version/
Date Thu, 14 Apr 2005 11:51:04 GMT
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?view=diff&r1=161259&r2=161260
==============================================================================
--- 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 14 04:50:38 2005
@@ -19,7 +19,7 @@
  -->
 <!DOCTYPE nodeTypes [
 	<!ELEMENT nodeTypes (nodeType)*>
-		<!ELEMENT nodeType (supertypes?|propertyDef*|childNodeDef*)>
+		<!ELEMENT nodeType (supertypes?|propertyDefinition*|childNodeDefinition*)>
 
 		<!ATTLIST nodeType
 			name CDATA #REQUIRED
@@ -30,11 +30,11 @@
 		<!ELEMENT supertypes (supertype+)>
 		<!ELEMENT supertype (CDATA)>
 
-		<!ELEMENT propertyDef (valueConstraints?|defaultValues?)>
-		<!ATTLIST propertyDef
+		<!ELEMENT propertyDefinition (valueConstraints?|defaultValues?)>
+		<!ATTLIST propertyDefinition
 			name CDATA #REQUIRED
 			requiredType (String|Date|Path|Name|Reference|Binary|Double|Long|Boolean|undefined) #REQUIRED
-			autoCreate (true|false) #REQUIRED
+			autoCreated (true|false) #REQUIRED
 			mandatory (true|false) #REQUIRED
 			onParentVersion (COPY|VERSION|INITIALIZE|COMPUTE|IGNORE|ABORT) #REQUIRED
 			protected (true|false) #REQUIRED
@@ -45,15 +45,15 @@
 		<!ELEMENT defaultValues (defaultValue+)>
 		<!ELEMENT defaultValue (CDATA)>
 
-		<!ELEMENT childNodeDef (requiredPrimaryTypes)>
-		<!ATTLIST childNodeDef
+		<!ELEMENT childNodeDefinition (requiredPrimaryTypes)>
+		<!ATTLIST childNodeDefinition
 			name CDATA #REQUIRED
 			defaultPrimaryType  CDATA #REQUIRED
-			autoCreate (true|false) #REQUIRED
+			autoCreated (true|false) #REQUIRED
 			mandatory (true|false) #REQUIRED
 			onParentVersion (COPY|VERSION|INITIALIZE|COMPUTE|IGNORE|ABORT) #REQUIRED
 			protected (true|false) #REQUIRED
-			sameNameSibs (true|false) #REQUIRED
+			sameNameSiblings (true|false) #REQUIRED
 		>
 		<!ELEMENT requiredPrimaryTypes (requiredPrimaryType+)>
 		<!ELEMENT requiredPrimaryType (CDATA)>
@@ -66,239 +66,238 @@
 
     <!-- primary types -->
     <nodeType name="nt:base" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
-        <propertyDef name="jcr:primaryType" requiredType="Name" autoCreate="true" mandatory="true" onParentVersion="COMPUTE" protected="true" multiple="false"/>
-        <propertyDef name="jcr:mixinTypes" requiredType="Name" autoCreate="false" mandatory="false" onParentVersion="COMPUTE" protected="true" multiple="true"/>
+        <propertyDefinition name="jcr:primaryType" requiredType="Name" autoCreated="true" mandatory="true" onParentVersion="COMPUTE" protected="true" multiple="false"/>
+        <propertyDefinition name="jcr:mixinTypes" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COMPUTE" protected="true" multiple="true"/>
     </nodeType>
     <nodeType name="nt:unstructured" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <childNodeDef name="*" defaultPrimaryType="nt:unstructured" autoCreate="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSibs="true">
+        <childNodeDefinition name="*" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSiblings="true">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:base</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
-        <propertyDef name="*" requiredType="undefined" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
-        <propertyDef name="*" requiredType="undefined" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+        </childNodeDefinition>
+        <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+        <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
     </nodeType>
     <nodeType name="nt:hierarchyNode" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <propertyDef name="jcr:created" requiredType="Date" autoCreate="true" mandatory="true" onParentVersion="INITIALIZE" protected="true" multiple="false"/>
+        <propertyDefinition name="jcr:created" requiredType="Date" autoCreated="true" mandatory="true" onParentVersion="INITIALIZE" protected="true" multiple="false"/>
     </nodeType>
     <nodeType name="nt:file" isMixin="false" hasOrderableChildNodes="false" primaryItemName="jcr:content">
         <supertypes>
             <supertype>nt:hierarchyNode</supertype>
         </supertypes>
-        <childNodeDef name="jcr:content" defaultPrimaryType="" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" sameNameSibs="false">
+        <childNodeDefinition name="jcr:content" defaultPrimaryType="" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:base</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
     <nodeType name="nt:linkedFile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="jcr:content">
         <supertypes>
             <supertype>nt:hierarchyNode</supertype>
         </supertypes>
-        <propertyDef name="jcr:content" requiredType="Reference" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:content" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
     </nodeType>
     <nodeType name="nt:folder" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:hierarchyNode</supertype>
         </supertypes>
-        <childNodeDef name="*" defaultPrimaryType="" autoCreate="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSibs="false">
+        <childNodeDefinition name="*" defaultPrimaryType="" autoCreated="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:hierarchyNode</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
     <nodeType name="nt:resource" isMixin="false" hasOrderableChildNodes="false" primaryItemName="jcr:data">
         <supertypes>
             <supertype>nt:base</supertype>
             <supertype>mix:referenceable</supertype>
         </supertypes>
-        <propertyDef name="jcr:encoding" requiredType="String" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:mimeType" requiredType="String" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:data" requiredType="Binary" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:lastModified" requiredType="Date" autoCreate="false" mandatory="true" onParentVersion="IGNORE" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:encoding" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:mimeType" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:data" requiredType="Binary" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:lastModified" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="IGNORE" protected="false" multiple="false"/>
     </nodeType>
     <nodeType name="nt:nodeType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <propertyDef name="jcr:nodeTypeName" requiredType="Name" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:supertypes" requiredType="Name" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="true"/>
-        <propertyDef name="jcr:isMixin" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:hasOrderableChildNodes" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:primaryItemName" requiredType="Name" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
-        <childNodeDef name="jcr:propertyDef" defaultPrimaryType="nt:propertyDef" autoCreate="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSibs="true">
+        <propertyDefinition name="jcr:nodeTypeName" requiredType="Name" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:supertypes" requiredType="Name" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="true"/>
+        <propertyDefinition name="jcr:isMixin" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:hasOrderableChildNodes" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:primaryItemName" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+        <childNodeDefinition name="jcr:propertyDefinition" defaultPrimaryType="nt:propertyDefinition" autoCreated="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSiblings="true">
             <requiredPrimaryTypes>
-                <requiredPrimaryType>nt:propertyDef</requiredPrimaryType>
+                <requiredPrimaryType>nt:propertyDefinition</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
-        <childNodeDef name="jcr:childNodeDef" defaultPrimaryType="nt:childNodeDef" autoCreate="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSibs="true">
+        </childNodeDefinition>
+        <childNodeDefinition name="jcr:childNodeDefinition" defaultPrimaryType="nt:childNodeDefinition" autoCreated="false" mandatory="false" onParentVersion="VERSION" protected="false" sameNameSiblings="true">
             <requiredPrimaryTypes>
-                <requiredPrimaryType>nt:childNodeDef</requiredPrimaryType>
+                <requiredPrimaryType>nt:childNodeDefinition</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
-    <nodeType name="nt:propertyDef" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <nodeType name="nt:propertyDefinition" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <propertyDef name="jcr:name" requiredType="Name" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:autoCreate" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:mandatory" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:onParentVersion" requiredType="String" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:protected" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:requiredType" requiredType="String" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:valueConstraints" requiredType="String" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
-        <propertyDef name="jcr:defaultValues" requiredType="undefined" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
-        <propertyDef name="jcr:multiple" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:name" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:autoCreated" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:mandatory" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:onParentVersion" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:protected" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:requiredType" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:valueConstraints" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+        <propertyDefinition name="jcr:defaultValues" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"/>
+        <propertyDefinition name="jcr:multiple" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
     </nodeType>
-    <nodeType name="nt:childNodeDef" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <nodeType name="nt:childNodeDefinition" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <propertyDef name="jcr:name" requiredType="Name" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:autoCreate" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:mandatory" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:onParentVersion" requiredType="String" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:protected" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:requiredPrimaryTypes" requiredType="Name" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="true">
+        <propertyDefinition name="jcr:name" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:autoCreated" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:mandatory" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:onParentVersion" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:protected" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:requiredPrimaryTypes" requiredType="Name" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="true">
             <defaultValues>
                 <defaultValue>nt:base</defaultValue>
             </defaultValues>
-        </propertyDef>
-        <propertyDef name="jcr:defaultPrimaryType" requiredType="Name" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:sameNameSibs" requiredType="Boolean" autoCreate="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
+        </propertyDefinition>
+        <propertyDefinition name="jcr:defaultPrimaryType" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:sameNameSiblings" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false"/>
     </nodeType>
     <nodeType name="nt:versionHistory" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
             <supertype>mix:referenceable</supertype>
         </supertypes>
-        <childNodeDef name="jcr:rootVersion" defaultPrimaryType="nt:version" autoCreate="true" mandatory="true" onParentVersion="ABORT" protected="true" sameNameSibs="false">
+        <childNodeDefinition name="jcr:rootVersion" defaultPrimaryType="nt:version" autoCreated="true" mandatory="true" onParentVersion="ABORT" protected="true" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:version</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
-        <childNodeDef name="jcr:versionLabels" defaultPrimaryType="nt:versionLabels" autoCreate="true" mandatory="true" onParentVersion="ABORT" protected="true" sameNameSibs="false">
+        </childNodeDefinition>
+        <childNodeDefinition name="jcr:versionLabels" defaultPrimaryType="nt:versionLabels" autoCreated="true" mandatory="true" onParentVersion="ABORT" protected="true" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:versionLabels</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
-        <childNodeDef name="*" defaultPrimaryType="nt:version" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSibs="false">
+        </childNodeDefinition>
+        <childNodeDefinition name="*" defaultPrimaryType="nt:version" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:version</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
     <nodeType name="nt:versionLabels" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <propertyDef name="*" requiredType="Reference" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="false">
+        <propertyDefinition name="*" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="false">
             <valueConstraints>
                 <valueConstraint>nt:version</valueConstraint>
             </valueConstraints>
-        </propertyDef>
+        </propertyDefinition>
     </nodeType>
     <nodeType name="nt:version" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
             <supertype>mix:referenceable</supertype>
         </supertypes>
-        <propertyDef name="jcr:created" requiredType="Date" autoCreate="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false"/>
-        <propertyDef name="jcr:predecessors" requiredType="Reference" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true">
+        <propertyDefinition name="jcr:created" requiredType="Date" autoCreated="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false"/>
+        <propertyDefinition name="jcr:predecessors" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true">
             <valueConstraints>
                 <valueConstraint>nt:version</valueConstraint>
             </valueConstraints>
-        </propertyDef>
-        <propertyDef name="jcr:successors" requiredType="Reference" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true">
+        </propertyDefinition>
+        <propertyDefinition name="jcr:successors" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true">
             <valueConstraints>
                 <valueConstraint>nt:version</valueConstraint>
             </valueConstraints>
-        </propertyDef>
-        <childNodeDef name="jcr:frozenNode" defaultPrimaryType="" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSibs="false">
+        </propertyDefinition>
+        <childNodeDefinition name="jcr:frozenNode" defaultPrimaryType="" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:frozenNode</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
     <nodeType name="nt:frozenNode" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
             <supertype>mix:referenceable</supertype>
         </supertypes>
-        <propertyDef name="jcr:frozenPrimaryType" requiredType="Name" autoCreate="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false"/>
-        <propertyDef name="jcr:frozenMixinTypes" requiredType="Name" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true"/>
-        <propertyDef name="jcr:frozenUuid" requiredType="String" autoCreate="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false"/>
-        <propertyDef name="*" requiredType="undefined" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="false"/>
-        <propertyDef name="*" requiredType="undefined" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true"/>
-        <childNodeDef name="*" defaultPrimaryType="" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSibs="true">
+        <propertyDefinition name="jcr:frozenPrimaryType" requiredType="Name" autoCreated="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false"/>
+        <propertyDefinition name="jcr:frozenMixinTypes" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true"/>
+        <propertyDefinition name="jcr:frozenUuid" requiredType="String" autoCreated="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false"/>
+        <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="false"/>
+        <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true"/>
+        <childNodeDefinition name="*" defaultPrimaryType="" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSiblings="true">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:base</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
     <nodeType name="nt:versionedChild" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <propertyDef name="jcr:child" requiredType="Reference" autoCreate="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false">
+        <propertyDefinition name="jcr:child" requiredType="Reference" autoCreated="true" mandatory="true" onParentVersion="ABORT" protected="true" multiple="false">
             <valueConstraints>
                 <valueConstraint>nt:versionHistory</valueConstraint>
             </valueConstraints>
-        </propertyDef>
+        </propertyDefinition>
     </nodeType>
     <nodeType name="nt:query" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <propertyDef name="jcr:statement" requiredType="String" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
-        <propertyDef name="jcr:language" requiredType="String" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:statement" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
+        <propertyDefinition name="jcr:language" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false"/>
     </nodeType>
 
     <!-- mixin types -->
     <nodeType name="mix:lockable" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
-        <propertyDef name="jcr:lockOwner" requiredType="String" autoCreate="false" mandatory="false" onParentVersion="IGNORE" protected="true" multiple="false"/>
-        <propertyDef name="jcr:lockIsDeep" requiredType="Boolean" autoCreate="false" mandatory="false" onParentVersion="IGNORE" protected="true" multiple="false"/>
+        <propertyDefinition name="jcr:lockOwner" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="true" multiple="false"/>
+        <propertyDefinition name="jcr:lockIsDeep" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="true" multiple="false"/>
     </nodeType>
     <nodeType name="mix:referenceable" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
-        <propertyDef name="jcr:uuid" requiredType="String" autoCreate="true" mandatory="true" onParentVersion="INITIALIZE" protected="true" multiple="false"/>
+        <propertyDefinition name="jcr:uuid" requiredType="String" autoCreated="true" mandatory="true" onParentVersion="INITIALIZE" protected="true" multiple="false"/>
     </nodeType>
     <nodeType name="mix:versionable" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>mix:referenceable</supertype>
         </supertypes>
         <!-- FIXME jsr-170 defines this property as being mandatory; currently set to non-mandatory as workaround for initialization issue -->
-        <propertyDef name="jcr:versionHistory" requiredType="Reference" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="true" multiple="false">
+        <propertyDefinition name="jcr:versionHistory" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="true" multiple="false">
             <valueConstraints>
                 <valueConstraint>nt:versionHistory</valueConstraint>
             </valueConstraints>
-        </propertyDef>
+        </propertyDefinition>
         <!-- FIXME jsr-170 defines this property as being mandatory; currently set to non-mandatory as workaround for initialization issue -->
-        <!-- FIXME jsr-170 defines this property as being autocreate; currently set to non-autocreate as workaround for initialization issue -->
-        <propertyDef name="jcr:baseVersion" requiredType="Reference" autoCreate="false" mandatory="false" onParentVersion="IGNORE" protected="true" multiple="false">
+        <propertyDefinition name="jcr:baseVersion" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="true" multiple="false">
             <valueConstraints>
                 <valueConstraint>nt:version</valueConstraint>
             </valueConstraints>
-        </propertyDef>
+        </propertyDefinition>
         <!-- FIXME jsr-170 defines this property as being mandatory; currently set to non-mandatory as workaround for initialization issue -->
-        <propertyDef name="jcr:isCheckedOut" requiredType="Boolean" autoCreate="true" mandatory="false" onParentVersion="IGNORE" protected="true" multiple="false">
+        <propertyDefinition name="jcr:isCheckedOut" requiredType="Boolean" autoCreated="true" mandatory="false" onParentVersion="IGNORE" protected="true" multiple="false">
             <defaultValues>
                 <defaultValue>true</defaultValue>
             </defaultValues>
-        </propertyDef>
+        </propertyDefinition>
         <!-- FIXME jsr-170 defines this property as being mandatory; currently set to non-mandatory as workaround for initialization issue -->
-        <propertyDef name="jcr:predecessors" requiredType="Reference" autoCreate="false" mandatory="false" onParentVersion="COPY" protected="true" multiple="true">
+        <propertyDefinition name="jcr:predecessors" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="true" multiple="true">
             <valueConstraints>
                 <valueConstraint>nt:version</valueConstraint>
             </valueConstraints>
-        </propertyDef>
-        <propertyDef name="jcr:mergeFailed" requiredType="Reference" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true" />
+        </propertyDefinition>
+        <propertyDefinition name="jcr:mergeFailed" requiredType="Reference" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" multiple="true" />
     </nodeType>
 
     <!-- internal node types -->
@@ -306,46 +305,46 @@
         <supertypes>
             <supertype>nt:unstructured</supertype>
         </supertypes>
-        <childNodeDef name="jcr:system" defaultPrimaryType="rep:system" autoCreate="false" mandatory="true" onParentVersion="IGNORE" protected="false" sameNameSibs="false">
+        <childNodeDefinition name="jcr:system" defaultPrimaryType="rep:system" autoCreated="false" mandatory="true" onParentVersion="IGNORE" protected="false" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>rep:system</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
     <nodeType name="rep:system" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <childNodeDef name="jcr:versionStorage" defaultPrimaryType="nt:unstructured" autoCreate="false" mandatory="true" onParentVersion="ABORT" protected="true" sameNameSibs="false">
+        <childNodeDefinition name="jcr:versionStorage" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="true" onParentVersion="ABORT" protected="true" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:base</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
-        <childNodeDef name="*" defaultPrimaryType="nt:unstructured" autoCreate="false" mandatory="false" onParentVersion="IGNORE" protected="false" sameNameSibs="true">
+        </childNodeDefinition>
+        <childNodeDefinition name="*" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="false" sameNameSiblings="true">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:base</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
     <nodeType name="rep:versionStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <childNodeDef name="*" defaultPrimaryType="nt:versionHistory" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSibs="true">
+        <childNodeDefinition name="*" defaultPrimaryType="nt:versionHistory" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSiblings="true">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:versionHistory</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
     <nodeType name="rep:nodeTypes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
         <supertypes>
             <supertype>nt:base</supertype>
         </supertypes>
-        <childNodeDef name="*" defaultPrimaryType="nt:nodeType" autoCreate="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSibs="false">
+        <childNodeDefinition name="*" defaultPrimaryType="nt:nodeType" autoCreated="false" mandatory="false" onParentVersion="ABORT" protected="true" sameNameSiblings="false">
             <requiredPrimaryTypes>
                 <requiredPrimaryType>nt:nodeType</requiredPrimaryType>
             </requiredPrimaryTypes>
-        </childNodeDef>
+        </childNodeDefinition>
     </nodeType>
 
     <!-- internal node types for persistent version manager -->

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java Thu Apr 14 04:50:38 2005
@@ -16,28 +16,27 @@
  */
 package org.apache.jackrabbit.core.nodetype.virtual;
 
-import org.apache.jackrabbit.core.virtual.VirtualNodeState;
-import org.apache.jackrabbit.core.virtual.AbstractVISProvider;
+import org.apache.jackrabbit.core.InternalValue;
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.InternalValue;
-import org.apache.jackrabbit.core.util.uuid.UUID;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.core.nodetype.ItemDef;
+import org.apache.jackrabbit.core.nodetype.NodeDef;
 import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.jackrabbit.core.nodetype.PropDef;
-import org.apache.jackrabbit.core.nodetype.ChildNodeDef;
 import org.apache.jackrabbit.core.nodetype.ValueConstraint;
-import org.apache.jackrabbit.core.nodetype.ChildItemDef;
 import org.apache.jackrabbit.core.state.ItemStateException;
 import org.apache.jackrabbit.core.state.NoSuchItemStateException;
+import org.apache.jackrabbit.core.util.uuid.UUID;
+import org.apache.jackrabbit.core.virtual.AbstractVISProvider;
+import org.apache.jackrabbit.core.virtual.VirtualNodeState;
 
-import javax.jcr.RepositoryException;
 import javax.jcr.PropertyType;
-import javax.jcr.nodetype.ItemDef;
+import javax.jcr.RepositoryException;
 import javax.jcr.version.OnParentVersionAction;
+import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.io.UnsupportedEncodingException;
 
 /**
  * This Class implements a virtual item state provider that exposes the
@@ -51,7 +50,6 @@
     private final String parentId;
 
     /**
-     *
      * @param ntReg
      * @param rootNodeId
      * @param parentId
@@ -63,13 +61,13 @@
 
     /**
      * {@inheritDoc}
-     *
+     * <p/>
      * currently we have no dynamic ones, we just recreate the entire nodetypes tree
      */
     protected VirtualNodeState createRootNodeState() throws RepositoryException {
         VirtualNodeState root = new VirtualNodeState(this, parentId, rootNodeId.getUUID(), REP_NODETYPES, null);
         QName[] ntNames = ntReg.getRegisteredNodeTypes();
-        for (int i=0; i<ntNames.length; i++) {
+        for (int i = 0; i < ntNames.length; i++) {
             NodeTypeDef ntDef = ntReg.getNodeTypeDef(ntNames[i]);
             VirtualNodeState ntState = createNodeTypeState(root, ntDef);
             root.addChildNodeEntry(ntNames[i], ntState.getUUID());
@@ -137,6 +135,7 @@
 
     /**
      * Creates a node type state
+     *
      * @param parent
      * @param ntDef
      * @return
@@ -157,18 +156,18 @@
 
         // add property defs
         PropDef[] propDefs = ntDef.getPropertyDefs();
-        for (int i=0; i<propDefs.length; i++) {
+        for (int i = 0; i < propDefs.length; i++) {
             VirtualNodeState pdState = createPropertyDefState(ntState, propDefs[i], ntDef, i);
-            ntState.addChildNodeEntry(JCR_PROPERTYDEF, pdState.getUUID());
+            ntState.addChildNodeEntry(JCR_PROPERTYDEFINITION, pdState.getUUID());
             // add as hard reference
             ntState.addStateReference(pdState);
         }
 
         // add child node defs
-        ChildNodeDef[] cnDefs = ntDef.getChildNodeDefs();
-        for (int i=0; i<cnDefs.length; i++) {
+        NodeDef[] cnDefs = ntDef.getChildNodeDefs();
+        for (int i = 0; i < cnDefs.length; i++) {
             VirtualNodeState cnState = createChildNodeDefState(ntState, cnDefs[i], ntDef, i);
-            ntState.addChildNodeEntry(JCR_CHILDNODEDEF, cnState.getUUID());
+            ntState.addChildNodeEntry(JCR_CHILDNODEDEFINITION, cnState.getUUID());
             // add as hard reference
             ntState.addStateReference(cnState);
         }
@@ -178,6 +177,7 @@
 
     /**
      * creates a node state for the given property def
+     *
      * @param parent
      * @param propDef
      * @return
@@ -187,13 +187,13 @@
                                                     PropDef propDef,
                                                     NodeTypeDef ntDef, int n)
             throws RepositoryException {
-        String uuid = calculateStableUUID(ntDef.getName().toString() + "/" + JCR_PROPERTYDEF.toString() + "/" + n);
-        VirtualNodeState pState = createNodeState(parent, JCR_PROPERTYDEF, uuid, NT_PROPERTYDEF);
+        String uuid = calculateStableUUID(ntDef.getName().toString() + "/" + JCR_PROPERTYDEFINITION.toString() + "/" + n);
+        VirtualNodeState pState = createNodeState(parent, JCR_PROPERTYDEFINITION, uuid, NT_PROPERTYDEFINITION);
         // add properties
-        if (!propDef.getName().equals(ChildItemDef.ANY_NAME)) {
+        if (!propDef.getName().equals(ItemDef.ANY_NAME)) {
             pState.setPropertyValue(JCR_NAME, InternalValue.create(propDef.getName()));
         }
-        pState.setPropertyValue(JCR_AUTOCREATE, InternalValue.create(propDef.isAutoCreate()));
+        pState.setPropertyValue(JCR_AUTOCREATED, InternalValue.create(propDef.isAutoCreated()));
         pState.setPropertyValue(JCR_MANDATORY, InternalValue.create(propDef.isMandatory()));
         pState.setPropertyValue(JCR_ONPARENTVERSION, InternalValue.create(OnParentVersionAction.nameFromValue(propDef.getOnParentVersion())));
         pState.setPropertyValue(JCR_PROTECTED, InternalValue.create(propDef.isProtected()));
@@ -202,7 +202,7 @@
         pState.setPropertyValues(JCR_DEFAULTVALUES, PropertyType.STRING, propDef.getDefaultValues());
         ValueConstraint[] vc = propDef.getValueConstraints();
         InternalValue[] vals = new InternalValue[vc.length];
-        for (int i=0; i<vc.length; i++) {
+        for (int i = 0; i < vc.length; i++) {
             vals[i] = InternalValue.create(vc[i].getDefinition());
         }
         pState.setPropertyValues(JCR_VALUECONSTRAINTS, PropertyType.STRING, vals);
@@ -211,22 +211,23 @@
 
     /**
      * creates a node state for the given child node def
+     *
      * @param parent
      * @param cnDef
      * @return
      * @throws RepositoryException
      */
     private VirtualNodeState createChildNodeDefState(VirtualNodeState parent,
-                                                     ChildNodeDef cnDef,
+                                                     NodeDef cnDef,
                                                      NodeTypeDef ntDef, int n)
             throws RepositoryException {
-        String uuid = calculateStableUUID(ntDef.getName().toString() + "/" + JCR_CHILDNODEDEF.toString() + "/" + n);
-        VirtualNodeState pState = createNodeState(parent, JCR_CHILDNODEDEF, uuid, NT_CHILDNODEDEF);
+        String uuid = calculateStableUUID(ntDef.getName().toString() + "/" + JCR_CHILDNODEDEFINITION.toString() + "/" + n);
+        VirtualNodeState pState = createNodeState(parent, JCR_CHILDNODEDEFINITION, uuid, NT_CHILDNODEDEFINITION);
         // add properties
-        if (!cnDef.getName().equals(ChildItemDef.ANY_NAME)) {
+        if (!cnDef.getName().equals(ItemDef.ANY_NAME)) {
             pState.setPropertyValue(JCR_NAME, InternalValue.create(cnDef.getName()));
         }
-        pState.setPropertyValue(JCR_AUTOCREATE, InternalValue.create(cnDef.isAutoCreate()));
+        pState.setPropertyValue(JCR_AUTOCREATED, InternalValue.create(cnDef.isAutoCreated()));
         pState.setPropertyValue(JCR_MANDATORY, InternalValue.create(cnDef.isMandatory()));
         pState.setPropertyValue(JCR_ONPARENTVERSION, InternalValue.create(OnParentVersionAction.nameFromValue(cnDef.getOnParentVersion())));
         pState.setPropertyValue(JCR_PROTECTED, InternalValue.create(cnDef.isProtected()));
@@ -234,18 +235,18 @@
         if (cnDef.getDefaultPrimaryType() != null) {
             pState.setPropertyValue(JCR_DEFAULTPRIMARYTYPE, InternalValue.create(cnDef.getDefaultPrimaryType()));
         }
-        pState.setPropertyValue(JCR_SAMENAMESIBS, InternalValue.create(cnDef.allowSameNameSibs()));
+        pState.setPropertyValue(JCR_SAMENAMESIBLINGS, InternalValue.create(cnDef.allowsSameNameSiblings()));
         return pState;
     }
-    
+
     /**
      * Calclulates a stable uuid out of the given string. The alogrith does a
      * MD5 digest from the string an converts it into the uuid format.
-     * 
+     *
      * @param name
      * @return
      * @throws RepositoryException
-     */ 
+     */
     private static String calculateStableUUID(String name) throws RepositoryException {
         try {
             MessageDigest md = MessageDigest.getInstance("MD5");

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/Constants.java Thu Apr 14 04:50:38 2005
@@ -28,10 +28,10 @@
     public static final String NODETYPE_ELEMENT = "nodeType";
 
     /** Name of the child node definition element. */
-    public static final String CHILDNODEDEF_ELEMENT = "childNodeDef";
+    public static final String CHILDNODEDEFINITION_ELEMENT = "childNodeDefinition";
 
     /** Name of the property definition element. */
-    public static final String PROPERTYDEF_ELEMENT = "propertyDef";
+    public static final String PROPERTYDEFINITION_ELEMENT = "propertyDefinition";
 
     /** Name of the <code>isMixin</code> attribute. */
     public static final String ISMIXIN_ATTRIBUTE = "isMixin";
@@ -52,8 +52,8 @@
     /** Name of the <code>name</code> attribute. */
     public static final String NAME_ATTRIBUTE = "name";
 
-    /** Name of the <code>autoCreate</code> attribute. */
-    public static final String AUTOCREATE_ATTRIBUTE = "autoCreate";
+    /** Name of the <code>autoCreated</code> attribute. */
+    public static final String AUTOCREATED_ATTRIBUTE = "autoCreated";
 
     /** Name of the <code>mandatory</code> attribute. */
     public static final String MANDATORY_ATTRIBUTE = "mandatory";
@@ -94,7 +94,7 @@
     public static final String DEFAULTPRIMARYTYPE_ATTRIBUTE =
         "defaultPrimaryType";
 
-    /** Name of the <code>sameNameSibs</code> attribute. */
-    public static final String SAMENAMESIBS_ATTRIBUTE = "sameNameSibs";
+    /** Name of the <code>sameNameSiblings</code> attribute. */
+    public static final String SAMENAMESIBLINGS_ATTRIBUTE = "sameNameSiblings";
 
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java Thu Apr 14 04:50:38 2005
@@ -29,7 +29,7 @@
 import org.apache.jackrabbit.core.NamespaceResolver;
 import org.apache.jackrabbit.core.QName;
 import org.apache.jackrabbit.core.UnknownPrefixException;
-import org.apache.jackrabbit.core.nodetype.ChildNodeDef;
+import org.apache.jackrabbit.core.nodetype.NodeDef;
 import org.apache.jackrabbit.core.nodetype.InvalidConstraintException;
 import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
 import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
@@ -153,7 +153,7 @@
 
         // property definitions
         Vector properties = new Vector();
-        while (walker.iterateElements(Constants.PROPERTYDEF_ELEMENT)) {
+        while (walker.iterateElements(Constants.PROPERTYDEFINITION_ELEMENT)) {
             PropDef def = getPropDef();
             def.setDeclaringNodeType(type.getName());
             properties.add(def);
@@ -163,13 +163,13 @@
 
         // child node definitions
         Vector nodes = new Vector();
-        while (walker.iterateElements(Constants.CHILDNODEDEF_ELEMENT)) {
-            ChildNodeDef def = getChildNodeDef();
+        while (walker.iterateElements(Constants.CHILDNODEDEFINITION_ELEMENT)) {
+            NodeDef def = getChildNodeDef();
             def.setDeclaringNodeType(type.getName());
             nodes.add(def);
         }
-        type.setChildNodeDefs((ChildNodeDef[])
-                nodes.toArray(new ChildNodeDef[nodes.size()]));
+        type.setChildNodeDefs((NodeDef[])
+                nodes.toArray(new NodeDef[nodes.size()]));
 
         return type;
     }
@@ -196,8 +196,8 @@
         }
 
         // simple attributes
-        def.setAutoCreate(Boolean.valueOf(
-                walker.getAttribute(Constants.AUTOCREATE_ATTRIBUTE))
+        def.setAutoCreated(Boolean.valueOf(
+                walker.getAttribute(Constants.AUTOCREATED_ATTRIBUTE))
                 .booleanValue());
         def.setMandatory(Boolean.valueOf(
                 walker.getAttribute(Constants.MANDATORY_ATTRIBUTE))
@@ -265,10 +265,10 @@
      * @throws UnknownPrefixException      if the definition contains an
      *                                     unknown namespace prefix
      */
-    private ChildNodeDef getChildNodeDef()
+    private NodeDef getChildNodeDef()
             throws InvalidNodeTypeDefException, IllegalNameException,
             UnknownPrefixException {
-        ChildNodeDef def = new ChildNodeDef();
+        NodeDef def = new NodeDef();
         String name = walker.getAttribute(Constants.NAME_ATTRIBUTE);
         if (name.equals("*")) {
             def.setName(new QName("", "*"));
@@ -277,8 +277,8 @@
         }
 
         // simple attributes
-        def.setAutoCreate(Boolean.valueOf(
-                walker.getAttribute(Constants.AUTOCREATE_ATTRIBUTE))
+        def.setAutoCreated(Boolean.valueOf(
+                walker.getAttribute(Constants.AUTOCREATED_ATTRIBUTE))
                 .booleanValue());
         def.setMandatory(Boolean.valueOf(
                 walker.getAttribute(Constants.MANDATORY_ATTRIBUTE))
@@ -286,8 +286,10 @@
         def.setProtected(Boolean.valueOf(
                 walker.getAttribute(Constants.PROTECTED_ATTRIBUTE))
                 .booleanValue());
-        def.setAllowSameNameSibs(Boolean.valueOf(
-                walker.getAttribute(Constants.SAMENAMESIBS_ATTRIBUTE))
+        def.setOnParentVersion(OnParentVersionAction.valueFromName(
+                walker.getAttribute(Constants.ONPARENTVERSION_ATTRIBUTE)));
+        def.setAllowsSameNameSiblings(Boolean.valueOf(
+                walker.getAttribute(Constants.SAMENAMESIBLINGS_ATTRIBUTE))
                 .booleanValue());
 
         // default primary type

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java Thu Apr 14 04:50:38 2005
@@ -29,7 +29,7 @@
 import org.apache.jackrabbit.core.NamespaceResolver;
 import org.apache.jackrabbit.core.NoPrefixDeclaredException;
 import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.nodetype.ChildNodeDef;
+import org.apache.jackrabbit.core.nodetype.NodeDef;
 import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
 import org.apache.jackrabbit.core.nodetype.PropDef;
 import org.apache.jackrabbit.core.nodetype.ValueConstraint;
@@ -153,7 +153,7 @@
         }
 
         // child node definitions
-        ChildNodeDef[] nodes = def.getChildNodeDefs();
+        NodeDef[] nodes = def.getChildNodeDefs();
         for (int i = 0; i < nodes.length; i++) {
             addChildNodeDef(nodes[i]);
         }
@@ -172,13 +172,13 @@
      */
     private void addPropDef(PropDef def)
             throws RepositoryException, NoPrefixDeclaredException {
-        builder.startElement(Constants.PROPERTYDEF_ELEMENT);
+        builder.startElement(Constants.PROPERTYDEFINITION_ELEMENT);
 
         // simple attributes
         builder.setAttribute(
                 Constants.NAME_ATTRIBUTE, def.getName().toJCRName(resolver));
         builder.setAttribute(
-                Constants.AUTOCREATE_ATTRIBUTE, def.isAutoCreate());
+                Constants.AUTOCREATED_ATTRIBUTE, def.isAutoCreated());
         builder.setAttribute(
                 Constants.MANDATORY_ATTRIBUTE, def.isMandatory());
         builder.setAttribute(
@@ -226,15 +226,15 @@
      * @throws NoPrefixDeclaredException if the child node definition contains
      *                                   invalid namespace references
      */
-    private void addChildNodeDef(ChildNodeDef def)
+    private void addChildNodeDef(NodeDef def)
             throws NoPrefixDeclaredException {
-        builder.startElement(Constants.CHILDNODEDEF_ELEMENT);
+        builder.startElement(Constants.CHILDNODEDEFINITION_ELEMENT);
 
         // simple attributes
         builder.setAttribute(
                 Constants.NAME_ATTRIBUTE, def.getName().toJCRName(resolver));
         builder.setAttribute(
-                Constants.AUTOCREATE_ATTRIBUTE, def.isAutoCreate());
+                Constants.AUTOCREATED_ATTRIBUTE, def.isAutoCreated());
         builder.setAttribute(
                 Constants.MANDATORY_ATTRIBUTE, def.isMandatory());
         builder.setAttribute(
@@ -243,7 +243,7 @@
                 Constants.ONPARENTVERSION_ATTRIBUTE,
                 OnParentVersionAction.nameFromValue(def.getOnParentVersion()));
         builder.setAttribute(
-                Constants.SAMENAMESIBS_ATTRIBUTE, def.allowSameNameSibs());
+                Constants.SAMENAMESIBLINGS_ATTRIBUTE, def.allowsSameNameSiblings());
 
         // default primary type
         QName type = def.getDefaultPrimaryType();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventImpl.java Thu Apr 14 04:50:38 2005
@@ -102,7 +102,7 @@
     /**
      * {@inheritDoc}
      */
-    public String getUserId() {
+    public String getUserID() {
         return eventState.getUserId();
     }
 
@@ -142,7 +142,7 @@
                 sb.append("[Error retrieving path]");
             }
             sb.append(", ").append(EventState.valueOf(getType())).append(": ");
-            sb.append(", UserId: ").append(getUserId());
+            sb.append(", UserId: ").append(getUserID());
             stringValue = sb.toString();
         }
         return stringValue;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventListenerIteratorImpl.java Thu Apr 14 04:50:38 2005
@@ -110,7 +110,7 @@
     /**
      * {@inheritDoc}
      */
-    public long getPos() {
+    public long getPosition() {
         return pos;
     }
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/EventState.java Thu Apr 14 04:50:38 2005
@@ -319,7 +319,7 @@
      * {@inheritDoc}
      */
     public String getUserId() {
-        return session.getUserId();
+        return session.getUserID();
     }
 
     /**
@@ -344,7 +344,7 @@
             sb.append("EventState: ").append(valueOf(type));
             sb.append(", Parent: ").append(parentUUID);
             sb.append(", Child: ").append(childRelPath);
-            sb.append(", UserId: ").append(session.getUserId());
+            sb.append(", UserId: ").append(session.getUserID());
             stringValue = sb.toString();
         }
         return stringValue;

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observation/FilteredEventIterator.java Thu Apr 14 04:50:38 2005
@@ -117,7 +117,7 @@
     /**
      * {@inheritDoc}
      */
-    public long getPos() {
+    public long getPosition() {
         return pos;
     }
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/repository.properties
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/repository.properties?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/repository.properties (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/repository.properties Thu Apr 14 04:50:38 2005
@@ -19,7 +19,7 @@
 #
 
 # The descriptor for the version of the specification that this repository implements.
-jcr.specification.version = 0.16.2
+jcr.specification.version = 0.16.4
 
 # The descriptor for the name of the specification that this repository implements.
 jcr.specification.name = Content Repository API for Java(TM) Technology Specification
@@ -34,7 +34,7 @@
 jcr.repository.name = Jackrabbit
 
 # The descriptor for the version of this repository implementation.
-jcr.repository.version = 0.16.2
+jcr.repository.version = 0.16.4
 
 ################################################################################
 # Repository features and support information
@@ -67,12 +67,4 @@
 
 # The presence of this key indicates that XPath queries return results in document order.
 query.xpath.doc.order = true
-
-# The presence of this key indicates that SQL queries can SELECT the pseudo-property 'jcr:path'
-query.jcrpath = true
-
-# The presence of this key indicates that the 'jcr:score' pseudo-property is
-# available in XPath and SQL queries that include a 'jcrfn:contains'
-# (in XPath) or 'CONTAINS' (in SQL) function to do a full-text search.
-query.jcrscore = true
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/QueryImpl.java Thu Apr 14 04:50:38 2005
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.core.search;
 
+import org.apache.jackrabbit.core.Constants;
 import org.apache.jackrabbit.core.ItemManager;
 import org.apache.jackrabbit.core.MalformedPathException;
 import org.apache.jackrabbit.core.NamespaceResolver;
 import org.apache.jackrabbit.core.NoPrefixDeclaredException;
 import org.apache.jackrabbit.core.Path;
 import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.core.Constants;
 
 import javax.jcr.ItemExistsException;
 import javax.jcr.ItemNotFoundException;
@@ -149,7 +149,8 @@
     /**
      * {@inheritDoc}
      */
-    public String getPersistentQueryPath() throws ItemNotFoundException, RepositoryException {
+    public String getStoredQueryPath()
+            throws ItemNotFoundException, RepositoryException {
         if (node == null) {
             throw new ItemNotFoundException("not a persistent query");
         }
@@ -159,7 +160,7 @@
     /**
      * {@inheritDoc}
      */
-    public void save(String absPath)
+    public Node storeAsNode(String absPath)
             throws ItemExistsException,
             PathNotFoundException,
             VersionException,
@@ -171,15 +172,15 @@
             NamespaceResolver resolver = session.getNamespaceResolver();
             Path p = Path.create(absPath, resolver, true);
             if (!p.isAbsolute()) {
-                throw new RepositoryException(absPath + " is not an absolut path");
+                throw new RepositoryException(absPath + " is not an absolute path");
             }
-            if (!session.getRootNode().hasNode(p.getAncestor(1).toJCRPath(resolver).substring(1))) {
+            if (session.itemExists(absPath)) {
+                throw new ItemExistsException(absPath);
+            }
+            if (!session.itemExists(p.getAncestor(1).toJCRPath(resolver))) {
                 throw new PathNotFoundException(p.getAncestor(1).toJCRPath(resolver));
             }
             String relPath = p.toJCRPath(resolver).substring(1);
-            if (session.getRootNode().hasNode(relPath)) {
-                throw new ItemExistsException(p.toJCRPath(resolver));
-            }
             Node queryNode = session.getRootNode().addNode(relPath,
                     Constants.NT_QUERY.toJCRName(resolver));
             // set properties
@@ -188,6 +189,7 @@
             // todo this should be changed in the spec some time!
             queryNode.getParent().save();
             node = queryNode;
+            return node;
         } catch (MalformedPathException e) {
             throw new RepositoryException(e.getMessage(), e);
         } catch (NoPrefixDeclaredException e) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DocOrderNodeIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DocOrderNodeIteratorImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DocOrderNodeIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/DocOrderNodeIteratorImpl.java Thu Apr 14 04:50:38 2005
@@ -145,8 +145,8 @@
     /**
      * {@inheritDoc}
      */
-    public long getPos() {
-        return orderedNodes.getPos();
+    public long getPosition() {
+        return orderedNodes.getPosition();
     }
 
     /**

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/NodeIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/NodeIteratorImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/NodeIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/NodeIteratorImpl.java Thu Apr 14 04:50:38 2005
@@ -112,7 +112,7 @@
      * Returns the current position in this <code>NodeIterator</code>.
      * @return the current position in this <code>NodeIterator</code>.
      */
-    public long getPos() {
+    public long getPosition() {
         return pos;
     }
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryImpl.java Thu Apr 14 04:50:38 2005
@@ -21,9 +21,8 @@
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.QName;
 import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.core.security.AccessManager;
 import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
-import org.apache.jackrabbit.core.nodetype.PropertyDefImpl;
+import org.apache.jackrabbit.core.nodetype.PropertyDefinitionImpl;
 import org.apache.jackrabbit.core.search.DefaultQueryNodeVisitor;
 import org.apache.jackrabbit.core.search.ExecutableQuery;
 import org.apache.jackrabbit.core.search.LocationStepQueryNode;
@@ -32,12 +31,13 @@
 import org.apache.jackrabbit.core.search.PropertyTypeRegistry;
 import org.apache.jackrabbit.core.search.QueryParser;
 import org.apache.jackrabbit.core.search.QueryRootNode;
+import org.apache.jackrabbit.core.security.AccessManager;
 import org.apache.log4j.Logger;
 import org.apache.lucene.search.Hits;
 import org.apache.lucene.search.Query;
 
 import javax.jcr.RepositoryException;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.PropertyDefinition;
 import javax.jcr.query.InvalidQueryException;
 import javax.jcr.query.QueryResult;
 import java.io.IOException;
@@ -178,11 +178,12 @@
                 ntName[0] = Constants.NT_BASE;
             }
             NodeTypeImpl nt = session.getNodeTypeManager().getNodeType(ntName[0]);
-            PropertyDef[] propDefs = (PropertyDef[]) nt.getPropertyDefs();
+            PropertyDefinition[] propDefs =
+                    (PropertyDefinition[]) nt.getPropertyDefinitions();
             List tmp = new ArrayList();
             for (int i = 0; i < propDefs.length; i++) {
                 if (!propDefs[i].isMultiple()) {
-                    tmp.add(((PropertyDefImpl) propDefs[i]).getQName());
+                    tmp.add(((PropertyDefinitionImpl) propDefs[i]).getQName());
                 }
             }
             selectProps = (QName[]) tmp.toArray(new QName[tmp.size()]);

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryResultImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryResultImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryResultImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/QueryResultImpl.java Thu Apr 14 04:50:38 2005
@@ -95,7 +95,7 @@
     /**
      * {@inheritDoc}
      */
-    public String[] getPropertyNames() throws RepositoryException {
+    public String[] getColumnNames() throws RepositoryException {
         try {
             String[] propNames = new String[selectProps.length];
             for (int i = 0; i < selectProps.length; i++) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/RowIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/RowIteratorImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/RowIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/lucene/RowIteratorImpl.java Thu Apr 14 04:50:38 2005
@@ -105,8 +105,8 @@
      *
      * @return the current position withing this iterator.
      */
-    public long getPos() {
-        return nodes.getPos();
+    public long getPosition() {
+        return nodes.getPosition();
     }
 
     /**
@@ -171,7 +171,7 @@
         /**
          * Returns an array of all the values in the same order as the property
          * names (column names) returned by
-         * {@link javax.jcr.query.QueryResult#getPropertyNames()}.
+         * {@link javax.jcr.query.QueryResult#getColumnNames()}.
          *
          * @return a <code>Value</code> array.
          * @throws RepositoryException if an error occurs while retrieving the

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/CredentialsCallbackHandler.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/CredentialsCallbackHandler.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/CredentialsCallbackHandler.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/CredentialsCallbackHandler.java Thu Apr 14 04:50:38 2005
@@ -16,8 +16,6 @@
  */
 package org.apache.jackrabbit.core.security;
 
-import org.apache.log4j.Logger;
-
 import javax.jcr.Credentials;
 import javax.jcr.SimpleCredentials;
 import javax.security.auth.callback.Callback;
@@ -32,8 +30,6 @@
  */
 public class CredentialsCallbackHandler implements CallbackHandler {
 
-    private static Logger log = Logger.getLogger(CredentialsCallbackHandler.class);
-
     protected final Credentials credentials;
 
     /**
@@ -61,7 +57,7 @@
                 NameCallback ncb = (NameCallback) callbacks[i];
                 SimpleCredentials sc = (SimpleCredentials) credentials;
                 // supply name
-                ncb.setName(sc.getUserId());
+                ncb.setName(sc.getUserID());
             } else if (callbacks[i] instanceof PasswordCallback
                     && credentials instanceof SimpleCredentials) {
                 PasswordCallback pcb = (PasswordCallback) callbacks[i];

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security/SimpleLoginModule.java Thu Apr 14 04:50:38 2005
@@ -39,10 +39,14 @@
 
     private static Logger log = Logger.getLogger(SimpleLoginModule.class);
 
-    /** Name of the anonymous user id option in the LoginModule configuration */
+    /**
+     * Name of the anonymous user id option in the LoginModule configuration
+     */
     private static final String OPT_ANONYMOUS = "anonymousId";
 
-    /** The default user id for anonymous login */
+    /**
+     * The default user id for anonymous login
+     */
     private static final String DEFAULT_ANONYMOUS_ID = "anonymous";
 
     // initial state
@@ -58,7 +62,9 @@
     // the principals, i.e. the authenticated identities
     private final Set principals = new HashSet();
 
-    /** Id of an anonymous user login */
+    /**
+     * Id of an anonymous user login
+     */
     private String anonymousUserId = DEFAULT_ANONYMOUS_ID;
 
     /**
@@ -119,11 +125,11 @@
                         // @todo implement simple username/password authentication
                     }
 
-                    if (anonymousUserId.equals(sc.getUserId())) {
+                    if (anonymousUserId.equals(sc.getUserID())) {
                         principals.add(new AnonymousPrincipal());
                     } else {
                         // else assume the user we authenticated is the UserPrincipal
-                        principals.add(new UserPrincipal(sc.getUserId()));
+                        principals.add(new UserPrincipal(sc.getUserID()));
                     }
                     authenticated = true;
                 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ChildrenCollectorFilter.java Thu Apr 14 04:50:38 2005
@@ -98,6 +98,7 @@
      * @return true if the specified name matches the pattern
      */
     static boolean matches(String name, String pattern) {
+        // @todo check if pattern matching conforms with spec
         // split pattern
         StringTokenizer st = new StringTokenizer(pattern, OR, false);
         while (st.hasMoreTokens()) {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/IteratorHelper.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/IteratorHelper.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/IteratorHelper.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/IteratorHelper.java Thu Apr 14 04:50:38 2005
@@ -81,7 +81,7 @@
     /**
      * {@inheritDoc}
      */
-    public long getPos() {
+    public long getPosition() {
         return pos;
     }
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java Thu Apr 14 04:50:38 2005
@@ -31,7 +31,7 @@
 import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.nodetype.NodeDef;
+import javax.jcr.nodetype.NodeDefinition;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionException;
 import javax.jcr.version.VersionHistory;
@@ -60,7 +60,7 @@
      * @throws RepositoryException
      */
     public VersionHistoryImpl(ItemManager itemMgr, SessionImpl session, NodeId id,
-                              NodeState state, NodeDef definition,
+                              NodeState state, NodeDefinition definition,
                               ItemLifeCycleListener[] listeners,
                               InternalVersionHistory history) throws RepositoryException {
         super(itemMgr, session, id, state, definition, listeners);
@@ -124,12 +124,10 @@
     public void addVersionLabel(String versionName, String label, boolean move)
             throws VersionException, RepositoryException {
         try {
-            session.getVersionManager().setVersionLabel(
-                    this,
+            session.getVersionManager().setVersionLabel(this,
                     QName.fromJCRName(versionName, session.getNamespaceResolver()),
                     QName.fromJCRName(label, session.getNamespaceResolver()),
-                    move
-            );
+                    move);
         } catch (IllegalNameException e) {
             throw new RepositoryException(e);
         } catch (UnknownPrefixException e) {
@@ -142,12 +140,10 @@
      */
     public void removeVersionLabel(String label) throws RepositoryException {
         try {
-            session.getVersionManager().setVersionLabel(
-                    this,
+            session.getVersionManager().setVersionLabel(this,
                     null,
                     QName.fromJCRName(label, session.getNamespaceResolver()),
-                    true
-            );
+                    true);
         } catch (IllegalNameException e) {
             throw new RepositoryException(e);
         } catch (UnknownPrefixException e) {
@@ -227,10 +223,8 @@
             throws UnsupportedRepositoryOperationException, VersionException,
             RepositoryException {
         try {
-            session.getVersionManager().removeVersion(
-                    this,
-                    QName.fromJCRName(versionName, session.getNamespaceResolver())
-            );
+            session.getVersionManager().removeVersion(this,
+                    QName.fromJCRName(versionName, session.getNamespaceResolver()));
         } catch (IllegalNameException e) {
             throw new RepositoryException(e);
         } catch (UnknownPrefixException e) {
@@ -294,6 +288,7 @@
 
     /**
      * Returns the internal version history
+     *
      * @return
      */
     public InternalVersionHistory getInternalVersionHistory() {

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionImpl.java Thu Apr 14 04:50:38 2005
@@ -22,19 +22,15 @@
 import org.apache.jackrabbit.core.NodeImpl;
 import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.jackrabbit.core.state.NodeState;
-import org.apache.jackrabbit.core.state.NodeReferencesId;
-import org.apache.jackrabbit.core.state.NodeReferences;
-import org.apache.jackrabbit.core.state.ItemStateException;
 
 import javax.jcr.Item;
+import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.PropertyIterator;
-import javax.jcr.nodetype.NodeDef;
+import javax.jcr.nodetype.NodeDefinition;
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import java.util.Calendar;
-import java.util.List;
 
 /**
  * This Class implements a Version that extends the node interface
@@ -59,7 +55,7 @@
      * @throws RepositoryException
      */
     public VersionImpl(ItemManager itemMgr, SessionImpl session, NodeId id,
-                       NodeState state, NodeDef definition,
+                       NodeState state, NodeDefinition definition,
                        ItemLifeCycleListener[] listeners, InternalVersion version)
             throws RepositoryException {
         super(itemMgr, session, id, state, definition, listeners);
@@ -107,11 +103,9 @@
     }
 
     /**
-     * Returns the version history this version is contained in.
-     * @return this versions history
-     * @throws RepositoryException
+     * {@inheritDoc}
      */
-    public VersionHistory getContainingVersionHistory() throws RepositoryException {
+    public VersionHistory getContainingHistory() throws RepositoryException {
         return (VersionHistory) getParent();
     }
 
@@ -148,7 +142,7 @@
 
     /**
      * {@inheritDoc}
-     *
+     * <p/>
      * In addition to the normal behaviour, this method also filters out the
      * references that do not exist in this workspace.
      */

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionIteratorImpl.java Thu Apr 14 04:50:38 2005
@@ -97,7 +97,7 @@
     /**
      * {@inheritDoc}
      */
-    public long getPos() {
+    public long getPosition() {
         return pos;
     }
 

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java Thu Apr 14 04:50:38 2005
@@ -22,9 +22,8 @@
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.PropertyId;
 import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.version.VersionHistoryNodeState;
-import org.apache.jackrabbit.core.nodetype.ChildNodeDef;
 import org.apache.jackrabbit.core.nodetype.EffectiveNodeType;
+import org.apache.jackrabbit.core.nodetype.NodeDef;
 import org.apache.jackrabbit.core.nodetype.NodeDefId;
 import org.apache.jackrabbit.core.nodetype.NodeTypeConflictException;
 import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
@@ -41,8 +40,8 @@
 
 import javax.jcr.RepositoryException;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * This Class implements a virtual item state provider, in order to expose the
@@ -76,6 +75,7 @@
 
     /**
      * Creates an abstract virtual item state provider
+     *
      * @param ntReg
      * @param rootNodeId
      */
@@ -86,6 +86,7 @@
 
     /**
      * Creates the root node state.
+     *
      * @return
      * @throws RepositoryException
      */
@@ -157,6 +158,7 @@
 
     /**
      * Returns the root state
+     *
      * @return the root state
      */
     public synchronized NodeState getRootState() throws ItemStateException {
@@ -172,6 +174,7 @@
 
     /**
      * Checks if this provide has the node state of the given node id
+     *
      * @param id
      * @return
      */
@@ -179,6 +182,7 @@
 
     /**
      * Retrieves the node state with the given node id
+     *
      * @param id
      * @return
      * @throws NoSuchItemStateException
@@ -189,6 +193,7 @@
 
     /**
      * Checks if this provider has the property state of the given id.
+     *
      * @param id
      * @return
      */
@@ -210,6 +215,7 @@
 
     /**
      * Retrieces the property state for the given id
+     *
      * @param id
      * @return
      * @throws NoSuchItemStateException
@@ -257,7 +263,7 @@
             // hack, use nt:unstructured as parent
             NodeTypeRegistry ntReg = getNodeTypeRegistry();
             EffectiveNodeType ent = ntReg.getEffectiveNodeType(NT_UNSTRUCTURED);
-            ChildNodeDef cnd = ent.getApplicableChildNodeDef(name, nodeTypeName);
+            NodeDef cnd = ent.getApplicableChildNodeDef(name, nodeTypeName);
             ntReg.getNodeDef(new NodeDefId(cnd));
             def = new NodeDefId(cnd);
         }
@@ -285,6 +291,7 @@
 
     /**
      * adds the node state to the cache
+     *
      * @param state
      */
     protected NodeState cache(NodeState state) {
@@ -298,6 +305,7 @@
 
     /**
      * removes the nodes state from the cache
+     *
      * @param id
      */
     protected NodeState evict(NodeId id) {
@@ -307,6 +315,7 @@
     /**
      * Removes the item and all hard refernces from the cache and discards the
      * states.
+     *
      * @param id
      */
     public void invalidateItem(ItemId id) {
@@ -357,7 +366,7 @@
      * @return
      * @throws RepositoryException
      */
-    protected ChildNodeDef getApplicableChildNodeDef(NodeState parent, QName nodeName, QName nodeTypeName)
+    protected NodeDef getApplicableChildNodeDef(NodeState parent, QName nodeName, QName nodeTypeName)
             throws RepositoryException {
         return getEffectiveNodeType(parent).getApplicableChildNodeDef(nodeName, nodeTypeName);
     }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java?view=diff&r1=161259&r2=161260
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/xml/Importer.java Thu Apr 14 04:50:38 2005
@@ -21,6 +21,7 @@
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Workspace;
+import javax.jcr.ImportUUIDBehavior;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.List;
@@ -31,13 +32,13 @@
 public interface Importer {
 
     public static final int IMPORT_UUID_CREATE_NEW =
-            Workspace.IMPORT_UUID_CREATE_NEW;
+            ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW;
     public static final int IMPORT_UUID_COLLISION_REMOVE_EXISTING =
-            Workspace.IMPORT_UUID_COLLISION_REMOVE_EXISTING;
+            ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING;
     public static final int IMPORT_UUID_COLLISION_REPLACE_EXISTING =
-            Workspace.IMPORT_UUID_COLLISION_REPLACE_EXISTING;
+            ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING;
     public static final int IMPORT_UUID_COLLISION_THROW =
-            Workspace.IMPORT_UUID_COLLISION_THROW;
+            ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW;
 
     /**
      * @throws RepositoryException



Mime
View raw message