You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/01/02 03:07:43 UTC

svn commit: r607963 - in /jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm: ./ api/ simple-strategies/

Author: jukka
Date: Tue Jan  1 18:07:41 2008
New Revision: 607963

URL: http://svn.apache.org/viewvc?rev=607963&view=rev
Log:
JCR-1281: Move ocm documentation to jackrabbit-site
    - Replaced last Graffito references

Modified:
    jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/api/api-intro.xml
    jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/engine-introduction.xml
    jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/introduction-strategies.xml
    jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/atomic-strategy.xml
    jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/bean-strategy.xml
    jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/collection-strategy.xml
    jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/introduction-strategies.xml

Modified: jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/api/api-intro.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/api/api-intro.xml?rev=607963&r1=607962&r2=607963&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/api/api-intro.xml (original)
+++ jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/api/api-intro.xml Tue Jan  1 18:07:41 2008
@@ -32,8 +32,7 @@
         <li>Lock objects.</li>
       </ul>
       <p>
-        You can see the
-        <a href="../apidocs/org/apache/portals/graffito/jcr/persistence/PersistenceManager.html">JavaDoc</a>
+        You can see the <a href="../api/1.4/">JavaDoc</a>
         to get a complete API overview.
       </p>
       <p>We plan to add other features in a future release.</p>

Modified: jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/engine-introduction.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/engine-introduction.xml?rev=607963&r1=607962&r2=607963&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/engine-introduction.xml (original)
+++ jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/engine-introduction.xml Tue Jan  1 18:07:41 2008
@@ -98,7 +98,7 @@
         </p>
         <p align="center"><img src="images/xml-file-descriptor.jpg"/></p>
         <p>
-          The root element is "graffito-jcr" and it contains one or more
+          The root element is "jackrabbit-ocm" and it contains one or more
           "class-descriptor". As you can see in the sections
           "Mapping Strategies" and "Advanced Mapping Strategies", each
           class-descriptor contains the mapping information used for each

Modified: jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/introduction-strategies.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/introduction-strategies.xml?rev=607963&r1=607962&r2=607963&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/introduction-strategies.xml (original)
+++ jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/introduction-strategies.xml Tue Jan  1 18:07:41 2008
@@ -106,7 +106,7 @@
         <source><![CDATA[
 <class-descriptor
     className="org.apache.jackrabbit.ocm.testmodel.Page"
-    jcrType="graffito:page">
+    jcrType="my:page">
   <field-descriptor fieldName="path" path="true" />
   <bean-descriptor fieldName="pageInfo" jcrName="pageInfo" />
   <collection-descriptor
@@ -116,17 +116,17 @@
 
 <class-descriptor
     className="org.apache.jackrabbit.ocm.testmodel.PageInfo"
-    jcrType="graffito:PageInfo">
+    jcrType="my:PageInfo">
   <field-descriptor fieldName="path" path="true" />
-  <field-descriptor fieldName="title" jcrName="graffito:title"/>
-  <field-descriptor fieldName="description" jcrName="graffito:description"/>
+  <field-descriptor fieldName="title" jcrName="my:title"/>
+  <field-descriptor fieldName="description" jcrName="my:description"/>
 </class-descriptor>
 
 <class-descriptor
     className="org.apache.jackrabbit.ocm.testmodel.Paragraph"
-    jcrType="graffito:paragraph">
+    jcrType="my:paragraph">
   <field-descriptor fieldName="path" path="true" />
-  <field-descriptor fieldName="text" jcrName="graffito:text"/>
+  <field-descriptor fieldName="text" jcrName="my:text"/>
 </class-descriptor>
 ]]></source>
 
@@ -142,13 +142,13 @@
         <source><![CDATA[
 /mysite/page1
   /mysite/page1/pageInfo
-    graffito:title = "This is my page title"
-    graffito:description = "This is my page description"
+    my:title = "This is my page title"
+    my:description = "This is my page description"
   /mysite/page1/paragraphs
     /mysite/page1/paragraphs/paragraph1
-      graffito:text = "This is the content of para1"
+      my:text = "This is the content of para1"
     /mysite/page1/paragraphs/paragraph2
-      graffito:text = ""This is the content of para2"
+      my:text = ""This is the content of para2"
 ]]></source>
       </p>
         <p>
@@ -164,7 +164,7 @@
     className="org.apache.jackrabbit.ocm.testmodel.Paragraph"
     jcrType="nt:unstructured">
   <field-descriptor fieldName="path" path="true" />
-  <field-descriptor fieldName="text" jcrName="graffito:text"/>
+  <field-descriptor fieldName="text" jcrName="my:text"/>
 </class-descriptor>
 ]]></source>
         <p>
@@ -179,14 +179,14 @@
           It is also possible to map a bean class to a specific JCR node type.
           The following class-descriptor map the class
           "org.apache.jackrabbit.ocm.testmodel.Paragraph" to the node
-          type "graffito:paragraph".
+          type "my:paragraph".
         </p>
         <source><![CDATA[
 <class-descriptor
     className="org.apache.jackrabbit.ocm.testmodel.Paragraph"
-    jcrType="graffito:paragraph">
+    jcrType="my:paragraph">
   <field-descriptor fieldName="path" path="true" />
-  <field-descriptor fieldName="text" jcrName="graffito:text"/>
+  <field-descriptor fieldName="text" jcrName="my:text"/>
 </class-descriptor>
 ]]></source>
         <p>
@@ -196,7 +196,7 @@
           the Jackrabbit API.
         </p>
         <source><![CDATA[
-<nodeType name="graffito:paragraph" isMixin="false"
+<nodeType name="my:paragraph" isMixin="false"
           hasOrderableChildNodes="false" primaryItemName="">
   <supertypes>
     <supertype>mix:versionable</supertype>
@@ -207,7 +207,7 @@
       mandatory="false" onParentVersion="COPY" protected="false"
       multiple="false" />
   <propertyDefinition
-     name="graffito:text" requiredType="String" autoCreated="false"
+     name="my:text" requiredType="String" autoCreated="false"
      mandatory="true" onParentVersion="COPY" protected="false"
      multiple="false" />
 </nodeType>

Modified: jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/atomic-strategy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/atomic-strategy.xml?rev=607963&r1=607962&r2=607963&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/atomic-strategy.xml (original)
+++ jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/atomic-strategy.xml Tue Jan  1 18:07:41 2008
@@ -33,7 +33,7 @@
           Based on our model defined
           <a href="introduction-strategies.html">here</a>,
           the following field-descriptor maps the bean field "title"
-          (String type) into the JCR property "graffito:title".
+          (String type) into the JCR property "my:title".
         </p>
         <p align="center"><img src="../images/atomic-fields-def.jpg"/></p>
       </subsection>

Modified: jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/bean-strategy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/bean-strategy.xml?rev=607963&r1=607962&r2=607963&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/bean-strategy.xml (original)
+++ jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/bean-strategy.xml Tue Jan  1 18:07:41 2008
@@ -51,8 +51,8 @@
         <source><![CDATA[
 /mysite/page1
   /mysite/page1/pageInfo
-       graffito:title = "This is my page title"
-       graffito:description = "This is my page description"
+       my:title = "This is my page title"
+       my:description = "This is my page description"
   ... other subnodes for page1 ...
 ]]></source>
         <p>
@@ -117,9 +117,9 @@
 <source><![CDATA[
 <class-descriptor
     className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl"
-    jcrType="graffito:cmsobjectimpl" >
+    jcrType="my:cmsobjectimpl" >
   <field-descriptor fieldName="path" path="true" />
-  <field-descriptor fieldName="name" jcrName="graffito:name" id="true" />
+  <field-descriptor fieldName="name" jcrName="my:name" id="true" />
   <bean-descriptor
       fieldName="parentFolder"
       converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />
@@ -137,7 +137,7 @@
             <source><![CDATA[
 <class-descriptor
     className="org.apache.jackrabbit.ocm.testmodel.inheritance.impl.CmsObjectImpl"
-    jcrType="graffito:cmsobjectimpl" >
+    jcrType="my:cmsobjectimpl" >
   <bean-descriptor
       fieldName="parentFolder"
       converter="org.apache.jackrabbit.ocm.persistence.beanconverter.impl.ParentBeanConverterImpl" />

Modified: jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/collection-strategy.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/collection-strategy.xml?rev=607963&r1=607962&r2=607963&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/collection-strategy.xml (original)
+++ jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/collection-strategy.xml Tue Jan  1 18:07:41 2008
@@ -36,7 +36,7 @@
         <source><![CDATA[
 <class-descriptor
     className="org.apache.jackrabbit.ocm.testmodel.Page"
-    jcrType="graffito:page">
+    jcrType="my:page">
   <collection-descriptor
       fieldName="paragraphs" jcrName="paragraphs"
       elementClassName="org.apache.jackrabbit.ocm.testmodel.Paragraph" />
@@ -45,9 +45,9 @@
 
 <class-descriptor
     className="org.apache.jackrabbit.ocm.testmodel.Paragraph"
-    jcrType="graffito:paragraph">
+    jcrType="my:paragraph">
   <field-descriptor fieldName="path" path="true" />
-  <field-descriptor fieldName="text" jcrName="graffito:text"/>
+  <field-descriptor fieldName="text" jcrName="my:text"/>
 </class-descriptor>
 ]]></source>
         <p>
@@ -65,9 +65,9 @@
 /mysite/page1
   /mysite/page1/paragraphs
     /mysite/page1/paragraphs/collection-element1
-      graffito:text = "This is the content of para1"
+      my:text = "This is the content of para1"
     /mysite/page1/paragraphs/collection-element2
-      graffito:text = "This is the content of para2"
+      my:text = "This is the content of para2"
   ... other subnodes for page1 ...
 ]]></source>
         <p>

Modified: jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/introduction-strategies.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/introduction-strategies.xml?rev=607963&r1=607962&r2=607963&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/introduction-strategies.xml (original)
+++ jackrabbit/trunk/jackrabbit-site/src/site/xdoc/ocm/simple-strategies/introduction-strategies.xml Tue Jan  1 18:07:41 2008
@@ -109,13 +109,13 @@
         <source><![CDATA[
 /mysite/page1
   /mysite/page1/pageInfo
-    graffito:title = "This is my page title"
-    graffito:description = "This is my page description"
+    my:title = "This is my page title"
+    my:description = "This is my page description"
   /mysite/page1/paragraphs
     /mysite/page1/paragraphs/paragraph1
-      graffito:text = "This is the content of para1"
+      my:text = "This is the content of para1"
     /mysite/page1/paragraphs/paragraph2
-      graffito:text = "This is the content of para2"
+      my:text = "This is the content of para2"
  ]]></source>
         <p>
           It is possible to have another kind of jcr structure by using
@@ -153,7 +153,7 @@
           type by specifying the desired type in the attribute jcrType.
           The following class-descriptor map the class
           "org.apache.jackrabbit.ocm.testmodel.Paragraph" into the
-          node type "graffito:paragraph".
+          node type "my:paragraph".
         </p>
         <p>
           Here are the class-descriptors required to map the classes