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 2006/07/22 20:45:56 UTC

svn commit: r424619 [2/4] - in /incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation: ./ Modeler Guide/ Modeler Guide/Cayenne Project Structure/ Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/ Modeler Guide/Cayenne Proje...

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Coding%20Server/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/index.html Sat Jul 22 11:45:50 2006
@@ -44,7 +44,8 @@
 <li><a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>In the simplest case, there is no custom code on the server. The server would only contain Cayenne mapping files, persistent classes and web.xml descriptor <a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html" title="Remote Object Persistence CWS Deployment">specifying deployment parameters</a> of the service. Customization is done via subclassing <tt>org.objectstyle.cayenne.remote.hessian.service.HessianServlet</tt>, and adding business logic to the server-side persistent objects (e.g. in the validation methods).</p></div>
+<div id="ConfluenceContent"><p><br/>
+In the simplest case, there is no custom code on the server. The server would only contain Cayenne mapping files, persistent classes and web.xml descriptor <a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html" title="Remote Object Persistence CWS Deployment">specifying deployment parameters</a> of the service. Customization is done via subclassing <tt>org.objectstyle.cayenne.remote.hessian.service.HessianServlet</tt>, and adding business logic to the server-side persistent objects (e.g. in the validation methods).</p></div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Comparison/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Comparison/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Comparison/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Comparison/index.html Sat Jul 22 11:45:50 2006
@@ -44,7 +44,8 @@
 <li><a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>TBD...</p>
+<div id="ConfluenceContent">
+<p>TBD...</p>
 
 <ul>
 	<li>EJB</li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Features/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Features/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Features/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Features/index.html Sat Jul 22 11:45:50 2006
@@ -44,7 +44,8 @@
 <li><a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="RemoteObjectPersistenceFeatures-FeaturesofRemoteObjectPersistenceTechnology"></a>Features of Remote Object Persistence Technology</h3>
+<div id="ConfluenceContent">
+<h3><a name="RemoteObjectPersistenceFeatures-FeaturesofRemoteObjectPersistenceTechnology"></a>Features of Remote Object Persistence Technology</h3>
 
 <ul>
 	<li>Unified approach to lightweight object persistence across multiple tiers of a distributed system.</li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Installation/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html Sat Jul 22 11:45:50 2006
@@ -44,7 +44,8 @@
 <li><a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="RemoteObjectPersistenceInstallation-InstallationandSystemRequirements"></a>Installation and System Requirements</h3>
+<div id="ConfluenceContent">
+<h3><a name="RemoteObjectPersistenceInstallation-InstallationandSystemRequirements"></a>Installation and System Requirements</h3>
 
 <p>Remote object persistence support is included in the standard Cayenne distribution. System requirements are the same as for the rest of Cayenne, and there is no special installation procedure. Check the <a href="../../../Documentation/User Guide/Installation/index.html" title="Installation">Installation</a> chapter of Cayenne User Guide for details. </p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Introduction/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html Sat Jul 22 11:45:50 2006
@@ -44,7 +44,8 @@
 <li><a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>"Remote Object Persistence" is a low-overhead web services-based technology that provides lightweight object persistence and query functionality to 'remote' applications. In other words it provides familiar Cayenne API to applications that do not have direct access to the database. Instead such applications would access <span class="error">&#91;Cayenne Web Service (CWS)&#93;</span>. A single abstract data model (expressed as Cayenne XML DataMap) is used on the server and on the client, while execution logic can be partitioned between the tiers.</p>
+<div id="ConfluenceContent">
+<p>"Remote Object Persistence" is a low-overhead web services-based technology that provides lightweight object persistence and query functionality to 'remote' applications. In other words it provides familiar Cayenne API to applications that do not have direct access to the database. Instead such applications would access <span class="nobr"><a href="/confluence/pages/createpage.action?spaceKey=CAY&amp;title=Cayenne%20Web%20Service" title="Create Page in space CAY: Cayenne Web Service" class="createlink">Cayenne Web Service (CWS)<sup><img class="rendericon" src="../../../images/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. A single abstract data model (expressed as Cayenne XML DataMap) is used on the server and on the client, while execution logic can be partitioned between the tiers.</p>
 
 <p>The following picture compares a regular Cayenne web application and a rich client application that uses remote object persistence technology:</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Limitations/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html Sat Jul 22 11:45:50 2006
@@ -44,7 +44,8 @@
 </li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>This page can be viewed as a Remote Object Persistence TODO. The following things are pending improvement:</p>
+<div id="ConfluenceContent">
+<p>This page can be viewed as a Remote Object Persistence TODO. The following things are pending improvement:</p>
 
 <ul>
 	<li>Client classes have to be available to the server JVM.</li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Authentication/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Quick%20Start/Remote%20Object%20Persistence%20Tutorial%20Authentication/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Authentication/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Authentication/index.html Sat Jul 22 11:45:50 2006
@@ -51,7 +51,8 @@
 <li><a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>You probably don't want everybody in the world to connect to your service and access (and update!) arbitrary data. The first step in securing Cayenne service is implementing client authentication. The easiest way to do it is to delegate the authentication task to the web container that is running the service. HessianConnection used in the <a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html" title="Remote Object Persistence Tutorial Client Code">previous chapter</a> supports such authentication on the client side.</p>
+<div id="ConfluenceContent">
+<p>You probably don't want everybody in the world to connect to your service and access (and update!) arbitrary data. The first step in securing Cayenne service is implementing client authentication. The easiest way to do it is to delegate the authentication task to the web container that is running the service. HessianConnection used in the <a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html" title="Remote Object Persistence Tutorial Client Code">previous chapter</a> supports such authentication on the client side.</p>
 
 <h3><a name="RemoteObjectPersistenceTutorialAuthentication-ConfiguringJettyLauncher"></a>Configuring JettyLauncher</h3>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Quick%20Start/Remote%20Object%20Persistence%20Tutorial%20Client%20Code/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html Sat Jul 22 11:45:50 2006
@@ -51,7 +51,8 @@
 <li><a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="RemoteObjectPersistenceTutorialClientCode-StartingCommandLineClient"></a>Starting Command Line Client</h3>
+<div id="ConfluenceContent">
+<h3><a name="RemoteObjectPersistenceTutorialClientCode-StartingCommandLineClient"></a>Starting Command Line Client</h3>
 
 <p>One of the benefits of Cayenne remote object persistence technology is that the client persistence code uses the same API as the server code. We will demonstrate this by porting the command-line Cayenne application developed as a part of <a href="../../../../Documentation/User Guide/Quick Start/index.html" title="Quick Start">Quick Start</a> tutorial to a remote client.</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Project/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Quick%20Start/Remote%20Object%20Persistence%20Tutorial%20Client%20Project/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Project/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Project/index.html Sat Jul 22 11:45:50 2006
@@ -51,7 +51,8 @@
 <li><a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="RemoteObjectPersistenceTutorialClientProject-CreateaClientProject"></a>Create a Client Project</h3>
+<div id="ConfluenceContent">
+<h3><a name="RemoteObjectPersistenceTutorialClientProject-CreateaClientProject"></a>Create a Client Project</h3>
 
 <p><em>Creation of a new Eclipse project has been discussed in some details <a href="../../../../Documentation/User Guide/Quick Start/Tutorial Setup/index.html" title="Tutorial Setup">here</a>, so we will omit the screenshots for the common parts.</em></p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Setup/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Quick%20Start/Remote%20Object%20Persistence%20Tutorial%20Setup/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Setup/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Setup/index.html Sat Jul 22 11:45:50 2006
@@ -51,7 +51,8 @@
 <li><a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>The starting point of this tutorial is a web application that was created in the <a href="../../../../Documentation/User Guide/Quick Start/index.html" title="Quick Start">Quick Start</a> tutorial. If you went through the Quick Start tutorial already ignore these instructions and proceed to the next chapter. If you skipped it and want to start with Remote Object Persistence right away, below is a brief overview of the setup prerequisites. </p>
+<div id="ConfluenceContent">
+<p>The starting point of this tutorial is a web application that was created in the <a href="../../../../Documentation/User Guide/Quick Start/index.html" title="Quick Start">Quick Start</a> tutorial. If you went through the Quick Start tutorial already ignore these instructions and proceed to the next chapter. If you skipped it and want to start with Remote Object Persistence right away, below is a brief overview of the setup prerequisites. </p>
 
 <h3><a name="RemoteObjectPersistenceTutorialSetup-SetupfromScratch"></a>Setup from Scratch</h3>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial WebService/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Quick%20Start/Remote%20Object%20Persistence%20Tutorial%20WebService/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial WebService/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial WebService/index.html Sat Jul 22 11:45:50 2006
@@ -51,7 +51,8 @@
 <li><a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="RemoteObjectPersistenceTutorialWebService-DeployingaWebService"></a>Deploying a Web Service</h3>
+<div id="ConfluenceContent">
+<h3><a name="RemoteObjectPersistenceTutorialWebService-DeployingaWebService"></a>Deploying a Web Service</h3>
 
 <p>Now lets get back to the <tt>"cayenne-tutorial"</tt> project that contains a web application. </p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Quick%20Start/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/index.html Sat Jul 22 11:45:50 2006
@@ -49,7 +49,8 @@
 <li><a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>This tutorial is an extension of a <a href="../../../Documentation/User Guide/Quick Start/index.html" title="Quick Start">Quick Start</a> Cayenne tutorial, showing how to deploy an existing mapping project as a Cayenne web service, and then write a command-line client to access the service. Note that in most real applications the client will be a Swing or SWT GUI application. We are showing the command line example to avoid dealing with UI details and concentrate on Cayenne API.</p>
+<div id="ConfluenceContent">
+<p>This tutorial is an extension of a <a href="../../../Documentation/User Guide/Quick Start/index.html" title="Quick Start">Quick Start</a> Cayenne tutorial, showing how to deploy an existing mapping project as a Cayenne web service, and then write a command-line client to access the service. Note that in most real applications the client will be a Swing or SWT GUI application. We are showing the command line example to avoid dealing with UI details and concentrate on Cayenne API.</p>
 
 <p>Full tutorial source code in a form of Eclipse project is distributed with Cayenne (see <tt>"src/tutorials/quick-start-rop"</tt> folder).</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Security/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Security/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Security/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence Security/index.html Sat Jul 22 11:45:50 2006
@@ -44,7 +44,8 @@
 <li><a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="RemoteObjectPersistenceSecurity-SecuringCayenneWebServiceAccess"></a>Securing Cayenne Web Service Access</h3>
+<div id="ConfluenceContent">
+<h3><a name="RemoteObjectPersistenceSecurity-SecuringCayenneWebServiceAccess"></a>Securing Cayenne Web Service Access</h3>
 
 <ul>
 	<li><a href="../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Authentication/index.html" title="Remote Object Persistence Tutorial Authentication">Use HTTP(S) BASIC authentication</a> to authenticate the clients.</li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/index.html Sat Jul 22 11:45:50 2006
@@ -42,7 +42,8 @@
 <li><a href="../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html">Remote Object Persistence Limitations</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><ol>
+<div id="ConfluenceContent">
+<ol>
 	<li><a href="../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html" title="Remote Object Persistence Introduction">Introduction</a></li>
 	<li><a href="../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Features/index.html" title="Remote Object Persistence Features">Main Features</a></li>
 	<li><a href="../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html" title="Remote Object Persistence Installation">Installation and Dependencies</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdataport/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/cdataport/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdataport/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdataport/index.html Sat Jul 22 11:45:50 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Sometimes it is necessary to recreate a database, copying data from another existing database. For instance, recreating development database instance from production data, etc. While most RDBMS provide data import/export tools, they normally require advanced DBA skills to use and are most often not portable across database engines. Cayenne will provide a lightweight ant task to do data porting between the databases with identical schema, using DataMap information.</p>
+<div id="ConfluenceContent">
+<p>Sometimes it is necessary to recreate a database, copying data from another existing database. For instance, recreating development database instance from production data, etc. While most RDBMS provide data import/export tools, they normally require advanced DBA skills to use and are most often not portable across database engines. Cayenne will provide a lightweight ant task to do data porting between the databases with identical schema, using DataMap information.</p>
 
 <p><tt>cdataport</tt> is an Ant task that takes a Cayenne project (cayenne.xml) with at least one DataMap and two DataNodes and ports data from source DataNode to a destination DataNode. All DataMaps linked to either the source or the target DataNode will be considered for porting.</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdbgen/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/cdbgen/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdbgen/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdbgen/index.html Sat Jul 22 11:45:50 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><tt>cdbgen</tt> is an Ant task that uses Cayenne DataMap to drop and/or generate schema objects of a specified database.</p>
+<div id="ConfluenceContent">
+<p><tt>cdbgen</tt> is an Ant task that uses Cayenne DataMap to drop and/or generate schema objects of a specified database.</p>
 
 <h3><a name="cdbgen-Parameters"></a>Parameters</h3>
 <table class='confluenceTable'><tbody>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdeploy/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/cdeploy/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdeploy/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdeploy/index.html Sat Jul 22 11:45:50 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><tt>cdeploy</tt> is an Ant task that configures Cayenne connection information in existing jar files that contain Cayenne project information. It is useful for the automation of deployment of Cayenne-based frameworks in different environments.</p>
+<div id="ConfluenceContent">
+<p><tt>cdeploy</tt> is an Ant task that configures Cayenne connection information in existing jar files that contain Cayenne project information. It is useful for the automation of deployment of Cayenne-based frameworks in different environments.</p>
 
 <h3><a name="cdeploy-Parameters"></a>Parameters</h3>
 <table class='confluenceTable'><tbody>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cgen/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/cgen/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cgen/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cgen/index.html Sat Jul 22 11:45:50 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><tt>cgen</tt> is an Ant task that generates and maintains DataObjects source files based on Cayenne DataMap. If "makepairs" is set to "true" (default), this task will generate a pair of classes (superclass/subclass) for each ObjEntity in the DataMap. Superclasses should not be changed manually, since they are always overwritten. Subclasses are never overwritten and may be later customized by the user. If "makepairs" is set to "false", a single class will be generated for each ObjEntity.</p>
+<div id="ConfluenceContent">
+<p><tt>cgen</tt> is an Ant task that generates and maintains DataObjects source files based on Cayenne DataMap. If "makepairs" is set to "true" (default), this task will generate a pair of classes (superclass/subclass) for each ObjEntity in the DataMap. Superclasses should not be changed manually, since they are always overwritten. Subclasses are never overwritten and may be later customized by the user. If "makepairs" is set to "false", a single class will be generated for each ObjEntity.</p>
 
 <p>By creating custom templates, Cgen can also be used to generate other output (such as web pages, reports, specialized code templates) based on DataMap information.</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/index.html Sat Jul 22 11:45:50 2006
@@ -51,7 +51,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Cayenne ships with Ant tasks that provide Ant frontend to a number of useful operations in Cayenne. The following tasks are included:</p>
+<div id="ConfluenceContent">
+<p>Cayenne ships with Ant tasks that provide Ant frontend to a number of useful operations in Cayenne. The following tasks are included:</p>
 
 <ul>
 	<li><b><a href="../../../Documentation/User Guide/Ant Tasks/cgen/index.html" title="cgen">cgen</a></b> - Java class generator</li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Customizing/Extended Types/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Customizing/Extended%20Types/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Customizing/Extended Types/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Customizing/Extended Types/index.html Sat Jul 22 11:45:50 2006
@@ -50,7 +50,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>JDBC specification defines a set of "standard" database column types (defined in java.sql.Types class) and a very specific mapping of these types to Java Object Types, such as java.lang.String, java.math.BigDecimal, etc. Sometimes there is a need to use a custom Java type not known to JDBC driver. CayenneModeler allows to configure an arbitrary Java class as an <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/map/ObjAttribute.html" title="Visit page outside Confluence" rel="nofollow">ObjAttribute<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> type by simply entering a fully-qualified name such class in the type column of an ObjAttribute. However there is more to it than just that. Cayenne needs to know how to instantiate this type from a database "primitive" value, and conversly, how to transform an object
  of the custom type to a JDBC-compatible object.</p>
+<div id="ConfluenceContent">
+<p>JDBC specification defines a set of "standard" database column types (defined in java.sql.Types class) and a very specific mapping of these types to Java Object Types, such as java.lang.String, java.math.BigDecimal, etc. Sometimes there is a need to use a custom Java type not known to JDBC driver. CayenneModeler allows to configure an arbitrary Java class as an <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/map/ObjAttribute.html" title="Visit page outside Confluence" rel="nofollow">ObjAttribute<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> type by simply entering a fully-qualified name such class in the type column of an ObjAttribute. However there is more to it than just that. Cayenne needs to know how to instantiate this type from a database "primitive" value, and conversly, how to transform an object of the custom type to a JDB
 C-compatible object.</p>
 
 <h3><a name="ExtendedTypes-SupportingNonStandardTypes"></a>Supporting Non-Standard Types</h3>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Customizing/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Customizing/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Customizing/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Customizing/index.html Sat Jul 22 11:45:50 2006
@@ -48,7 +48,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Here we will discuss a few Cayenne customization techniques:</p>
+<div id="ConfluenceContent">
+<p>Here we will discuss a few Cayenne customization techniques:</p>
 
 <ul>
 	<li><a href="../../../Documentation/User Guide/Customizing/Extended Types/index.html" title="Extended Types">Extended Types</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataContextDelegate/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/DataContextDelegate/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataContextDelegate/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataContextDelegate/index.html Sat Jul 22 11:45:50 2006
@@ -56,7 +56,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>DataContext supports runtime customization via a DataContextDelegate interface. A user can assign a custom delegate instance to a DataContext by calling DataContext.setDelegate(..). Delegate is optional, and if it is not set, DataContext would go on with its default behavior. If a delegate is set, DataContext consults with it at some critical points in the normal flow execution. A delegate can modify the flow, abort an operation, modify objects participating in an operation, or perform any other tasks it deems necessary.</p>
+<div id="ConfluenceContent">
+<p>DataContext supports runtime customization via a DataContextDelegate interface. A user can assign a custom delegate instance to a DataContext by calling DataContext.setDelegate(..). Delegate is optional, and if it is not set, DataContext would go on with its default behavior. If a delegate is set, DataContext consults with it at some critical points in the normal flow execution. A delegate can modify the flow, abort an operation, modify objects participating in an operation, or perform any other tasks it deems necessary.</p>
 
 <p>DataContextDelegate currently has two groups of methods - method to filter select queries, and methods to react to external updates of the ObjectStore:</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataContextFactory/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/DataContextFactory/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataContextFactory/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataContextFactory/index.html Sat Jul 22 11:45:50 2006
@@ -56,7 +56,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>To customize how the DataContext is built, an <em>optional</em> DataContextFactory can be registered with DataDomain in the Modeler. The class name you enter must implement <tt>org.objectstyle.cayenne.access.DataContextFactory</tt> interface. If a factory is entered, Cayenne will use it in <a href="../../../../Documentation/User Guide/DataContext/Obtaining DataContext/index.html" title="Obtaining DataContext">all places</a> where the DataContext is created. A single factory instance is reused for the life of the DataDomain.</p>
+<div id="ConfluenceContent">
+<p>To customize how the DataContext is built, an <em>optional</em> DataContextFactory can be registered with DataDomain in the Modeler. The class name you enter must implement <tt>org.objectstyle.cayenne.access.DataContextFactory</tt> interface. If a factory is entered, Cayenne will use it in <a href="../../../../Documentation/User Guide/DataContext/Obtaining DataContext/index.html" title="Obtaining DataContext">all places</a> where the DataContext is created. A single factory instance is reused for the life of the DataDomain.</p>
 
 <p><img src="datacontextfactory.jpg" align="absmiddle" border="0" /></p></div>
 </div>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataObject State Management/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/DataObject%20State%20Management/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataObject State Management/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataObject State Management/index.html Sat Jul 22 11:45:50 2006
@@ -56,7 +56,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Arguably the second most important function of DataContext (first is performing queries) is keeping track of changes made to the registered DataObjects. "Registered" is a keyword here - registering an object with DataContext is what gives this object its persistent qualities.</p>
+<div id="ConfluenceContent">
+<p>Arguably the second most important function of DataContext (first is performing queries) is keeping track of changes made to the registered DataObjects. "Registered" is a keyword here - registering an object with DataContext is what gives this object its persistent qualities.</p>
 
 <h3><a name="DataObjectStateManagement-HowtoRegisteraDataObject"></a>How to Register a DataObject</h3>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Moving Objects Between Contexts/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/Moving%20Objects%20Between%20Contexts/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Moving Objects Between Contexts/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Moving Objects Between Contexts/index.html Sat Jul 22 11:45:50 2006
@@ -56,7 +56,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Each instance of a DataObject belongs to only one DataContext for the duration of the object lifecycle. Sometimes there maybe a need to transfer a list of objects from one DataContext to another. The goal of this operation is to be able to use such objects in relationships with objects of the target DataContext. Most common use for this feature is the following. An application may have a "shared" DataContext that is used to fetch "static" read only lookup data. To avoid fetching the same data over and over again for each session, objects from the shared DataContext can be transferred to a session DataContext by calling <tt>DataContext.localObject()</tt>:</p>
+<div id="ConfluenceContent">
+<p>Each instance of a DataObject belongs to only one DataContext for the duration of the object lifecycle. Sometimes there maybe a need to transfer a list of objects from one DataContext to another. The goal of this operation is to be able to use such objects in relationships with objects of the target DataContext. Most common use for this feature is the following. An application may have a "shared" DataContext that is used to fetch "static" read only lookup data. To avoid fetching the same data over and over again for each session, objects from the shared DataContext can be transferred to a session DataContext by calling <tt>DataContext.localObject()</tt>:</p>
 
 <div class="code"><div class="codeContent">
 <pre class="code-java">DataContext sessionContext = DataContext.getThreadDataContext();

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Nested DataContexts/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/Nested%20DataContexts/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Nested DataContexts/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Nested DataContexts/index.html Sat Jul 22 11:45:50 2006
@@ -56,7 +56,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>One of the goals of the DataContext is to provide an isolated area where local object changes can be performed without affecting other similar areas or the underlying storage. At some point in time users would either commit changes to the underlying storage or undo them (roll them back). </p>
+<div id="ConfluenceContent">
+<p>One of the goals of the DataContext is to provide an isolated area where local object changes can be performed without affecting other similar areas or the underlying storage. At some point in time users would either commit changes to the underlying storage or undo them (roll them back). </p>
 
 <p>If a DataContext is directly attached to the DataDomain, a call to <tt>DataContext.commitChanges()</tt> results in changes written to the database. On the other hand if DataContext's direct parent in the access stack is not a DataDomain, but another DataContext, changes can be saved to the parent without saving them to the database. Such child context is often called "nested".</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Obtaining DataContext/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/Obtaining%20DataContext/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Obtaining DataContext/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Obtaining DataContext/index.html Sat Jul 22 11:45:50 2006
@@ -56,7 +56,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Depending on deployment environment and application needs, Cayenne can be configured in a few different ways to make DataContext instances available. This is discussed in detail in deployment chapter. In this chapter we assume a properly deployed application and will concentrate on how to obtain a DataContext for the database access. The following are the most common ways to achieve that:</p>
+<div id="ConfluenceContent">
+<p>Depending on deployment environment and application needs, Cayenne can be configured in a few different ways to make DataContext instances available. This is discussed in detail in deployment chapter. In this chapter we assume a properly deployed application and will concentrate on how to obtain a DataContext for the database access. The following are the most common ways to achieve that:</p>
 
 <h3><a name="ObtainingDataContext-CreatingDataContextontheSpot"></a>Creating DataContext on the Spot</h3>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Running Queries/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/Running%20Queries/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Running Queries/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/Running Queries/index.html Sat Jul 22 11:45:50 2006
@@ -56,7 +56,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Cayenne Query API is discussed in the following chapters. This chapter concentrates on how to execute an existing query via a DataContext. Still we'd like to point to a few aspects of the query API here, as they are important for the query execution discussion:</p>
+<div id="ConfluenceContent">
+<p>Cayenne Query API is discussed in the following chapters. This chapter concentrates on how to execute an existing query via a DataContext. Still we'd like to point to a few aspects of the query API here, as they are important for the query execution discussion:</p>
 
 <ul>
 	<li>There are selecting and non-selecting queries. Selecting queries return objects back to the caller, while non-selecting just perform some DB operation (such as INSERT, DELETE, UPDATE, etc.) without returning anything back.</li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/index.html Sat Jul 22 11:45:50 2006
@@ -54,7 +54,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>In most applications <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/access/DataContext.html" title="Visit page outside Confluence" rel="nofollow">DataContext<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> is the main user access point to all Cayenne functionality. It provides query execution facilities as well as object state management functions. Applications rarely directly deal with access or mapping objects beyond DataContext.</p>
+<div id="ConfluenceContent">
+<p>In most applications <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/access/DataContext.html" title="Visit page outside Confluence" rel="nofollow">DataContext<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> is the main user access point to all Cayenne functionality. It provides query execution facilities as well as object state management functions. Applications rarely directly deal with access or mapping objects beyond DataContext.</p>
 
 <p>One of the important features of DataContext is that it isolates changes made in a user session from other users. With this in mind, DataContext normally has a session scope. "Session" can have different meanings in different types of applications. Good example is an HttpSession in a web application. Each one of HttpSessions will normally need a single instance of DataContext.</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Accessing PK and FK values/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/Accessing%20PK%20and%20FK%20values/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Accessing PK and FK values/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Accessing PK and FK values/index.html Sat Jul 22 11:45:50 2006
@@ -58,7 +58,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Normally it is not advisable to map primary and foreign key columns (PK and FK) as Java class properties (ObjAttributes). When reverse engineering of the database is done using CayenneModeler, produced mapping will reflect that - PKs and FKs will not be included in the Java class. However sometimes an application requires access to these values.</p>
+<div id="ConfluenceContent">
+<p>Normally it is not advisable to map primary and foreign key columns (PK and FK) as Java class properties (ObjAttributes). When reverse engineering of the database is done using CayenneModeler, produced mapping will reflect that - PKs and FKs will not be included in the Java class. However sometimes an application requires access to these values.</p>
 
 <table cellpadding='5' width='85%' cellspacing='8px' class='infoMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>For generic and easy API to obtain an object primary key or to find an object from a known PK, skip to the next chapter on DataObjectUtils class.</td></tr></table>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObject Validation/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/DataObject%20Validation/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObject Validation/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObject Validation/index.html Sat Jul 22 11:45:50 2006
@@ -58,7 +58,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>DataObject implements a set of methods to validate its state. DataContext calls these methods before performing a commit. If validation fails, commit is aborted with ValidationException. There are a few clear benefits of validating DataObjects at the application level before committing them to the database:</p>
+<div id="ConfluenceContent">
+<p>DataObject implements a set of methods to validate its state. DataContext calls these methods before performing a commit. If validation fails, commit is aborted with ValidationException. There are a few clear benefits of validating DataObjects at the application level before committing them to the database:</p>
 
 <ul>
 	<li>Cayenne can leverage ORM metadata (DataMap) to check for many standard error conditions.</li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjectUtils/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/DataObjectUtils/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjectUtils/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjectUtils/index.html Sat Jul 22 11:45:50 2006
@@ -58,7 +58,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>DataObjectUtils class provides an important and easy to use facility to obtain a primary key value from a DataObject and to locate a DataObject in the database for a known primary key. Both operations work in a generic fashion and do not require primary key to be an object property.</p>
+<div id="ConfluenceContent">
+<p>DataObjectUtils class provides an important and easy to use facility to obtain a primary key value from a DataObject and to locate a DataObject in the database for a known primary key. Both operations work in a generic fashion and do not require primary key to be an object property.</p>
 <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><b class="strong">Security Warning</b><br />DataObjectUtils make it very easy to use a primary key value as a universal "code" for an object in web forms and URLs. This opens a potential security hole in the interface. If application code is not careful enough, a malicious user can gain access to the information she is not allowed to see (e.g. other people's accounts) simply by trying a series of sequential numbers. So for example it is probably ok to use product PK to build a bookmarkable link to a catalog product, but it may not be appropriate to do that for a private user profile record.</td></tr></table>
 <p>DataObjectUtils API is really straightforward and self-explanatory. It supports the most common case of a single column integer primary key, but also a more generic case of an arbitrary PK (that can also be compound, i.e. consist of more than one column). Here is an example:</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjects Example/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/DataObjects%20Example/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjects Example/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjects Example/index.html Sat Jul 22 11:45:50 2006
@@ -58,7 +58,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>As discussed in <a href="../../../../Documentation/User Guide/DataObjects/index.html" title="DataObjects">DataContext</a> chapter, any changes made to the DataObjects via "set*" methods are synchronized with the database by calling <tt>DataContext.commitChanges</tt>. Here is an example showing how the <tt>Painting</tt> object is fetched, modified and saved back. The following modifications are performed: the price of the first retrieved painting is doubled, a new painting is added that belongs to the same artist as the painting fetched before:</p>
+<div id="ConfluenceContent">
+<p>As discussed in <a href="../../../../Documentation/User Guide/DataObjects/index.html" title="DataObjects">DataContext</a> chapter, any changes made to the DataObjects via "set*" methods are synchronized with the database by calling <tt>DataContext.commitChanges</tt>. Here is an example showing how the <tt>Painting</tt> object is fetched, modified and saved back. The following modifications are performed: the price of the first retrieved painting is doubled, a new painting is added that belongs to the same artist as the painting fetched before:</p>
 <div class="code"><div class="codeContent">
 <pre class="code-java"><span class="code-keyword">import</span> java.math.BigDecimal;
 <span class="code-keyword">import</span> java.util.List;

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Deleting Objects/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/Deleting%20Objects/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Deleting Objects/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Deleting Objects/index.html Sat Jul 22 11:45:50 2006
@@ -58,7 +58,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>As discussed before, an object must be deleted in the DataContext to trigger a removal of the corresponding row from the database on commit. There are few simple ways to delete individual objects and collections of objects. Quiet naturally delete operation changes object state to PersistenceState.DELETED. However there maybe other consequences of such operation for the overall object graph. Such consequences are controlled via <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html" title="Delete Rules">delete rules</a> configured for object relationships. Properly configuring delete rules will simplify the application code, as you no longer need to track related objects and do the right thing with them. Other delete rule effects are discussed for each DataContext deletion method individually.</p>
+<div id="ConfluenceContent">
+<p>As discussed before, an object must be deleted in the DataContext to trigger a removal of the corresponding row from the database on commit. There are few simple ways to delete individual objects and collections of objects. Quiet naturally delete operation changes object state to PersistenceState.DELETED. However there maybe other consequences of such operation for the overall object graph. Such consequences are controlled via <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html" title="Delete Rules">delete rules</a> configured for object relationships. Properly configuring delete rules will simplify the application code, as you no longer need to track related objects and do the right thing with them. Other delete rule effects are discussed for each DataContext deletion method individually.</p>
 
 <h5><a name="DeletingObjects-Deletingasingleobject"></a>Deleting a single object</h5>
 <div class="code"><div class="codeContent">

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Flattened Relationships/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/Flattened%20Relationships/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Flattened Relationships/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Flattened Relationships/index.html Sat Jul 22 11:45:50 2006
@@ -58,7 +58,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Flattened relationships represent relationship between two types of DataObjects that is not direct in the underlying relational storage. Instead it is mapped across one or more "join" tables. Still from the application point of view there is no diffrence in working with flattened relationships compared to the "normal" ones. Cayenne internally figures out how to build the needed query joins to retrieve related objects. On adding or removing an object to/from a flattened relationship via a corresponding "addTo..." / "removeFrom..." method an appropriate join record is created or removed.</p>
+<div id="ConfluenceContent">
+<p>Flattened relationships represent relationship between two types of DataObjects that is not direct in the underlying relational storage. Instead it is mapped across one or more "join" tables. Still from the application point of view there is no diffrence in working with flattened relationships compared to the "normal" ones. Cayenne internally figures out how to build the needed query joins to retrieve related objects. On adding or removing an object to/from a flattened relationship via a corresponding "addTo..." / "removeFrom..." method an appropriate join record is created or removed.</p>
 <table cellpadding='5' width='85%' cellspacing='8px' class='infoMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b class="strong">Flattened Relationships Limitations</b><br />Currently only many-to-many flattened relatationships with a single join table can be modified. All other types of flattened relationships can be used as "read-only". This is reflected in the DataObject code generated for such relationships - no set/addTo/RemoveFrom methods are created for read-only relationships.</td></tr></table></div>
 </div>
   <div class="clearer">.</div>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Generic Persistent Class/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/Generic%20Persistent%20Class/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Generic Persistent Class/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Generic Persistent Class/index.html Sat Jul 22 11:45:50 2006
@@ -58,9 +58,10 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><em>(available since 1.2M9)</em></p>
+<div id="ConfluenceContent">
+<p><em>(available since 1.2M9)</em></p>
 
-<p><span class="error">&#91;Download the example code&#93;</span></p>
+<p><a href="http://cwiki.apache.org/confluence/confluence/display/CAY/Generic+DataObjects+Example" title="Generic DataObjects Example">Download the example code</a></p>
 
 <h2><a name="GenericPersistentClass-WhatIs%22GenericPersistentClass%22"></a>What Is "Generic Persistent Class"</h2>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Handling Inheritance/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/Handling%20Inheritance/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Handling Inheritance/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Handling Inheritance/index.html Sat Jul 22 11:45:50 2006
@@ -58,7 +58,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>"Inheritance" is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called "single table inheritance"). Such mapping is described in detail in the <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html" title="Modeling Inheritance">Modeler Guide</a>. The idea of single table inheritance is that a "class" of a database row is determined from the values in one or more columns of the base table. These columns are called "class designator columns".</p>
+<div id="ConfluenceContent">
+<p>"Inheritance" is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called "single table inheritance"). Such mapping is described in detail in the <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html" title="Modeling Inheritance">Modeler Guide</a>. The idea of single table inheritance is that a "class" of a database row is determined from the values in one or more columns of the base table. These columns are called "class designator columns".</p>
 
 <table cellpadding='5' width='85%' cellspacing='8px' class='infoMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b class="strong">Initial Values of the Classs Designator Columns</b><br />Assigning correct values to the "class designator columns" mentioned above is one task that is not yet automated in Cayenne and requires user code in the DataObject, as discussed in the next subsection. In the future versions this will likely be handled in the mapping and completely outside of the Java classes, so the advise below will become obsolete.</td></tr></table>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Relationships/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/Relationships/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Relationships/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Relationships/index.html Sat Jul 22 11:45:50 2006
@@ -58,7 +58,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Relationships are special <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/DataObject.html" title="Visit page outside Confluence" rel="nofollow">DataObject<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> properties that reference other "related" objects. Semantically there are two types of relationships - to-one pointing to just a single DataObjects (e.g. Painting.toArtist), and to-many pointing to a collection of DataObjects of the same base type (e.g. Artist.paintingArray).</p>
+<div id="ConfluenceContent">
+<p>Relationships are special <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/DataObject.html" title="Visit page outside Confluence" rel="nofollow">DataObject<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> properties that reference other "related" objects. Semantically there are two types of relationships - to-one pointing to just a single DataObjects (e.g. Painting.toArtist), and to-many pointing to a collection of DataObjects of the same base type (e.g. Artist.paintingArray).</p>
 
 <h3><a name="Relationships-ToOneRelationships"></a>To-One Relationships</h3>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/index.html Sat Jul 22 11:45:50 2006
@@ -56,7 +56,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/DataObject.html" title="Visit page outside Confluence" rel="nofollow">DataObjects<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> (Cayenne persistent objects) are composed of attributes and relationships. Attributes are the simplest object properties (as in "java bean properties") that can be stored in the columns in the database. Those are usually string, numeric, binary or date values. Another type of properties is relationships. They represent related DataObjects (to-one relationships) or collections of DataObjects (to-many relationships). To read and modify attributes and relationships, application code would simply invoke corresponding get or set methods. In case of to-many relationships represented by collections there are also add and remove methods.</p>
+<div id="ConfluenceContent">
+<p><span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/DataObject.html" title="Visit page outside Confluence" rel="nofollow">DataObjects<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> (Cayenne persistent objects) are composed of attributes and relationships. Attributes are the simplest object properties (as in "java bean properties") that can be stored in the columns in the database. Those are usually string, numeric, binary or date values. Another type of properties is relationships. They represent related DataObjects (to-one relationships) or collections of DataObjects (to-many relationships). To read and modify attributes and relationships, application code would simply invoke corresponding get or set methods. In case of to-many relationships represented by collections there are also add and remove methods.</p>
 
 <p>Queries discussed in the previous chapter are used to obtain the initial sets of DataObjects. After that a graph of persistent objects is navigated and modified via relationship methods, thus hiding the underlying relational storage complexity and giving application a nice object view of the relevant subset of the database data.</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DVModeler GUI Tool/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataViews/DVModeler%20GUI%20Tool/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DVModeler GUI Tool/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DVModeler GUI Tool/index.html Sat Jul 22 11:45:50 2006
@@ -53,7 +53,8 @@
 </li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>DVModeler is a Java GUI tool to work with DataViews configuration included in Cayenne projects. Steps needed to start DVModeler are similar to that of CayenneModeler. Main class is <tt>org.objectstyle.cayenne.dataview.dvmodeler.Main</tt>. For convenience Cayenne distribution provides run scripts to start DVModeler on Windows and UNIX platforms. To take advantage of these scripts, user must set CAYENNE_HOME (optional) and JAVA_HOME environment variables as described in <a href="../../../../Documentation/User Guide/Installation/index.html" title="Installation">Installation</a>.</p>
+<div id="ConfluenceContent">
+<p>DVModeler is a Java GUI tool to work with DataViews configuration included in Cayenne projects. Steps needed to start DVModeler are similar to that of CayenneModeler. Main class is <tt>org.objectstyle.cayenne.dataview.dvmodeler.Main</tt>. For convenience Cayenne distribution provides run scripts to start DVModeler on Windows and UNIX platforms. To take advantage of these scripts, user must set CAYENNE_HOME (optional) and JAVA_HOME environment variables as described in <a href="../../../../Documentation/User Guide/Installation/index.html" title="Installation">Installation</a>.</p>
 
 <p>To run DVModeler, simply doubleclick the appropriate script. Alternatively it can be run from the command line.</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DataView Concepts/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataViews/DataView%20Concepts/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DataView Concepts/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DataView Concepts/index.html Sat Jul 22 11:45:50 2006
@@ -53,7 +53,8 @@
 </li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="DataViewConcepts-DataViewHierarchy"></a>DataView Hierarchy</h3>
+<div id="ConfluenceContent">
+<h3><a name="DataViewConcepts-DataViewHierarchy"></a>DataView Hierarchy</h3>
 
 <p>The class diagram on the figure below captures the structure of Data Views and how they rely on the classes in the Cayenne subpackages. Single DataView object is the root of the hierarchy. It serves as a container for ObjEntityViews from one or more DataView configuration files. Just like entities in the DataMaps, ObjEntityViews can freely refer to each other whether they are defined in the same configuration file or different ones. The recommended practice is to store closely related ObjEntityViews in the same XML "module" and define several "modules" based on the criterion of such closeness. When you load the list of XML files into the DataView, all the relationships are resolved automatically and the ObjEntityViews share the same namespace (so they must have different names even if they are located in different XML files).</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DataViews in Action/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataViews/DataViews%20in%20Action/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DataViews in Action/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/DataViews in Action/index.html Sat Jul 22 11:45:50 2006
@@ -53,7 +53,8 @@
 </li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Here we illustrate the discussion of DataViews with configuration samples and code snippets. Cayenne project DTD file supports references to data view configuration files. This information is loaded into the Cayenne Configuration instance along with the DataDomain, DataNode, and DataMap entries. Since the DataView functionality is optional and would not be very useful in some deployment scenarios (server-side applications) the DataView configiuration itself is not loaded at the time of initialization. Neither DataView instances are created by the configuration process. A DataView can be created in a Swing application with the code similar to the following:</p>
+<div id="ConfluenceContent">
+<p>Here we illustrate the discussion of DataViews with configuration samples and code snippets. Cayenne project DTD file supports references to data view configuration files. This information is loaded into the Cayenne Configuration instance along with the DataDomain, DataNode, and DataMap entries. Since the DataView functionality is optional and would not be very useful in some deployment scenarios (server-side applications) the DataView configiuration itself is not loaded at the time of initialization. Neither DataView instances are created by the configuration process. A DataView can be created in a Swing application with the code similar to the following:</p>
 <div class="code"><div class="codeContent">
 <pre class="code-java"><span class="code-comment">//Assume, <span class="code-keyword">this</span> is your Cayenne Configuration instance.
 </span>Configuration cayenneConfiguration = ...;

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/Swing Applications/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataViews/Swing%20Applications/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/Swing Applications/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/Swing Applications/index.html Sat Jul 22 11:45:50 2006
@@ -53,7 +53,8 @@
 </li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Those who have experience of Swing GUI development knows how much time it takes to work out all the minutest details of formatting, in-place input validation, handling the interactive data modification, enforcing naming, order, and formatting consistensy, etc. Whenever the domain or requirements change (e.g. new attributes are added to an ObjEntity, formats or captions of data are modified, or relationships change their meaning) developers are faced with the necessity to go through the number of Swing data models, panels, various helpers fishing out the bits of code to be corrected.</p>
+<div id="ConfluenceContent">
+<p>Those who have experience of Swing GUI development knows how much time it takes to work out all the minutest details of formatting, in-place input validation, handling the interactive data modification, enforcing naming, order, and formatting consistensy, etc. Whenever the domain or requirements change (e.g. new attributes are added to an ObjEntity, formats or captions of data are modified, or relationships change their meaning) developers are faced with the necessity to go through the number of Swing data models, panels, various helpers fishing out the bits of code to be corrected.</p>
 
 <p>Another problem is the need for quick and easy prototyping of data aware GUIs. Those who, at one time or another, worked with Borland VCL for C++ or Delphi or DataExpress/dbSwing for Java and similar frameworks can recall how painless it was to create a rough prototype of the GUI working with the relational database and bind it to the actual data. That was possible due to the layer of easily configured data aware classes and components. And once the working prototype had been ready, refinining it used to be a very simple task.</p>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataViews/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataViews/index.html Sat Jul 22 11:45:50 2006
@@ -51,7 +51,8 @@
 </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>In the future versions of Cayenne DataViews will be split in a standalone package. Unless we find volunteers, this package won't be supported very well.</td></tr></table>
+<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>In the future versions of Cayenne DataViews will be split in a standalone package. Unless we find volunteers, this package won't be supported very well.</td></tr></table>
 
 <p>Cayenne takes care of managing persistence layer for all types of applications - web, rich client, command line, etc. With DataViews Cayenne extends into the area of integrating such persistent layer with Swing GUI.</p>