You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/07/02 15:36:31 UTC

svn commit: r552490 [2/10] - in /cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation: ./ JPA Guide/ JPA Guide/JPA Agent/ JPA Guide/JPA Cayenne Provider Properties/ JPA Guide/JPA Introduction/ JPA Guide/JPA persistence.xml/ JPA Guide/Requir...

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/Running%20CayenneModeler/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html Mon Jul  2 06:36:24 2007
@@ -29,24 +29,23 @@
   </div>
 <div id="cayenne_toc">
 <ul>
+<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a><ul>
 <li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html">Running CayenneModeler</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/CayenneModeler and Eclipse/index.html">CayenneModeler and Eclipse</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html">General Navigation</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html">Cayenne User Directory</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html">General Navigation</a></li>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent"><p>Follow the instructions below appropriate for the type of OS and Cayenne distribution that you have:</p>
@@ -61,44 +60,17 @@
 
 <h3><a name="RunningCayenneModeler-CrossPlatformModeler%28LinuxoranyotherOS%29"></a>Cross Platform Modeler (Linux or any other OS)</h3>
 
-<p>CayenneModeler is a regular Java application that can be run on JDK 1.4 or newer. It can be started in two different ways:</p>
-
-<p>1. By running <tt>cayenne-modeler.jar</tt>:</p>
-
-<div class="preformatted"><div class="preformattedContent">
-<pre>cd cayenne_distro_dir/lib/modeler
-java -jar cayenne-modeler.jar</pre>
-</div></div>
-
-<p>2. Or by executing a startup script. </p>
-
-<p>To use one of the scripts, first set the following environment variables:</p>
-
-<ul>
-	<li><tt>JAVA_HOME</tt> - should point to your JSDK 1.4 installation. It may already exist in the environment.</li>
-	<li><tt>CAYENNE_HOME</tt> (optional) - should point to the directory where your unpacked Cayenne (a directory named like <tt>cayenne&#45;[release-suffix]</tt>). If <tt>CAYENNE_HOME</tt> is undefined, scripts will still work in most environments, guessing the right distribution location.</li>
-</ul>
-
-
-<p>And then run the scripts:</p>
-
-<p>Windows:</p>
-
-<div class="preformatted"><div class="preformattedContent">
-<pre>%CAYENNE_HOME%\bin\modeler.bat</pre>
-</div></div>
-
-<p>UNIX:</p>
+<p>CayenneModeler.jar is a runnable jar that can be executed with JDK 1.4 or newer:</p>
 
 <div class="preformatted"><div class="preformattedContent">
-<pre>$CAYENNE_HOME/bin/modeler.sh</pre>
+<pre>java -jar cayenne_distro_dir/bin/CayenneModeler.jar</pre>
 </div></div></div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html Mon Jul  2 06:36:24 2007
@@ -29,25 +29,24 @@
   </div>
 <div id="cayenne_toc">
 <ul>
+<li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a><ul>
-<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html">Running CayenneModeler</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/CayenneModeler and Eclipse/index.html">CayenneModeler and Eclipse</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html">General Navigation</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html">Cayenne User Directory</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html">Running CayenneModeler</a></li>
 </ul>
 </li>
-<li><a href="../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent">
+<div id="ConfluenceContent"><h2><a name="IntroductiontoCayenneModeler-IntroductiontoCayenneModeler"></a>Introduction to CayenneModeler</h2>
 <p>Cayenne stores mapping and deployment information using a set of XML files with a predefined format. These files can be always edited by hand, but Cayenne goes beyond that. A standard distribution contains CayenneModeler - a Java Swing GUI application that serves as an Object/Relational modeling tool. It is much more than just a specialized XML editor. It provides a comprehensive set of O/R functions, including:</p>
 
 <ul>
@@ -64,13 +63,21 @@
 <p>Among other things CayenneModeler allows new users to learn the concepts used in Cayenne framework, its terminology, and the overall structure.</p>
 
 <p>The following chapters of this Guide discuss how to use various functions of CayenneModeler.</p>
+
+<h3><a name="IntroductiontoCayenneModeler-Sections"></a>Sections</h3>
+
+<ol>
+	<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">Running CayenneModeler</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html" title="General Navigation">General Navigation</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html" title="Cayenne User Directory">Cayenne User Directory</a></li>
+</ol>
 </div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/CayenneModeler%20Flattened%20Relationships/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html Mon Jul  2 06:36:24 2007
@@ -29,32 +29,32 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a><ul>
 </ul>
 </li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent">
-<h3><a name="CayenneModelerFlattenedRelationships-FlattenedRelationships"></a>Flattened Relationships</h3>
+<div id="ConfluenceContent"><h3><a name="CayenneModelerFlattenedRelationships-FlattenedRelationships"></a>Flattened Relationships</h3>
 
-<p><span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/map/ObjRelationship.html" title="Visit page outside Confluence" rel="nofollow">ObjRelationships<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> that map to more than a single <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/map/DbRelationship.html" title="Visit page outside Confluence" rel="nofollow">DbRelationship<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> are called "flattened".</p>
+<p>ObjRelationships that map to more than a single DbRelationship are called "flattened".</p>
 
 <p>The most common case for using flattened relationships is modeling many-to-many relationships with a join table. E.g. ARTIST DbEntity has to-many relationship to ARTIST_EXHIBIT; ARTIST_EXHIBIT in turn has a to-one relationship to EXHIBIT DbEntity. We can create a single ObjRelationship from Artist ObjEntity to Exhibit ObjEntity that spawns two DbRelationships. This will be a to-many relationship. Lets say it is called "exhibitArray". Generated class file for Artist would contain a getExhibitArray() method returning a list of Exhibits for a given artist instance. An obvious advantage of having a flattened relationship in this case is to avoid mapping a join table as an object, meaningless in the context of the object model.</p>
 
@@ -73,7 +73,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Delete%20Rules/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html Mon Jul  2 06:36:24 2007
@@ -29,26 +29,27 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent">
@@ -80,7 +81,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Added: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Inheritance%20overview/index.html?view=auto&rev=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html (added)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html Mon Jul  2 06:36:24 2007
@@ -0,0 +1,160 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+<html>
+  <head>
+    <title>Apache Cayenne Documentation - Inheritance overview</title>
+    <style type="text/css">@import "../../../../style.css";</style>
+  </head>
+<body>
+  <div class="header">
+    <div style="float: left;"><a href="http://incubator.apache.org/cayenne/"><img src="../../../../images/logo.gif" align="absmiddle" border="0"></a></div>
+    <span class="logoSpaceLink"><a href="../../../../index.html">Cayenne User Documentation</a></span><br />
+    <span class="pagetitle">Inheritance overview</span>
+  </div>
+<div id="cayenne_toc">
+<ul>
+<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a><ul>
+</ul>
+</li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+</ul>
+</li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
+</ul>
+</div>
+<div id="ConfluenceContent"><table cellpadding='5' width='85%' cellspacing='8px' class='warningMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>This page and the inheritance features in Cayenne are a work in progress. Features are described here which are not yet available in a release of Cayenne. They are subject to change before final release.</td></tr></table>
+
+<h3><a name="Inheritanceoverview-Whyuseinheritance%3F"></a>Why use inheritance?</h3>
+
+<p>Inheritance is a powerful feature and can significantly simplify your code, but it does take a little time to fully understand how it works within an object mapping framework like Cayenne.<br/>
+We will use a simple example from school database to illustrate the concepts: a Person could be either a Student or a Teacher and so in Java you'd want to express these as a Person class with Student and Tutor as two subclasses. The Java class structure (the object entities) looks roughly like this:</p>
+
+<p><img src="inheritance-example.png" align="absmiddle" border="0" /></p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">abstract</span> class Person <span class="code-keyword">extends</span> PersistentObject {}
+<span class="code-keyword">public</span> class Teacher <span class="code-keyword">extends</span> Person {}
+<span class="code-keyword">public</span> class Student <span class="code-keyword">extends</span> Person {}</pre>
+</div></div>
+
+<p>Some possibilities are immediately obvious: you may wish to write a messaging system which sends emails to both Students and Teachers. Rather than deal with the two classes separately, now you can move the emailAddress attribute to the Person superclass. Your messaging framework can now work with Person, irrespective if they are students, tutors or any other subclasss of Person. Or perhaps you want to be able to link book loans to both Students and Teachers. You can do this by moving the relationship with book loans into the Person superclass.</p>
+
+<h3><a name="Inheritanceoverview-Abstractorconcretesuperclass"></a>Abstract or concrete superclass</h3>
+
+<p>Notice that in the example above, Person is an abstract class. That is, you cannot commit a person who is neither a Student nor a Teacher. But sometimes it is useful to make the superclass concrete and not abstract. This allows you to store a Person without yet giving them attributes from either subclass. Perhaps they are simply a person for whom we wish to store some contact information. Maybe later on they will become a Student and we will add those attributes. Because Java does not have multiple inheritance, it is not possible for a person to be a Student and a Teacher at the same time. Interfaces are probably a good way to address that type of model and will be discussed later.</p>
+
+<h2><a name="Inheritanceoverview-Databaseconsiderations"></a>Database considerations</h2>
+
+<p>Cayenne supports three types of inheritance at the database level. Each is useful for different reasons depending on storage criteria, database optimisation and so on. But it is important to note that for the most part, these choices don't change the way your classes are modelled in Java.</p>
+
+<p><img src="inheritance-overview.png" align="left" border="0" /></p>
+
+<h3><a name="Inheritanceoverview-Singletableinheritance"></a>Single table inheritance</h3>
+
+<p>One database table or view (dbEntity) is used for all the subclasses and the superclass. So Person, Student and Teacher are all mapped against the one dbEntity. If an attribute appears in Student but not in Teacher (for example the hasScholarship attribute) then that column in the database is set to NULL for all Teachers committed. Naturally, the columns found only in the subclasses cannot be restricted to 'NOT NULL' in the database.</p>
+
+<p>This type of inheritance works well when there are only a few attributes which are different between the two subclasses and you don't mind having all the records from the subclasses combined in one table.</p>
+
+<p>In Cayenne modeler you create this type of inheritance by pointing the superclass and subclass both to the same dbEntity. You must also define a class designator column which allows Cayenne to determine which subclass any particular record in the table belongs to. This column can only be NULL if the superclass is not abstract.</p>
+
+<p>Superclass: abstract or concrete<br/>
+Class designator column: required<br/>
+Primary key: single column shared by superclass and subclass</p>
+
+<h3><a name="Inheritanceoverview-Horizontal%28tableperclass%29inheritance"></a>Horizontal (table per class) inheritance</h3>
+
+<p>Here you will need one table per subclass. So your database will have Student and Teacher tables. Any attributes in the Person object entity will need to be present in both the database tables.</p>
+
+<p>This type of inheritance is best used when there are few attributes which are found in the superclass. Because the superclass is abstract you cannot have a relationship to other entities. For instance if you want to relate both Students and Teachers to library Books borrowed, then it would be useful to have a single relationship from Person to Books. That is possible in vertical inheritance.</p>
+
+<p>Normally if you use horizontal inheritance you will set your superclass to be abstract, but this is not a requirement. If it is a concrete class, then it is important to remember that you cannot create and commit to the database object entities of this superclass, since Cayenne would not know which table to add the record to. However you are able to create and commit Students and Teachers, fetch and edit them as concrete Person objects and then commit them back the database as Person objects, since Cayenne now 'knows' what subclass they belong to.</p>
+
+<p>Superclass: abstract or concrete (usually abstract)<br/>
+Class designator column: not required<br/>
+Primary key: in each subclass (unique across all subclasses)</p>
+
+<h3><a name="Inheritanceoverview-Vertical%28joined%29inheritance"></a>Vertical (joined) inheritance</h3>
+
+<p>This final approach requires one table per subclass plus one table for the superclass. All attributes found in the superclass are stored in this additional table. This is particularly useful when you have lots of common attributes or relations to other entities. Perhaps Person is subclassed by Student, Teacher, Parent, AdminStaff, Visitor and Applicant. But all these entities are allowed to borrow books from the library. Now, rather than creating 6 relationships between each of these tables to the Loan table, you can create a single relationship between Person and Loan.</p>
+
+<p>Superclass: abstract or concrete<br/>
+Class designator column: required<br/>
+Primary key: in superclass. Copied into subclass to form the one-to-one join.</p>
+
+<h3><a name="Inheritanceoverview-Terminology"></a>Terminology</h3>
+<p>Different words are used sometimes to describe the implementations of inheritance:</p>
+
+<table class='confluenceTable'><tbody>
+<tr>
+<th class='confluenceTh'>WebObjects</th>
+<th class='confluenceTh'>Hibernate</th>
+<th class='confluenceTh'>JPA</th>
+</tr>
+<tr>
+<td class='confluenceTd'>Single table</td>
+<td class='confluenceTd'>table-per-class-hierarchy</td>
+<td class='confluenceTd'>single table</td>
+</tr>
+<tr>
+<td class='confluenceTd'>Horizontal</td>
+<td class='confluenceTd'>table-per-concrete-class</td>
+<td class='confluenceTd'>table per class</td>
+</tr>
+<tr>
+<td class='confluenceTd'>Vertical</td>
+<td class='confluenceTd'>table-per-subclass</td>
+<td class='confluenceTd'>joined</td>
+</tr>
+</tbody></table>
+
+<h3><a name="Inheritanceoverview-Interfaces"></a>Interfaces</h3>
+
+<p>Sometimes you don't need inheritance but rather you want Cayenne to give you a simple way to define an interface for your classes. The regular Student and Teacher classes both need to implement emailAddress attributes so that you have a consistent way to access that attribute.</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">interface</span> Address {
+	<span class="code-keyword">public</span> <span class="code-object">String</span> getEmailAddress();
+}
+<span class="code-keyword">public</span> class Teacher <span class="code-keyword">extends</span> PersistentObject <span class="code-keyword">implements</span> Address {}
+<span class="code-keyword">public</span> class Student <span class="code-keyword">extends</span> PersistentObject <span class="code-keyword">implements</span> Address {}</pre>
+</div></div></div>
+</div>
+  <div class="clearer">.</div>
+  <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
+
+  <div class="smalltext copyright">
+    Copyright &copy;2001-2007 Apache Software Foundation
+  </div>
+
+</body>
+</html>

Propchange: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Added: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/inheritance-example.png
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Inheritance%20overview/inheritance-example.png?view=auto&rev=552490
==============================================================================
Binary file - no diff available.

Propchange: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/inheritance-example.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/inheritance-overview.png
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Inheritance%20overview/inheritance-overview.png?view=auto&rev=552490
==============================================================================
Binary file - no diff available.

Propchange: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/inheritance-overview.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Many-to-Many%20Relationships/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html Mon Jul  2 06:36:24 2007
@@ -29,35 +29,35 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a><ul>
 </ul>
 </li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent">
-<h3><a name="Many-to-ManyRelationships-ManytoManyRelationships"></a>Many-to-Many Relationships</h3>
+<div id="ConfluenceContent"><h3><a name="Many-to-ManyRelationships-ManytoManyRelationships"></a>Many-to-Many Relationships</h3>
 
 <p>Many-to-many relationships can be modeled in two different ways:</p>
 <ul>
 	<li>By modeling a join table as an ObjEntity. This is the most trivial case but it makes traversing many-to-many relationships relatively inconvenient.</li>
-	<li>Making join table transparent to the object model. This is achieved by using flattened relationships discussed further in this chapter.</li>
+	<li>Making join table transparent to the object model. This is achieved by using flattened relationships <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html" title="CayenneModeler Flattened Relationships">discussed further in this chapter</a>.</li>
 </ul>
 </div>
 </div>
@@ -65,7 +65,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Modeling%20Inheritance/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html Mon Jul  2 06:36:24 2007
@@ -29,26 +29,27 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent">
@@ -103,7 +104,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Modeling%20ObjEntities/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html Mon Jul  2 06:36:24 2007
@@ -29,26 +29,27 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent"><h3><a name="ModelingObjEntities-ModelingObjEntities"></a>Modeling ObjEntities</h3>
@@ -74,7 +75,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Modeling%20Remote%20Persistence/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html Mon Jul  2 06:36:24 2007
@@ -29,26 +29,27 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a><ul>
 </ul>
 </li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent">
@@ -73,7 +74,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/index.html Mon Jul  2 06:36:24 2007
@@ -29,35 +29,48 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
 </ul>
 </li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent">
+<div id="ConfluenceContent"><h2><a name="ModelingObjectLayer-ModelingObjectLayer"></a>Modeling Object Layer</h2>
+
 <p>This chapter describes modeling persistent object layer in Cayenne.</p>
+
+<h3><a name="ModelingObjectLayer-Sections"></a>Sections</h3>
+
+<ol>
+	<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html" title="Modeling ObjEntities">Modeling ObjEntities</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html" title="Modeling Inheritance">Modeling Inheritance</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html" title="Many-to-Many Relationships">Many&#45;to&#45;Many Relationships</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html" title="CayenneModeler Flattened Relationships">CayenneModeler Flattened Relationships</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html" title="Delete Rules">Delete Rules</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html" title="Modeling Remote Persistence">Modeling Remote Persistence</a></li>
+</ol>
 </div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Queries/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Queries/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Queries/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Queries/index.html Mon Jul  2 06:36:24 2007
@@ -29,18 +29,18 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a><ul>
 </ul>
 </li>
-<li><a href="../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent"><p><br/>
@@ -50,7 +50,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Tips/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Tips/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Tips/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Tips/index.html Mon Jul  2 06:36:24 2007
@@ -29,18 +29,18 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
-<li><a href="../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a><ul>
 </ul>
 </li>
+<li><a href="../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent">
@@ -61,7 +61,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Preferences%20Panel/ClassPath/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html Mon Jul  2 06:36:24 2007
@@ -29,23 +29,23 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html">General Preferences</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html">Local DataSources</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html">ClassPath</a><ul>
 </ul>
 </li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html">General Preferences</a></li>
 </ul>
 </li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent">
@@ -62,7 +62,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Preferences%20Panel/General%20Preferences/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html Mon Jul  2 06:36:24 2007
@@ -29,23 +29,23 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a><ul>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html">Local DataSources</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html">ClassPath</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html">General Preferences</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html">Local DataSources</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html">ClassPath</a></li>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent">
@@ -57,7 +57,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Preferences%20Panel/Local%20DataSources/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html Mon Jul  2 06:36:24 2007
@@ -29,23 +29,23 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html">General Preferences</a></li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html">Local DataSources</a><ul>
 </ul>
 </li>
 <li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html">ClassPath</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html">General Preferences</a></li>
 </ul>
 </li>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 </ul>
 </div>
 <div id="ConfluenceContent">
@@ -59,7 +59,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Preferences%20Panel/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/index.html Mon Jul  2 06:36:24 2007
@@ -29,24 +29,24 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
-<li><a href="../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a><ul>
 <li><a href="../../../Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html">General Preferences</a></li>
-<li><a href="../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html">Local DataSources</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html">ClassPath</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html">Local DataSources</a></li>
 </ul>
 </li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
 <li><a href="../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent">
+<div id="ConfluenceContent"><h2><a name="PreferencesPanel-PreferencesPanel"></a>Preferences Panel</h2>
 <p>CayenneModeler relies on a number of user-specific preferences to operate in a user-friendly manner. Some preferences are determined automatically behind the scenes (such as preferred window size or last visited directory), some can be configured by users via "Preferences Panel" described in this chapter.</p>
 
 <p>Preferences are saved and retrieved using Cayenne on top of embedded HSQL database. The actual preferences data is stored as a set of SQL commands in a flat file under <a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html" title="Cayenne User Directory">Cayenne user directory</a>. </p>
@@ -59,13 +59,21 @@
 
 <p><img src="prefs-panel.jpg" align="absmiddle" border="0" /></p>
 
+<h3><a name="PreferencesPanel-Sections"></a>Sections</h3>
+
+<ol>
+	<li><a href="../../../Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html" title="General Preferences">General Preferences</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html" title="Local DataSources">Local DataSources</a></li>
+	<li><a href="../../../Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html" title="ClassPath">ClassPath</a></li>
+</ol>
+
 </div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/index.html?view=diff&rev=552490&r1=552489&r2=552490
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/index.html Mon Jul  2 06:36:24 2007
@@ -29,20 +29,20 @@
   </div>
 <div id="cayenne_toc">
 <ul>
-<li><a href="../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
 <li><a href="../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
-<li><a href="../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
-<li><a href="../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 <li><a href="../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
-<li><a href="../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
+<li><a href="../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
 <li><a href="../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
-<li><a href="../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a></li>
 <li><a href="../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
-<li><a href="../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+<li><a href="../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent">
-<h3><a name="ModelerGuide-MODELERGUIDE"></a>MODELER GUIDE</h3>
+<div id="ConfluenceContent"><h2><a name="ModelerGuide-ModelerGuide"></a>Modeler Guide</h2>
+
 
 <ol>
 	<li><a href="../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html" title="Introduction to CayenneModeler">Introduction to CayenneModeler</a></li>
@@ -57,14 +57,13 @@
 	<li><a href="../../Documentation/Modeler Guide/Modeling Tips/index.html" title="Modeling Tips">Modeling Tips</a></li>
 </ol>
 
-
 </div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2006 Apache Software Foundation
+    Copyright &copy;2001-2007 Apache Software Foundation
   </div>
 
 </body>