Return-Path: 
 <commits-return-3993-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org
Received: (qmail 73740 invoked from network); 10 May 2007 21:26:16 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 10 May 2007 21:26:16 -0000
Received: (qmail 81755 invoked by uid 500); 10 May 2007 21:26:22 -0000
Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org
Received: (qmail 81727 invoked by uid 500); 10 May 2007 21:26:22 -0000
Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:commits@jackrabbit.apache.org>
List-Id: <commits.jackrabbit.apache.org>
Reply-To: dev@jackrabbit.apache.org
Delivered-To: mailing list commits@jackrabbit.apache.org
Received: (qmail 81718 invoked by uid 99); 10 May 2007 21:26:22 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 May 2007 14:26:22 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 May 2007 14:26:14 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id A68C01A9852; Thu, 10 May 2007 14:25:28 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r536999 [7/7] - in
 /jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src: dtd/
 main/java/org/apache/jackrabbit/ main/java/org/apache/jackrabbit/ocm/
 main/java/org/apache/jackrabbit/ocm/exception/
 main/java/org/apache/jackrabbit/o...
Date: Thu, 10 May 2007 21:25:22 -0000
To: commits@jackrabbit.apache.org
From: clombart@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070510212528.A68C01A9852@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/jcrmapping.xml Thu May 10 14:25:11 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE graffito-jcr PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/graffito-jcr-mapping.dtd">
-<graffito-jcr>
+<!DOCTYPE jackrabbit-ocm PUBLIC "-//The Apache Software Foundation//DTD Repository//EN" "./src/dtd/jackrabbit-ocm.dtd">
+<jackrabbit-ocm>
     
   
 
@@ -12,7 +12,7 @@
 		
 	-->
 	<class-descriptor
-		className="org.apache.portals.graffito.jcr.testmodel.A"
+		className="org.apache.jackrabbit.ocm.testmodel.A"
 		jcrNodeType="nt:unstructured" jcrMixinTypes="mix:lockable" >
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 		<field-descriptor fieldName="path" path="true" />
@@ -33,16 +33,16 @@
 			
 		-->
 		<collection-descriptor fieldName="collection" jcrName="collection" proxy="false"
-        elementClassName="org.apache.portals.graffito.jcr.testmodel.C" jcrNodeType="graffito:C"
+        elementClassName="org.apache.jackrabbit.ocm.testmodel.C" jcrNodeType="ocm:C"
         jcrAutoCreated="false" jcrMandatory="false" jcrOnParentVersion="IGNORE"
         jcrProtected="false" jcrSameNameSiblings="false"/>
         
 		<collection-descriptor fieldName="emptyCollection" jcrName="emptyCollection" proxy="false"
-        elementClassName="org.apache.portals.graffito.jcr.testmodel.C" />
+        elementClassName="org.apache.jackrabbit.ocm.testmodel.C" />
 		
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.B"  jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.B"  jcrNodeType="nt:unstructured" jcrSuperTypes="nt:base">
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
 
 		<field-descriptor fieldName="b1" jcrName="b1" jcrType="String" jcrAutoCreated="false" jcrMandatory="false"
@@ -53,68 +53,68 @@
 
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.C" jcrNodeType="graffito:C" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.C" jcrNodeType="ocm:C" discriminator="false" >
 		<!-- Field-descriptor is used to map simple attributes to jcr property -->
-		<field-descriptor fieldName="id" jcrName="graffito:id" 	id="true" />
-		<field-descriptor fieldName="name" jcrName="graffito:name" />
+		<field-descriptor fieldName="id" jcrName="ocm:id" 	id="true" />
+		<field-descriptor fieldName="name" jcrName="ocm:name" />
 	</class-descriptor>
 
 
-	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Page" jcrNodeType="graffito:page" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Page" jcrNodeType="ocm:page" discriminator="false" >
 		<field-descriptor fieldName="path" path="true" />
-		<field-descriptor fieldName="title" jcrName="graffito:title" />
+		<field-descriptor fieldName="title" jcrName="ocm:title" />
 		<collection-descriptor fieldName="paragraphs" proxy="false" 
-		                       elementClassName="org.apache.portals.graffito.jcr.testmodel.Paragraph" 
-		                       collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
+		                       elementClassName="org.apache.jackrabbit.ocm.testmodel.Paragraph" 
+		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" />
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Paragraph" jcrNodeType="graffito:paragraph" discriminator="false" >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Paragraph" jcrNodeType="ocm:paragraph" discriminator="false" >
 		<field-descriptor fieldName="path" path="true" />
-		<field-descriptor fieldName="text" jcrName="graffito:text"/>
-    	<bean-descriptor fieldName="page" jcrName="page" proxy="true" converter="org.apache.portals.graffito.jcr.persistence.beanconverter.impl.ParentBeanConverterImpl" />		
+		<field-descriptor fieldName="text" jcrName="ocm:text"/>
+    	<bean-descriptor fieldName="page" jcrName="page" proxy="true" converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />		
 	</class-descriptor>
 
 
-	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.hashmap.Main" jcrNodeType="nt:unstructured"  >
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.hashmap.Main" jcrNodeType="nt:unstructured"  >
 		<field-descriptor fieldName="path" path="true" />
 		<field-descriptor fieldName="text" jcrName="text" />
 		<collection-descriptor fieldName="elements"  proxy="false" 
-		                       elementClassName="org.apache.portals.graffito.jcr.testmodel.hashmap.Element" 
-		                       collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.NTCollectionConverterImpl" 
-		                       collectionClassName="org.apache.portals.graffito.jcr.testmodel.hashmap.HashMapElement" />
+		                       elementClassName="org.apache.jackrabbit.ocm.testmodel.hashmap.Element" 
+		                       collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.NTCollectionConverterImpl" 
+		                       collectionClassName="org.apache.jackrabbit.ocm.testmodel.hashmap.HashMapElement" />
 		                       
 	</class-descriptor>
 
-	<class-descriptor className="org.apache.portals.graffito.jcr.testmodel.hashmap.Element" jcrNodeType="graffito:element" discriminator="false" >
-		<field-descriptor fieldName="id" jcrName="graffito:id"  />
-		<field-descriptor fieldName="text" jcrName="graffito:text" />
+	<class-descriptor className="org.apache.jackrabbit.ocm.testmodel.hashmap.Element" jcrNodeType="ocm:element" discriminator="false" >
+		<field-descriptor fieldName="id" jcrName="ocm:id"  />
+		<field-descriptor fieldName="text" jcrName="ocm:text" />
 	</class-descriptor>
 	
 	
-	<class-descriptor 	className="org.apache.portals.graffito.jcr.testmodel.Discriminator" 	jcrNodeType="graffito:discriminatorobject" discriminator="true" >
+	<class-descriptor 	className="org.apache.jackrabbit.ocm.testmodel.Discriminator" 	jcrNodeType="ocm:discriminatorobject" discriminator="true" >
 		<field-descriptor fieldName="path" path="true" />
-		<field-descriptor fieldName="content" jcrName="graffito:content" />
+		<field-descriptor fieldName="content" jcrName="ocm:content" />
 	</class-descriptor>		
 
 
-    <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Residual$ResidualProperties" jcrNodeType="nt:unstructured">
+    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Residual$ResidualProperties" jcrNodeType="nt:unstructured">
         <field-descriptor fieldName="path" path="true" />
         <collection-descriptor fieldName="elements" proxy="false" 
                                jcrName="value*"
                                elementClassName="java.lang.String"
-                               collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.ResidualPropertiesCollectionConverterImpl" 
-                               collectionClassName="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.ManagedHashMap" />
+                               collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ResidualPropertiesCollectionConverterImpl" 
+                               collectionClassName="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManagedHashMap" />
                                
     </class-descriptor>
 
-    <class-descriptor className="org.apache.portals.graffito.jcr.testmodel.Residual$ResidualNodes" jcrNodeType="nt:unstructured">
+    <class-descriptor className="org.apache.jackrabbit.ocm.testmodel.Residual$ResidualNodes" jcrNodeType="nt:unstructured">
         <field-descriptor fieldName="path" path="true" />
         <collection-descriptor fieldName="elements" proxy="false" 
                                jcrName="value*"
                                elementClassName="java.lang.Object"
-                               collectionConverter="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.ResidualNodesCollectionConverterImpl" 
-                               collectionClassName="org.apache.portals.graffito.jcr.persistence.collectionconverter.impl.ManagedHashMap" />
+                               collectionConverter="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ResidualNodesCollectionConverterImpl" 
+                               collectionClassName="org.apache.jackrabbit.ocm.persistence.collectionconverter.impl.ManagedHashMap" />
                                
     </class-descriptor>
-</graffito-jcr>
- 
\ No newline at end of file
+</jackrabbit-ocm>
+ 

Modified: jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/nodetypes/custom_nodetypes.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/nodetypes/custom_nodetypes.xml?view=diff&rev=536999&r1=536998&r2=536999
==============================================================================
--- jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/nodetypes/custom_nodetypes.xml (original)
+++ jackrabbit/trunk/contrib/jackrabbit-jcr-mapping/jcr-mapping/src/test/test-config/nodetypes/custom_nodetypes.xml Thu May 10 14:25:11 2007
@@ -20,175 +20,175 @@
 	xmlns:sv="http://www.jcp.org/jcr/sv/1.0"
 	xmlns:test="http://www.apache.org/jackrabbit/test"
 	xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
-	xmlns:graffito="http://incubator.apache.org/graffito">
-	<nodeType name="graffito:C" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+	xmlns:ocm="http://jackrabbit.apache.org/ocm">
+	<nodeType name="ocm:C" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
       <supertype>mix:versionable</supertype>
       <supertype>nt:base</supertype>
     </supertypes>
     <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:id" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
-	<propertyDefinition name="graffito:name" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="ocm:id" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+	<propertyDefinition name="ocm:name" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
   </nodeType>
 
-  <nodeType name="graffito:paragraph" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+  <nodeType name="ocm:paragraph" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
       <supertype>mix:versionable</supertype>
       <supertype>nt:base</supertype>
     </supertypes>
     <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:text" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="ocm:text" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
   </nodeType>
   
-  <nodeType name="graffito:page" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+  <nodeType name="ocm:page" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
       <supertype>mix:versionable</supertype>
       <supertype>nt:base</supertype>
     </supertypes>
     <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
-    <childNodeDefinition name="*" defaultPrimaryType="graffito:paragraph" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="true">
+    <propertyDefinition name="ocm:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <childNodeDefinition name="*" defaultPrimaryType="ocm:paragraph" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="true">
       <requiredPrimaryTypes>
-        <requiredPrimaryType>graffito:paragraph</requiredPrimaryType>
+        <requiredPrimaryType>ocm:paragraph</requiredPrimaryType>
       </requiredPrimaryTypes>
     </childNodeDefinition>    
   </nodeType>
   
-    <nodeType name="graffito:pagewithoutsibling" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <nodeType name="ocm:pagewithoutsibling" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
       <supertype>mix:versionable</supertype>
       <supertype>nt:base</supertype>
     </supertypes>
     <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
-    <childNodeDefinition name="*" defaultPrimaryType="graffito:paragraph" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+    <propertyDefinition name="ocm:title" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <childNodeDefinition name="*" defaultPrimaryType="ocm:paragraph" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
       <requiredPrimaryTypes>
-        <requiredPrimaryType>graffito:paragraph</requiredPrimaryType>
+        <requiredPrimaryType>ocm:paragraph</requiredPrimaryType>
       </requiredPrimaryTypes>
     </childNodeDefinition>    
   </nodeType>
 
-  <nodeType name="graffito:element" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+  <nodeType name="ocm:element" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
       <supertype>mix:versionable</supertype>
       <supertype>nt:base</supertype>
     </supertypes>
     <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:id" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:text" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />    
+    <propertyDefinition name="ocm:id" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="ocm:text" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />    
   </nodeType>
   
-   <nodeType name="graffito:cmsobjectimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+   <nodeType name="ocm:cmsobjectimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
       <supertype>nt:base</supertype>
     </supertypes>
     <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:name" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="ocm:name" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
 
   </nodeType>
 
-   <nodeType name="graffito:contentimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+   <nodeType name="ocm:contentimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
-      <supertype>graffito:cmsobjectimpl</supertype>
+      <supertype>ocm:cmsobjectimpl</supertype>
     </supertypes>
   </nodeType>
 
-   <nodeType name="graffito:documentstream" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+   <nodeType name="ocm:documentstream" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
       <supertype>mix:versionable</supertype>
       <supertype>nt:base</supertype>
     </supertypes>
     <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:encoding" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:binarycontent" requiredType="Binary" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />    
+    <propertyDefinition name="ocm:encoding" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="ocm:binarycontent" requiredType="Binary" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />    
   </nodeType>
 
 
-   <nodeType name="graffito:documentimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+   <nodeType name="ocm:documentimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
-      <supertype>graffito:contentimpl</supertype>
+      <supertype>ocm:contentimpl</supertype>
     </supertypes>    
-    <propertyDefinition name="graffito:contenttype" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:size" requiredType="Long" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />    
-    <childNodeDefinition name="*" defaultPrimaryType="graffito:documentstream" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+    <propertyDefinition name="ocm:contenttype" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="ocm:size" requiredType="Long" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />    
+    <childNodeDefinition name="*" defaultPrimaryType="ocm:documentstream" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
       <requiredPrimaryTypes>
-        <requiredPrimaryType>graffito:documentstream</requiredPrimaryType>
+        <requiredPrimaryType>ocm:documentstream</requiredPrimaryType>
       </requiredPrimaryTypes>
     </childNodeDefinition>        
   </nodeType>
   
-  <nodeType name="graffito:folderimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+  <nodeType name="ocm:folderimpl" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
-      <supertype>graffito:cmsobjectimpl</supertype>       
+      <supertype>ocm:cmsobjectimpl</supertype>       
     </supertypes>    
-    <childNodeDefinition name="*" defaultPrimaryType="graffito:cmsobjectimpl" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="true">
+    <childNodeDefinition name="*" defaultPrimaryType="ocm:cmsobjectimpl" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="true">
       <requiredPrimaryTypes>
-        <requiredPrimaryType>graffito:cmsobjectimpl</requiredPrimaryType>         
+        <requiredPrimaryType>ocm:cmsobjectimpl</requiredPrimaryType>         
       </requiredPrimaryTypes>
     </childNodeDefinition>        
   </nodeType>
                                                          
-    <nodeType name="graffito:discriminatorobject" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+    <nodeType name="ocm:discriminatorobject" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
     <supertypes>
       <supertype>mix:versionable</supertype>
       <supertype>nt:base</supertype>
     </supertypes>
     <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />
-    <propertyDefinition name="graffito:content" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
+    <propertyDefinition name="ocm:content" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />
   </nodeType>
   
 
-   <nodeType name="graffito:discriminator" isMixin="true">
+   <nodeType name="ocm:discriminator" isMixin="true">
     <supertypes>
       <supertype>nt:base</supertype>
     </supertypes>
-    <propertyDefinition name="graffito:classname" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />    
+    <propertyDefinition name="ocm:classname" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />    
   </nodeType>
    
 
-   <nodeType name="graffito:cmsobject" isMixin="true">
+   <nodeType name="ocm:cmsobject" isMixin="true">
     <supertypes>
       <supertype>nt:base</supertype>
     </supertypes>
   </nodeType>    
 
-   <nodeType name="graffito:folder" isMixin="true">
+   <nodeType name="ocm:folder" isMixin="true">
     <supertypes>
-      <supertype>graffito:cmsobject</supertype>
+      <supertype>ocm:cmsobject</supertype>
     </supertypes>
   </nodeType>    
 
-   <nodeType name="graffito:content" isMixin="true">
+   <nodeType name="ocm:content" isMixin="true">
     <supertypes>
-      <supertype>graffito:cmsobject</supertype>
+      <supertype>ocm:cmsobject</supertype>
     </supertypes>
   </nodeType>    
 
-   <nodeType name="graffito:document" isMixin="true">
+   <nodeType name="ocm:document" isMixin="true">
     <supertypes>
-      <supertype>graffito:content</supertype>
+      <supertype>ocm:content</supertype>
     </supertypes>
   </nodeType>    
 
 
-   <nodeType name="graffito:propertytest" >
+   <nodeType name="ocm:propertytest" >
     <supertypes>
       <supertype>nt:base</supertype>
     </supertypes>
-     <propertyDefinition name="graffito:requiredProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />   
-     <propertyDefinition name="graffito:requiredWithConstraintsProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >   
+     <propertyDefinition name="ocm:requiredProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" />   
+     <propertyDefinition name="ocm:requiredWithConstraintsProp" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >   
      	<valueConstraints>
         	<valueConstraint>abc</valueConstraint>
 	        <valueConstraint>def</valueConstraint>
 	        <valueConstraint>ghi</valueConstraint>
 	 	</valueConstraints>     
      </propertyDefinition>
-     <propertyDefinition name="graffito:autoCreatedProp" requiredType="String" autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >   
+     <propertyDefinition name="ocm:autoCreatedProp" requiredType="String" autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >   
             <defaultValues>
                 <defaultValue>autoCreatePropValue</defaultValue>
             </defaultValues>
      </propertyDefinition>
-     <propertyDefinition name="graffito:autoCreatedWithConstraintsProp" requiredType="String" autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >   
+     <propertyDefinition name="ocm:autoCreatedWithConstraintsProp" requiredType="String" autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >   
         <defaultValues>
             <defaultValue>ccc</defaultValue>
         </defaultValues>
@@ -199,14 +199,14 @@
 	 	</valueConstraints>     
             
      </propertyDefinition>
-     <propertyDefinition name="graffito:mandatoryProp" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />     
-     <propertyDefinition name="graffito:mandatoryWithConstaintsProp" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" >     
+     <propertyDefinition name="ocm:mandatoryProp" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" />     
+     <propertyDefinition name="ocm:mandatoryWithConstaintsProp" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false" >     
      	<valueConstraints>
         	<valueConstraint>xx</valueConstraint>
 	        <valueConstraint>yy</valueConstraint>
 	 	</valueConstraints>      
      </propertyDefinition>     						  
-     <propertyDefinition name="graffito:protectedWithDefaultValueProp" requiredType="String" autoCreated="true" mandatory="false" onParentVersion="COPY" protected="true" multiple="false" >     
+     <propertyDefinition name="ocm:protectedWithDefaultValueProp" requiredType="String" autoCreated="true" mandatory="false" onParentVersion="COPY" protected="true" multiple="false" >     
             <defaultValues>
                 <defaultValue>protectedValue</defaultValue>
             </defaultValues>