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/08/01 05:13:27 UTC

svn commit: r427420 [4/5] - in /incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs: ./ Documentation/ Documentation/Modeler Guide/ Documentation/Modeler Guide/Cayenne Project Structure/ Documentation/Modeler Guide/Cayenne Projec...

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/Acknowledgments/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/index.html Mon Jul 31 20:13:21 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>We would like to thank our dedicated team of <span class="nobr"><a href="http://objectstyle.org/cayenne/contributors.html" title="Visit page outside Confluence" rel="nofollow">contributors<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> - for making this project possible, early adopters - for taking all the pain to help us make a usable product, other users - for providing feedback, comments, patches and bug reports.</p></div>
+<div id="ConfluenceContent"><p><br/>
+We would like to thank our dedicated team of <span class="nobr"><a href="http://objectstyle.org/cayenne/contributors.html" title="Visit page outside Confluence" rel="nofollow">contributors<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> - for making this project possible, early adopters - for taking all the pain to help us make a usable product, other users - for providing feedback, comments, patches and bug reports.</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/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/Guide%20to%201.1%20Features/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html Mon Jul 31 20:13:21 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Cayenne version 1.1 introduces a large number of new features and enhancements over 1.0. This chapter lists most of them, providing the links to more detailed information about each feature.</p>
+<div id="ConfluenceContent">
+<p>Cayenne version 1.1 introduces a large number of new features and enhancements over 1.0. This chapter lists most of them, providing the links to more detailed information about each feature.</p>
 
 <h3><a name="Guideto1.1Features-DTDAdditions."></a>DTD Additions.</h3>
 
@@ -72,9 +73,9 @@
 
 <p>Cayenne now provides a way to share its object cache between DataContexts in the same JVM and across JVMs. The following chapters in the user guide describe this feature:</p>
 <ul>
-	<li><span class="error">&#91;How Information Is Stored in Cayenne&#93;</span></li>
+	<li><span class="nobr"><a href="/confluence/pages/createpage.action?spaceKey=CAYDOC&amp;title=How%20Information%20Is%20Stored%20in%20Cayenne&amp;linkCreation=true&amp;fromPageId=10608" title="Create Page: How Information Is Stored in Cayenne" class="createlink">How Information Is Stored in Cayenne<sup><img class="rendericon" src="../../../../images/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
 	<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html" title="Object Caching">Object Caching</a></li>
-	<li><span class="error">&#91;Caching Query Result Lists&#93;</span></li>
+	<li><span class="nobr"><a href="/confluence/pages/createpage.action?spaceKey=CAYDOC&amp;title=Caching%20Query%20Result%20Lists&amp;linkCreation=true&amp;fromPageId=10608" title="Create Page: Caching Query Result Lists" class="createlink">Caching Query Result Lists<sup><img class="rendericon" src="../../../../images/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
 	<li><a href="../../../../Documentation/User Guide/Performance Tuning/Caching Lookup Tables/index.html" title="Caching Lookup Tables">Caching Lookup Tables</a></li>
 </ul>
 
@@ -93,7 +94,7 @@
 
 <h3><a name="Guideto1.1Features-DataViewsandDVModeler"></a>Data Views and DVModeler</h3>
 
-<p><span class="error">&#91;Data Views&#93;</span> is a completely new addition to Cayenne. This is a framework and a Swing modeler tool to quickly build Swing applications based on Cayenne.</p>
+<p><span class="nobr"><a href="/confluence/pages/createpage.action?spaceKey=CAYDOC&amp;title=Data%20Views&amp;linkCreation=true&amp;fromPageId=10608" title="Create Page: Data Views" class="createlink">Data Views<sup><img class="rendericon" src="../../../../images/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> is a completely new addition to Cayenne. This is a framework and a Swing modeler tool to quickly build Swing applications based on Cayenne.</p>
 
 <h3><a name="Guideto1.1Features-GenericMultithreadedandDistributedEventsMechanism"></a>Generic Multithreaded and Distributed Events Mechanism</h3>
 
@@ -103,7 +104,7 @@
 
 <p>DataContext now performs validation of DataObjects before committing them. There is a set of default validation checks being executed, based on the DataMap information. Developers can override DataObject validation methods to provide custom validation checks.</p>
 
-<p>See user guide chapter on <span class="error">&#91;object validation&#93;</span>.</p>
+<p>See user guide chapter on <span class="nobr"><a href="/confluence/pages/createpage.action?spaceKey=CAYDOC&amp;title=Working%20With%20DataObjects&amp;linkCreation=true&amp;fromPageId=10608" title="Create Page: Working With DataObjects" class="createlink">object validation<sup><img class="rendericon" src="../../../../images/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</p>
 
 <p>Original implementation was submitted by Fabricio Voznika.</p>
 
@@ -121,8 +122,8 @@
 
 <p>SQLTemplate replaces SqlSelectQuery and SqlModifyQuery and is a scriptable parameterized raw SQL query. It supports DataObjects and other features declared in GenericSelectQuery interface.</p>
 <ul>
-	<li><span class="error">&#91;SQLTemplate Overview&#93;</span></li>
-	<li><span class="error">&#91;SQLTemplate Scripting&#93;</span></li>
+	<li><span class="nobr"><a href="/confluence/pages/createpage.action?spaceKey=CAYDOC&amp;title=SQLTemplate%20Overview&amp;linkCreation=true&amp;fromPageId=10608" title="Create Page: SQLTemplate Overview" class="createlink">SQLTemplate Overview<sup><img class="rendericon" src="../../../../images/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
+	<li><span class="nobr"><a href="/confluence/pages/createpage.action?spaceKey=CAYDOC&amp;title=SQLTemplate%20Scripting&amp;linkCreation=true&amp;fromPageId=10608" title="Create Page: SQLTemplate Scripting" class="createlink">SQLTemplate Scripting<sup><img class="rendericon" src="../../../../images/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
 </ul>
 
 
@@ -154,7 +155,7 @@
 
 <p>Cayenne now supports container-managed transactions. As a result it can be used inside EJBs out of the box. It also allows a high degree of transactions customization. The following user guide chapter explains Transactions design and behavior in details:</p>
 <ul>
-	<li><a href="http://www.objectstyle.org/confluence/confluence/display/CAYDOC/Design#Design-CayenneTransactions" title="Cayenne Transactions on Design">Understanding Transactions</a></li>
+	<li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYDOC/Design#Design-CayenneTransactions" title="Cayenne Transactions on Design">Understanding Transactions</a></li>
 </ul>
 
 
@@ -184,7 +185,7 @@
 <p>Queries are made first-class mapping objects. They can be modeled in CayenneModeler and stored in DataMaps. Application code can then reuse such queries.</p>
 <ul>
 	<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html" title="Modeling Queries">Modeling Queries</a></li>
-	<li><span class="error">&#91;Using Mapped Queries&#93;</span></li>
+	<li><span class="nobr"><a href="/confluence/pages/createpage.action?spaceKey=CAYDOC&amp;title=Using%20Mapped%20Queries&amp;linkCreation=true&amp;fromPageId=10608" title="Create Page: Using Mapped Queries" class="createlink">Using Mapped Queries<sup><img class="rendericon" src="../../../../images/plus.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
 </ul>
 
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/Guide%20to%201.2%20Features/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html Mon Jul 31 20:13:21 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>This page describes new features and other changes introduced in 1.2 release.</p>
+<div id="ConfluenceContent">
+<p>This page describes new features and other changes introduced in 1.2 release.</p>
 
 <h2><a name="Guideto1.2Features-CoreFramework"></a>Core Framework </h2>
 
@@ -159,7 +160,7 @@
 </ul>
 
 
-<h4><a name="Guideto1.2Features-XMLSerializationCAY%3AXMLSerialization"></a><span class="error">&#91;XML Serialization&#93;</span></h4>
+<h4><a name="Guideto1.2Features-XMLSerializationCAY%3AXMLSerialization"></a><a href="http://cwiki.apache.org/confluence/confluence/display/CAY/XML+Serialization" title="XML Serialization">XML Serialization</a></h4>
 
 <p>A new package <tt>org.objectstyle.cayenne.xml</tt> provides a way to encode arbitrary Java objects to XML and decode them from XML. It allows a great degree of control over the XML structure, thus simplifying integration with third party XML message systems. M5 features the first usable release of this feature. However there may be more changes in the course of 1.2.</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/License/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/License/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/License/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/License/index.html Mon Jul 31 20:13:21 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>This software is distributed and should be used on terms of Apache software license. In short, it is free of charge, and unrestricted for commercial use as well. Full license text can be found here:</p>
+<div id="ConfluenceContent">
+<p>This software is distributed and should be used on terms of Apache software license. In short, it is free of charge, and unrestricted for commercial use as well. Full license text can be found here:</p>
 
 <div class="preformatted"><div class="preformattedContent">
 <pre>The ObjectStyle Group Software License, version 1.1

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/index.html Mon Jul 31 20:13:21 2006
@@ -51,7 +51,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Cayenne is a mature, powerful, full-featured open source Object/Relational Mapping (ORM) framework. Cayenne is written in Java and is intended for Java developers working with relational databases. Cayenne has been successfully deployed in production environments on high volume sites.</p>
+<div id="ConfluenceContent">
+<p>Cayenne is a mature, powerful, full-featured open source Object/Relational Mapping (ORM) framework. Cayenne is written in Java and is intended for Java developers working with relational databases. Cayenne has been successfully deployed in production environments on high volume sites.</p>
 
 <p>Cayenne allows to reduce the development time in any database project by creating an object-oriented abstraction of the database schema. Development teams using Cayenne will be able to concentrate on the core business requirements and the data model instead of the SQL details.</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Caching Lookup Tables/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Performance%20Tuning/Caching%20Lookup%20Tables/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Caching Lookup Tables/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Caching Lookup Tables/index.html Mon Jul 31 20:13:21 2006
@@ -55,7 +55,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Query result caching feature can be used to implement caching of lookup tables. "Lookup" or "configuration" tables can be loosely defined as small tables that change rarely and mostly used in read-only fashion. Examples of such tables are COUNTRY, USER_TYPE, AREA_CODE, etc. Often data from such tables is displayed in a combo box or dropdown.</p>
+<div id="ConfluenceContent">
+<p>Query result caching feature can be used to implement caching of lookup tables. "Lookup" or "configuration" tables can be loosely defined as small tables that change rarely and mostly used in read-only fashion. Examples of such tables are COUNTRY, USER_TYPE, AREA_CODE, etc. Often data from such tables is displayed in a combo box or dropdown.</p>
 
 <p>For performance reasons it makes sense to store the lookup data in the shared cache. The following steps could be taken to create and use a shared query for a Country entity:</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Data Rows/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Performance%20Tuning/Data%20Rows/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Data Rows/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Data Rows/index.html Mon Jul 31 20:13:21 2006
@@ -74,9 +74,9 @@
 <div class="code"><div class="codeContent">
 <pre class="code-java"><span class="code-keyword">import</span> java.util.List;
 <span class="code-keyword">import</span> java.util.Map;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.access.DataContext;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.query.SelectQuery;
-<span class="code-keyword">import</span> org.objectstyle.art.Artist;
+<span class="code-keyword">import</span> org.apache.cayenne.access.DataContext;
+<span class="code-keyword">import</span> org.apache.cayenne.query.SelectQuery;
+<span class="code-keyword">import</span> org.apache.art.Artist;
 ...
 DataContext ctxt;
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Iterating Through Data Rows/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Performance%20Tuning/Iterating%20Through%20Data%20Rows/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Iterating Through Data Rows/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Iterating Through Data Rows/index.html Mon Jul 31 20:13:21 2006
@@ -67,11 +67,11 @@
 <div class="code"><div class="codeContent">
 <pre class="code-java"><span class="code-keyword">import</span> java.util.List;
 <span class="code-keyword">import</span> java.util.Map;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.access.DataContext;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.access.ResultIterator;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.query.SelectQuery;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.CayenneException;
-<span class="code-keyword">import</span> org.objectstyle.art.Artist;
+<span class="code-keyword">import</span> org.apache.cayenne.access.DataContext;
+<span class="code-keyword">import</span> org.apache.cayenne.access.ResultIterator;
+<span class="code-keyword">import</span> org.apache.cayenne.query.SelectQuery;
+<span class="code-keyword">import</span> org.apache.cayenne.CayenneException;
+<span class="code-keyword">import</span> org.apache.art.Artist;
 ...
 DataContext ctxt;
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Paginated Queries/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Performance%20Tuning/Paginated%20Queries/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Paginated Queries/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Paginated Queries/index.html Mon Jul 31 20:13:21 2006
@@ -55,7 +55,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Another common situation found in interactive applications is when it is needed to fetch a large number of rows, and at the same time only a small subset of objects is accessed directly. An example of such application would be a search page. User would like to see how many total results exist that match a certain criteria, but she will only look at a few pages of results out of possibly hundreds or thousands. It will be extremely inefficient to fetch all objects in the memory.</p>
+<div id="ConfluenceContent">
+<p>Another common situation found in interactive applications is when it is needed to fetch a large number of rows, and at the same time only a small subset of objects is accessed directly. An example of such application would be a search page. User would like to see how many total results exist that match a certain criteria, but she will only look at a few pages of results out of possibly hundreds or thousands. It will be extremely inefficient to fetch all objects in the memory.</p>
 
 <p>A solution offered by Cayenne is "paginated" queries. A user can set a size of a "page" of a select query. If page size is greater than zero, on query execution Cayenne will only fetch the first "page" as DataObjects. For the rest of the result set, only primary keys are read. When a user accesses an object that has not been resolved yet, the whole page containing this object will be resolved all at once. Most important, this happens totally transparent to the user.</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Prefetching/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Performance%20Tuning/Prefetching/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Prefetching/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Prefetching/index.html Mon Jul 31 20:13:21 2006
@@ -55,7 +55,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="Prefetching-IntroductiontoPrefetching"></a>Introduction to Prefetching</h3>
+<div id="ConfluenceContent">
+<h3><a name="Prefetching-IntroductiontoPrefetching"></a>Introduction to Prefetching</h3>
 
 <p><span class="nobr"><a href="http://objectstyle.org/cayenne/userguide/perform/prefetching.html" title="Visit page outside Confluence" rel="nofollow">Prefetching<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> is a performance optimization technique that allows to bring back more than one type of objects in a single query. Prefetches are configured in terms of relationship paths from the query root entity to the "prefetched" entity. E.g.:</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Turning off Context Synchronization/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Performance%20Tuning/Turning%20off%20Context%20Synchronization/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Turning off Context Synchronization/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/Turning off Context Synchronization/index.html Mon Jul 31 20:13:21 2006
@@ -55,7 +55,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>A big part of commit operation is updating peer DataContexts with the changes committed to the database. The conext synchronization operation has <tt>O(N)</tt> performance, where <tt>N</tt> is the number of peer DataContexts. In a web application <tt>N</tt> is often the number of concurrent sessions, which can be quite big. The throughout of high volume applications can be  improved by turning off peer synchronization. One possible way to do that is via a custom <a href="../../../../Documentation/User Guide/DataContext/DataContextFactory/index.html" title="DataContextFactory">DataContextFactory</a>:</p>
+<div id="ConfluenceContent">
+<p>A big part of commit operation is updating peer DataContexts with the changes committed to the database. The conext synchronization operation has <tt>O(N)</tt> performance, where <tt>N</tt> is the number of peer DataContexts. In a web application <tt>N</tt> is often the number of concurrent sessions, which can be quite big. The throughout of high volume applications can be  improved by turning off peer synchronization. One possible way to do that is via a custom <a href="../../../../Documentation/User Guide/DataContext/DataContextFactory/index.html" title="DataContextFactory">DataContextFactory</a>:</p>
 
 <div class="code"><div class="codeContent">
 <pre class="code-java"><span class="code-keyword">public</span> class IsolatedDataContextFactory <span class="code-keyword">implements</span> DataContextFactory {

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Performance%20Tuning/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Performance Tuning/index.html Mon Jul 31 20:13:21 2006
@@ -53,7 +53,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Most performance problems in database applications, including those using ORM, are related to the inefficient queries and/or large volumes of data in the database. Here is a few common issues that a typical application may run into:</p>
+<div id="ConfluenceContent">
+<p>Most performance problems in database applications, including those using ORM, are related to the inefficient queries and/or large volumes of data in the database. Here is a few common issues that a typical application may run into:</p>
 
 <ul>
 	<li>Converting a large ResultSet into objects takes very long time.</li>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Caching Query Results/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Caching%20Query%20Results/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Caching Query Results/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Caching Query Results/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Cayenne provides a way to cache query results, avoiding unneeded database trips for the frequently used queries. Caching policy is configured per query. Policy can be set via the API or in CayenneModeler.</p>
+<div id="ConfluenceContent">
+<p>Cayenne provides a way to cache query results, avoiding unneeded database trips for the frequently used queries. Caching policy is configured per query. Policy can be set via the API or in CayenneModeler.</p>
 
 <table cellpadding='5' width='85%' cellspacing='8px' class='noteMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b class="strong">Upgrading to Cayenne 1.2 and Newer</b><br /><tt>org.objectstyle.cayenne.query.GenericSelectQuery</tt> interface that defined cache policy types is deprecated. Cache policies are now a part of the new <tt>org.objectstyle.cayenne.query.QueryMetadata</tt> interface.</td></tr></table>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Customizing Queries/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Customizing%20Queries/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Customizing Queries/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Customizing Queries/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,7 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Any object that implements <tt>org.objectstyle.cayenne.query.Query</tt> interface can be executed with a DataContext. </p>
+<div id="ConfluenceContent"><p>Any object that implements <tt>org.apache.cayenne.query.Query</tt> interface can be executed with a DataContext. </p>
 
 <h3><a name="CustomizingQueries-UnderstandingQueryInterface"></a>Understanding Query Interface</h3>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/NamedQuery/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/NamedQuery/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/NamedQuery/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/NamedQuery/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><tt>NamedQuery</tt> is a query that is a reference to another query stored in the DataMap. It can hold named parameters that will be passed to the named query on execution.</p>
+<div id="ConfluenceContent">
+<p><tt>NamedQuery</tt> is a query that is a reference to another query stored in the DataMap. It can hold named parameters that will be passed to the named query on execution.</p>
 
 <p>Assuming that there a query called "Login" was previously mapped in the Modeler, we can do this:</p>
 <div class="code"><div class="codeContent">

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/ObjectIdQuery/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/ObjectIdQuery/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/ObjectIdQuery/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/ObjectIdQuery/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><em>(DataObjectUtils API below is available since 1.2M10. SingleObjectQuery, a precursor of ObjectIdQuery, was available since 1.2M9. In 1.2M12 SingleObjectQuery was renamed to ObjectIdQuery)</em></p>
+<div id="ConfluenceContent">
+<p><em>(DataObjectUtils API below is available since 1.2M10. SingleObjectQuery, a precursor of ObjectIdQuery, was available since 1.2M9. In 1.2M12 SingleObjectQuery was renamed to ObjectIdQuery)</em></p>
 
 <p><tt>ObjectIdQuery</tt> is a query that selects objects matching an ObjectId. Considering that ObjectId must be unique, the result of such query is a single object or no objects.</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Parameterized Queries/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Parameterized%20Queries/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Parameterized Queries/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Parameterized Queries/index.html Mon Jul 31 20:13:21 2006
@@ -69,8 +69,8 @@
 <p>Building a prototype query using <tt>Expression.fromString(..)</tt>:</p>
 
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.exp.Expression;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.query.SelectQuery;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.exp.Expression;
+<span class="code-keyword">import</span> org.apache.cayenne.query.SelectQuery;
 ...
 <span class="code-comment">// create a qualifier with two named parameters: <span class="code-quote">"pname"</span> and <span class="code-quote">"aname"</span>
 </span>Expression qual = Expression.fromString(<span class="code-quote">"paintingTitle = $pname or toArtist.artistName = $aname"</span>);
@@ -84,10 +84,10 @@
 
 <div class="code"><div class="codeContent">
 <pre class="code-java"><span class="code-keyword">import</span> java.util.*;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.exp.Expression;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.exp.ExpressionFactory;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.exp.ExpressionParameter;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.query.SelectQuery;
+<span class="code-keyword">import</span> org.apache.cayenne.exp.Expression;
+<span class="code-keyword">import</span> org.apache.cayenne.exp.ExpressionFactory;
+<span class="code-keyword">import</span> org.apache.cayenne.exp.ExpressionParameter;
+<span class="code-keyword">import</span> org.apache.cayenne.query.SelectQuery;
 ...
 <span class="code-comment">// create a qualifier with two named parameters: 
 </span><span class="code-comment">//  <span class="code-quote">"pname"</span> and <span class="code-quote">"aname"</span>
@@ -117,7 +117,7 @@
 <div class="code"><div class="codeContent">
 <pre class="code-java"><span class="code-keyword">import</span> java.util.Map;
 <span class="code-keyword">import</span> java.util.HashMap;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.query.SelectQuery;
+<span class="code-keyword">import</span> org.apache.cayenne.query.SelectQuery;
 ...
 SelectQuery proto = ... <span class="code-comment">// <span class="code-keyword">this</span> was built in the example above
 </span>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Qualifier Expressions/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Qualifier%20Expressions/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Qualifier Expressions/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Qualifier Expressions/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><table cellpadding='5' width='85%' cellspacing='8px' class='noteMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>This chapter is dedicated to the use of expressions as qualifiers. A detailed discussion on expressions in general is provided at <a href="../../../../Documentation/User Guide/Expressions/index.html" title="Expressions">Expressions</a>.</td></tr></table>
+<div id="ConfluenceContent">
+<table cellpadding='5' width='85%' cellspacing='8px' class='noteMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>This chapter is dedicated to the use of expressions as qualifiers. A detailed discussion on expressions in general is provided at <a href="../../../../Documentation/User Guide/Expressions/index.html" title="Expressions">Expressions</a>.</td></tr></table>
 
 <p>The previous chapter showed how to build a query to fetch all data from a single table. In most situations though only a subset of data matching a certain criteria is needed. Cayenne provides an expressions package to control the filtering behavior of the queries. Expressions applied to queries are called "qualifiers".</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Queries Stored in DataMap/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Queries%20Stored%20in%20DataMap/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Queries Stored in DataMap/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Queries Stored in DataMap/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>To facilitate reuse of queries users can assign symbolic names to them and store such named queries in a DataMap. Normally this is done by <a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html" title="Modeling Queries">creating a query in CayenneModeler</a>. Storing queries in a DataMap reduces the amount of code and speeds up query creation process.</p>
+<div id="ConfluenceContent">
+<p>To facilitate reuse of queries users can assign symbolic names to them and store such named queries in a DataMap. Normally this is done by <a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html" title="Modeling Queries">creating a query in CayenneModeler</a>. Storing queries in a DataMap reduces the amount of code and speeds up query creation process.</p>
 
 <p>This example shows how to get a shared instance of a stored query, and use it as a template for customized query.</p>
 <div class="code"><div class="codeContent">

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/QueryChain/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/QueryChain/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/QueryChain/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/QueryChain/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><tt>QueryChain</tt>, as the name implies, is a Query that is itself a collection of other queries. It simplifies an execution of multiple queries in a single batch. E.g.:</p>
+<div id="ConfluenceContent">
+<p><tt>QueryChain</tt>, as the name implies, is a Query that is itself a collection of other queries. It simplifies an execution of multiple queries in a single batch. E.g.:</p>
 <div class="code"><div class="codeContent">
 <pre class="code-java">QueryChain query = <span class="code-keyword">new</span> QueryChain();
 query.addQuery(<span class="code-keyword">new</span> SQLTemplate(Project.class, <span class="code-quote">"delete from project"</span>));

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/RelationshipQuery/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/RelationshipQuery/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/RelationshipQuery/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/RelationshipQuery/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p><tt>RelationshipQuery</tt> is used by Cayenne internally to fetch object(s) related to a single given object via a mapped ObjRelationship. In some cases the query can be used directly in the application, e.g. if we want to refresh related objects.</p>
+<div id="ConfluenceContent">
+<p><tt>RelationshipQuery</tt> is used by Cayenne internally to fetch object(s) related to a single given object via a mapped ObjRelationship. In some cases the query can be used directly in the application, e.g. if we want to refresh related objects.</p>
 
 <div class="code"><div class="codeContent">
 <pre class="code-java">ObjectId id = <span class="code-keyword">new</span> ObjectId(<span class="code-quote">"Artist"</span>, <span class="code-quote">"ARTIST_ID"</span>, 55);

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SQLTemplate Query/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/SQLTemplate%20Query/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SQLTemplate Query/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SQLTemplate Query/index.html Mon Jul 31 20:13:21 2006
@@ -69,7 +69,7 @@
 
 <p>SQLTemplates can be built using CayenneModeler. Here we demonstrate how to do the same thing via API. SQLTemplate consists of root and dynamic template string. Dynamic behavior of the template is discussed in subsequent chapters, for now it is sufficient to know that the template string is simply a valid SQL statement in the target database SQL dialect.</p>
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.query.SQLTemplate;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.query.SQLTemplate;
 ...
 <span class="code-comment">// create selecting SQLTemplate
 </span>SQLTemplate selectQuery = <span class="code-keyword">new</span> SQLTemplate(Artist.class, <span class="code-quote">"select * from ARTIST"</span>);
@@ -82,7 +82,7 @@
 
 <p>Selecting SQLTemplate is very similar to SelectQuery in many respects. It can be executed via <tt>DataContext.performQuery(..)</tt> and supports the same configuration parameters, such as fetch limit, pagination, etc. It can be configured to return DataObjects (default) or data rows.</p>
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.query.SQLTemplate;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.query.SQLTemplate;
 ...
 <span class="code-comment">// fetch all artists, but no more than 1000 objects...
 </span>SQLTemplate rawSelect = <span class="code-keyword">new</span> SQLTemplate(Artist.class, <span class="code-quote">"select * from ARTIST"</span>);
@@ -98,7 +98,7 @@
 <table cellpadding='5' width='85%' cellspacing='8px' class='noteMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>When changing or deleting data via SQLTemplate you must realize that such changes are done directly to the database, bypassing the context, and therefore may potentially leave object graph in an inconsistent state.</td></tr></table>
 
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.query.SQLTemplate;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.query.SQLTemplate;
 ...
 <span class="code-comment">// fetch all artists, but no more than 1000 objects...
 </span>SQLTemplate rawDelete = <span class="code-keyword">new</span> SQLTemplate(Artist.class, <span class="code-quote">"delete from ARTIST"</span>);

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Scripting SQLTemplate/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Scripting%20SQLTemplate/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Scripting SQLTemplate/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Scripting SQLTemplate/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>SQLTemplate's internal SQL string is a dynamic script that is processed at runtime to generate PreparedStatement SQL code. Dynamic nature of SQLTemplate makes possible a few important things - it allows to bind parameters on the fly; it provides a way to pass extra information to Cayenne that is not included in the SQL text; it supports including/excluding chunks of SQL depending on runtime parameters.</p>
+<div id="ConfluenceContent">
+<p>SQLTemplate's internal SQL string is a dynamic script that is processed at runtime to generate PreparedStatement SQL code. Dynamic nature of SQLTemplate makes possible a few important things - it allows to bind parameters on the fly; it provides a way to pass extra information to Cayenne that is not included in the SQL text; it supports including/excluding chunks of SQL depending on runtime parameters.</p>
 
 <p>Scripting of SQL strings is done using <span class="nobr"><a href="http://jakarta.apache.org/velocity" title="Visit page outside Confluence" rel="nofollow">Jakarta Velocity<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. Velocity was chosen primarily for its concise template language (no XML tags within SQL!) that doesn't conflict with the SQL syntax. When creating dynamic SQL template, all standard Velocity directives are available, including <tt>#set</tt>, <tt>#foreach</tt>, <tt>#if</tt>. However due to the nature of the SQL and the need to integrate it with Cayenne runtime, only a few Cayenne custom directives are normally used. These directives (<tt>#bind</tt>..., <tt>#result</tt>, <tt>#chain</tt>, <tt>#chunk</tt>) are described below.</p>
 <table cellpadding='5' width='85%' cellspacing='8px' class='noteMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b class="strong">Directive Syntax Note</b><br />Velocity directives start with pound sign (#) and have their parameters separated by space, not comma. E.g. <tt>#bind('SOMESTRING' 'VARCHAR')</tt>.</td></tr></table>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SelectQuery Customization/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/SelectQuery%20Customization/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SelectQuery Customization/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SelectQuery Customization/index.html Mon Jul 31 20:13:21 2006
@@ -63,7 +63,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/query/SelectQuery.html" title="Visit page outside Confluence" rel="nofollow">SelectQueries<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> allow to fine tune the behavior of the fetch using the following API:</p>
+<div id="ConfluenceContent">
+<p><span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SelectQuery.html" title="Visit page outside Confluence" rel="nofollow">SelectQueries<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> allow to fine tune the behavior of the fetch using the following API:</p>
 <ul>
 	<li>public void <b>setFetchLimit</b>(int fetchLimit)<br/>
  If set to a value greater than zero, tells Cayenne that query should never retrieve more than X objects (X == fetchLimit) from the database. If a result set contains more rows, they are simply ignored and never read. This is a "safety" feature that can be used to prevent the application from crashing when an unexpectedly high number of records exists for a given query.</li>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SelectQuery/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/SelectQuery/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SelectQuery/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/SelectQuery/index.html Mon Jul 31 20:13:21 2006
@@ -100,7 +100,7 @@
 
 <p>SelectQuery provides constructors for all three types. For example:</p>
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.query.SelectQuery;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.query.SelectQuery;
 ...
 <span class="code-comment">// <span class="code-keyword">this</span> is a valid Cayenne query that would allow to fetch
 </span><span class="code-comment">// all records from the ARTIST table as Artist objects
@@ -112,8 +112,8 @@
 
 <p>As mentioned earlier, queries are executed via <tt>DataContext.performQuery()</tt>. For instance to fetch all Artists existing in the database the following code is used:</p>
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.query.SelectQuery;
-<span class="code-keyword">import</span> org.objectstyle.cayenne.access.DataContext;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.query.SelectQuery;
+<span class="code-keyword">import</span> org.apache.cayenne.access.DataContext;
 <span class="code-keyword">import</span> java.util.List;
 ...
 DataContext ctxt; <span class="code-comment">// assume <span class="code-keyword">this</span> exists

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Using Orderings/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Using%20Orderings/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Using Orderings/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/Using Orderings/index.html Mon Jul 31 20:13:21 2006
@@ -66,7 +66,7 @@
 <div id="ConfluenceContent"><p>To sort SelectQuery results, orderings are used. Orderings use path expressions discussed in the previous section to identify the attributes that must be used in sorting. For example to order results by artist name, the following code can be used:</p>
 
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.query.SelectQuery;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.query.SelectQuery;
 ...
 SelectQuery query = <span class="code-keyword">new</span> SelectQuery(<span class="code-quote">"Artist"</span>);
 
@@ -77,7 +77,7 @@
 <p>Orderings also support in-memory sorting of lists of Java Beans (all DataObjects are normally Java Beans, since they has set/get method pairs for all the properties). For instance to sort with a single ordering, the following code might be used:</p>
 
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.query.Ordering;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.query.Ordering;
 ...
 <span class="code-comment">// assume <span class="code-keyword">this</span> is a properly initialized list of Artists
 </span>List list = ...; 
@@ -92,7 +92,7 @@
 <p>If there is a need to sort on more than one object property, multiple Orderings can be passed as a List to a static method <tt>orderList(List, List)</tt>. The cost of adding new Orderings decreases, as the list of objects ends up being sorted by the first Ordering, then, if any two objects are equal for first Ordering, by the second, and so on.</p>
 
 <div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">import</span> org.objectstyle.cayenne.query.Ordering;
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.query.Ordering;
 ...
 <span class="code-comment">// assume <span class="code-keyword">this</span> is a properly initialized list of Paintings
 </span>List list = ...; 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Queries/index.html Mon Jul 31 20:13:21 2006
@@ -61,7 +61,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Queries are Cayenne abstraction for communicating with an external data storage. Queries are Java objects that are generally independent from the SQL dialect used by the target database. Cayenne includes a number of standard queries in the <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/package-summary.html" title="Visit page outside Confluence" rel="nofollow">org.objectstyle.cayenne.query<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> package. Many of them are only used internally. Here we describe the queries that can be useful in the application.</p>
+<div id="ConfluenceContent">
+<p>Queries are Cayenne abstraction for communicating with an external data storage. Queries are Java objects that are generally independent from the SQL dialect used by the target database. Cayenne includes a number of standard queries in the <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/package-summary.html" title="Visit page outside Confluence" rel="nofollow">org.objectstyle.cayenne.query<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> package. Many of them are only used internally. Here we describe the queries that can be useful in the application.</p>
 
 <h3><a name="Queries-GeneralPurposeQueries"></a>General Purpose Queries</h3>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial DataContext/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20DataContext/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial DataContext/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial DataContext/index.html Mon Jul 31 20:13:21 2006
@@ -84,7 +84,7 @@
 <div class="code"><div class="codeHeader"><b>Main.java</b></div><div class="codeContent">
 <pre class="code-java"><span class="code-keyword">package</span> cayenne.tutorial;
 
-<span class="code-keyword">import</span> org.objectstyle.cayenne.access.DataContext;
+<span class="code-keyword">import</span> org.apache.cayenne.access.DataContext;
 
 <span class="code-keyword">public</span> class Main {
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial DataObjects/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20DataObjects/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial DataObjects/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial DataObjects/index.html Mon Jul 31 20:13:21 2006
@@ -59,7 +59,7 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Persistent classes in Cayenne implement a <a href="../../../../Documentation/User Guide/DataObjects/index.html" title="DataObjects">DataObject interface</a>. If you inspect any of classes <a href="../../../../Documentation/User Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html" title="Tutorial Generate Database and Java Classes">generated earlier</a> in this tutorial (e.g. <tt>cayenne.tutorial.Artist</tt>), you'll see that it extends a class with the name that starts with underscore (<tt>cayenne.tutorial.auto._Artist</tt>), which in turn extends from <tt>org.objectstyle.cayenne.CayenneDataObject</tt>. Splitting each persistent class into user-customizable subclass (Xyz) and a generated superclass (_Xyz) is a useful technique to avoid overwriting of the custom code when refreshing classes from the mapping model.</p>
+<div id="ConfluenceContent"><p>Persistent classes in Cayenne implement a <a href="../../../../Documentation/User Guide/DataObjects/index.html" title="DataObjects">DataObject interface</a>. If you inspect any of classes <a href="../../../../Documentation/User Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html" title="Tutorial Generate Database and Java Classes">generated earlier</a> in this tutorial (e.g. <tt>cayenne.tutorial.Artist</tt>), you'll see that it extends a class with the name that starts with underscore (<tt>cayenne.tutorial.auto._Artist</tt>), which in turn extends from <tt>org.apache.cayenne.CayenneDataObject</tt>. Splitting each persistent class into user-customizable subclass (Xyz) and a generated superclass (_Xyz) is a useful technique to avoid overwriting of the custom code when refreshing classes from the mapping model.</p>
 
 <p>Let's add a utility method to the Artist class that sets Artist date of birth, taking a string argument for the date:</p>
 <div class="code"><div class="codeHeader"><b>Artist.java</b></div><div class="codeContent">
@@ -152,7 +152,7 @@
 	Login: null
 	Password: *******
 INFO  QueryLogger: +++ Connecting: SUCCESS.
-INFO  QueryLogger: Detected and installed adapter: org.objectstyle.cayenne.dba.derby.DerbyAdapter
+INFO  QueryLogger: Detected and installed adapter: org.apache.cayenne.dba.derby.DerbyAdapter
 INFO  QueryLogger: SELECT NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = ? FOR UPDATE [bind: 'GALLERY']
 INFO  QueryLogger: --- transaction started.
 INFO  QueryLogger: SELECT NEXT_ID FROM AUTO_PK_SUPPORT WHERE TABLE_NAME = ? FOR UPDATE [bind: 'ARTIST']

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Delete/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Delete/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Delete/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Delete/index.html Mon Jul 31 20:13:21 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Before we discuss the API for object deletion, lets go back to CayenneModeler and set up some <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html" title="Delete Rules">delete rules</a>. Doing this is optional but will simplify correct handling of the objects related to deleted  objects.</p>
+<div id="ConfluenceContent">
+<p>Before we discuss the API for object deletion, lets go back to CayenneModeler and set up some <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html" title="Delete Rules">delete rules</a>. Doing this is optional but will simplify correct handling of the objects related to deleted  objects.</p>
 
 <ul>
 	<li>In the Modeler go to "Artist" ObjEntity, "Relationships" tab and select "Cascade" for the "paintings" relationship delete rule:</li>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Generate%20Database%20and%20Java%20Classes/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html Mon Jul 31 20:13:21 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>CayenneModeler can be used to generate both database schema and Java classes from the single XML model. Very often the database already exists and is maintained independently (e.g., by a DBA). In this case you won't have to go through the first part of this procedure.</p>
+<div id="ConfluenceContent">
+<p>CayenneModeler can be used to generate both database schema and Java classes from the single XML model. Very often the database already exists and is maintained independently (e.g., by a DBA). In this case you won't have to go through the first part of this procedure.</p>
 
 <h3><a name="TutorialGenerateDatabaseandJavaClasses-CreatingtheDatabase"></a>Creating the Database</h3>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Mapping Query/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Mapping%20Query/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Mapping Query/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Mapping Query/index.html Mon Jul 31 20:13:21 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Now that we've got a feel of how <a href="../../../../Documentation/User Guide/Quick Start/Tutorial DataContext/index.html" title="Tutorial DataContext">DataContext works</a> and how to <a href="../../../../Documentation/User Guide/Quick Start/Tutorial DataObjects/index.html" title="Tutorial DataObjects">create and save objects</a>, let's take a small diversion and implement a piece of code that will delete all data from the database every time the tutorial application is started. We'll learn how to map a raw SQL query with parameters using the modeler and then execute it in the code.</p>
+<div id="ConfluenceContent">
+<p>Now that we've got a feel of how <a href="../../../../Documentation/User Guide/Quick Start/Tutorial DataContext/index.html" title="Tutorial DataContext">DataContext works</a> and how to <a href="../../../../Documentation/User Guide/Quick Start/Tutorial DataObjects/index.html" title="Tutorial DataObjects">create and save objects</a>, let's take a small diversion and implement a piece of code that will delete all data from the database every time the tutorial application is started. We'll learn how to map a raw SQL query with parameters using the modeler and then execute it in the code.</p>
 
 <ul>
 	<li>Open CayenneModeler, go to <tt>"File &gt; Recent Files"</tt> and choose the tutorial mapping file.</li>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Object Relational Mapping/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Object%20Relational%20Mapping/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Object Relational Mapping/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Object Relational Mapping/index.html Mon Jul 31 20:13:21 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Lets go back to CayenneModeler where we have the newly created project open. Our goal is to map the following schema:</p>
+<div id="ConfluenceContent">
+<p>Lets go back to CayenneModeler where we have the newly created project open. Our goal is to map the following schema:</p>
 
 <p><img src="database-schema.jpg" align="absmiddle" border="0" /></p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial SelectQuery/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20SelectQuery/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial SelectQuery/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial SelectQuery/index.html Mon Jul 31 20:13:21 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>It was shown before how to <a href="../../../../Documentation/User Guide/Quick Start/Tutorial DataObjects/index.html" title="Tutorial DataObjects">persist new objects</a>. Cayenne <a href="../../../../Documentation/User Guide/Queries/index.html" title="Queries">queries</a> are used to access already saved objects. The primary query type used for selecting objects is <a href="../../../../Documentation/User Guide/Queries/SelectQuery/index.html" title="SelectQuery">SelectQuery</a>. It can be mapped in CayenneModeler similar to how the SQLTemplate <a href="../../../../Documentation/User Guide/Quick Start/Tutorial Mapping Query/index.html" title="Tutorial Mapping Query">was mapped</a>, in this chapter however we'll show how to create it using Cayenne API.</p>
+<div id="ConfluenceContent">
+<p>It was shown before how to <a href="../../../../Documentation/User Guide/Quick Start/Tutorial DataObjects/index.html" title="Tutorial DataObjects">persist new objects</a>. Cayenne <a href="../../../../Documentation/User Guide/Queries/index.html" title="Queries">queries</a> are used to access already saved objects. The primary query type used for selecting objects is <a href="../../../../Documentation/User Guide/Queries/SelectQuery/index.html" title="SelectQuery">SelectQuery</a>. It can be mapped in CayenneModeler similar to how the SQLTemplate <a href="../../../../Documentation/User Guide/Quick Start/Tutorial Mapping Query/index.html" title="Tutorial Mapping Query">was mapped</a>, in this chapter however we'll show how to create it using Cayenne API.</p>
 
 <p>We don't have too much data in the database yet, but we can still demonstrate the main principles:</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Setup/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Setup/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Setup/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Setup/index.html Mon Jul 31 20:13:21 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="TutorialSetup-InstallJava"></a>Install Java</h3>
+<div id="ConfluenceContent">
+<h3><a name="TutorialSetup-InstallJava"></a>Install Java</h3>
 
 <p>Make sure you have Java installed (JDK 1.4 or 1.5).</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Starting Mapping Project/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Starting%20Mapping%20Project/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Starting Mapping Project/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Starting Mapping Project/index.html Mon Jul 31 20:13:21 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="TutorialStartingMappingProject-StartCayenneModeler"></a>Start CayenneModeler</h3>
+<div id="ConfluenceContent">
+<h3><a name="TutorialStartingMappingProject-StartCayenneModeler"></a>Start CayenneModeler</h3>
 
 <p>Start CayenneModeler by doubleclicking the appropriate startup file in the <tt>bin</tt> directory of Cayenne installation (if the Modeler does not start, see <a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">this page</a> for more information).</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Webapp/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Webapp/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tutorial Webapp/index.html Mon Jul 31 20:13:21 2006
@@ -99,7 +99,7 @@
     &lt;display-name&gt;Cayenne Tutorial&lt;/display-name&gt;
     &lt;filter&gt;
         &lt;filter-name&gt;CayenneFilter&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.objectstyle.cayenne.conf.WebApplicationContextFilter&lt;/filter-class&gt;
+        &lt;filter-class&gt;org.apache.cayenne.conf.WebApplicationContextFilter&lt;/filter-class&gt;
     &lt;/filter&gt;
     &lt;filter-mapping&gt;
         &lt;filter-name&gt;CayenneFilter&lt;/filter-name&gt;
@@ -119,10 +119,10 @@
 <div class="code"><div class="codeHeader"><b>webapp/index.jsp</b></div><div class="codeContent">
 <pre class="code-java">&lt;%@ page language=<span class="code-quote">"java"</span> contentType=<span class="code-quote">"text/html"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"cayenne.tutorial.*"</span> %&gt;
-&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.objectstyle.cayenne.*"</span> %&gt;
-&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.objectstyle.cayenne.query.*"</span> %&gt;
-&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.objectstyle.cayenne.exp.*"</span> %&gt;
-&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.objectstyle.cayenne.access.*"</span> %&gt;
+&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.apache.cayenne.*"</span> %&gt;
+&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.apache.cayenne.query.*"</span> %&gt;
+&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.apache.cayenne.exp.*"</span> %&gt;
+&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.apache.cayenne.access.*"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"java.util.*"</span> %&gt;
 
 &lt;% 
@@ -164,8 +164,8 @@
 <div class="code"><div class="codeHeader"><b>webapp/detail.jsp</b></div><div class="codeContent">
 <pre class="code-java">&lt;%@ page language=<span class="code-quote">"java"</span> contentType=<span class="code-quote">"text/html"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"cayenne.tutorial.*"</span> %&gt;
-&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.objectstyle.cayenne.*"</span> %&gt;
-&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.objectstyle.cayenne.access.*"</span> %&gt;
+&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.apache.cayenne.*"</span> %&gt;
+&lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.apache.cayenne.access.*"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"java.util.*"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"java.text.*"</span> %&gt;
 
@@ -254,7 +254,7 @@
 	Password: *******
 INFO  QueryLogger: +++ Connecting: SUCCESS.
 INFO  QueryLogger: --- transaction started.
-INFO  QueryLogger: Detected and installed adapter: org.objectstyle.cayenne.dba.derby.DerbyAdapter
+INFO  QueryLogger: Detected and installed adapter: org.apache.cayenne.dba.derby.DerbyAdapter
 INFO  QueryLogger: SELECT t0.DATE_OF_BIRTH, t0.NAME, t0.ID FROM ARTIST t0 ORDER BY t0.NAME - prepared in 32 ms.
 INFO  QueryLogger: === returned 0 rows. - took 461 ms.
 INFO  QueryLogger: +++ transaction committed.</pre>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/index.html Mon Jul 31 20:13:21 2006
@@ -57,7 +57,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>This chapter provides a step-by-step tutorial on writing a full database application with Cayenne. When you are done with it, you should have an understanding of the basics of object relational mapping with CayenneModeler and how to use Cayenne in standalone (command line or otherwise) and web applications. The tutorial uses the Eclipse IDE (since it is free and very common) and Derby database (since it supports embedded mode and thus requires zero setup), however it can be easily applied to any other database and/or IDE's.</p>
+<div id="ConfluenceContent">
+<p>This chapter provides a step-by-step tutorial on writing a full database application with Cayenne. When you are done with it, you should have an understanding of the basics of object relational mapping with CayenneModeler and how to use Cayenne in standalone (command line or otherwise) and web applications. The tutorial uses the Eclipse IDE (since it is free and very common) and Derby database (since it supports embedded mode and thus requires zero setup), however it can be easily applied to any other database and/or IDE's.</p>
 
 <p>Full tutorial source code in a form of Eclipse project is distributed with Cayenne (see <tt>"src/tutorials/quick-start"</tt> folder).</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Executing a Stored Procedure/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Stored%20Procedures/Executing%20a%20Stored%20Procedure/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Executing a Stored Procedure/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Executing a Stored Procedure/index.html Mon Jul 31 20:13:21 2006
@@ -52,7 +52,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="ExecutingaStoredProcedure-UsingQueryResponsetoProcessComplexResults"></a>Using QueryResponse to Process Complex Results</h3>
+<div id="ConfluenceContent">
+<h3><a name="ExecutingaStoredProcedure-UsingQueryResponsetoProcessComplexResults"></a>Using QueryResponse to Process Complex Results</h3>
 
 <p>Previous chapter showed how to select a single set of data rows using a ProcedureQuery. In a more general case stored procedures can return multiple sets of data, either as ResultSets or via OUT parameters, execute update/delete/insert queries, etc. To collect the results of execution of such stored procedure, you need to run a query using context's <tt>"performGenericQuery"</tt> method and inspect returned QueryResponse.</p>
 

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Selecting Objects/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Stored%20Procedures/Selecting%20Objects/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Selecting Objects/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Selecting Objects/index.html Mon Jul 31 20:13:21 2006
@@ -52,7 +52,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>If a stored procedure is known to return at least one result set, procedure queries can be executed just like normal select queries. Of course in addtion to returning data, such procedures can perform any other database operations.</p>
+<div id="ConfluenceContent">
+<p>If a stored procedure is known to return at least one result set, procedure queries can be executed just like normal select queries. Of course in addtion to returning data, such procedures can perform any other database operations.</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>Currently all procedure queries will return data rows, not DataObjects. If the returned row (Map) contains all the attributes needed to recreate a DataObject, this can be done by calling <tt>DataContext.objectFromDataRow()</tt>.</td></tr></table>