Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Customizing Queries/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Customizing%20Queries/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Customizing Queries/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Customizing Queries/index.html Sat Jul 22 11:45:50 2006
@@ -63,7 +63,8 @@
 <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.objectstyle.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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/NamedQuery/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/NamedQuery/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/NamedQuery/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/NamedQuery/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/ObjectIdQuery/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/ObjectIdQuery/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/ObjectIdQuery/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/ObjectIdQuery/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Parameterized Queries/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Parameterized%20Queries/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Parameterized Queries/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Parameterized Queries/index.html Sat Jul 22 11:45:50 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User 
Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>SelectQuery objects can be rather complex. They 
may contain long qualifiers and lots of tuning parameters. Parameterized 
Queries feature addresses reusability of complex queries. With this feature, 
for each group of queries that differ only in the values used in the qualifier, 
a developer may create a single shared "prototype" or "template" query, and use 
it later as a factory for other queries. All settings configured in the 
prototype object will be passed to the final queries. Qualifier of the 
prototype query may use named parameters that are substituted for real values 
when a final query is created from the prototype.</p>
+<div id="ConfluenceContent">
+<p>SelectQuery objects can be rather complex. They may contain long qualifiers 
and lots of tuning parameters. Parameterized Queries feature addresses 
reusability of complex queries. With this feature, for each group of queries 
that differ only in the values used in the qualifier, a developer may create a 
single shared "prototype" or "template" query, and use it later as a factory 
for other queries. All settings configured in the prototype object will be 
passed to the final queries. Qualifier of the prototype query may use named 
parameters that are substituted for real values when a final query is created 
from the prototype.</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>"Prototype" queries 
are normally created in CayenneModeler and stored in the DataMap XML file. 
"Queries Stored in DataMap" chapter describes how to use such templates. This 
chapter shows how to create them on the spot using the API 
calls.</td></tr></table>
 
 <p>Building a prototype query using <tt>Expression.fromString(..)</tt>:</p>

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Qualifier Expressions/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Qualifier%20Expressions/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Qualifier Expressions/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Qualifier Expressions/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Queries Stored in DataMap/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Queries%20Stored%20in%20DataMap/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Queries Stored in DataMap/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Queries Stored in DataMap/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/QueryChain/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/QueryChain/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/QueryChain/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/QueryChain/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/RelationshipQuery/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/RelationshipQuery/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/RelationshipQuery/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/RelationshipQuery/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SQLTemplate Query/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/SQLTemplate%20Query/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SQLTemplate Query/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SQLTemplate Query/index.html Sat Jul 22 11:45:50 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User 
Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Not all features of SQL can (or should) be 
mapped in the object model in terms of DataObjects. For such cases Cayenne 
provides a powerful mechanism for running both selecting and non-selecting SQL 
using scriptable <span class="nobr"><a 
href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SQLTemplate.html";
 title="Visit page outside Confluence" rel="nofollow">SQLTemplate<sup><img 
class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" 
align="absmiddle" alt="" border="0"/></sup></a></span> query. This chapter 
describes how simple SQLTemplates can be created and executed with DataContext 
to select or update the database data. Subsequent chapters show how to build 
SQL dynamically, bind parameters and describe result sets using SQLTemplate 
scripting features.</p>
+<div id="ConfluenceContent">
+<p>Not all features of SQL can (or should) be mapped in the object model in 
terms of DataObjects. For such cases Cayenne provides a powerful mechanism for 
running both selecting and non-selecting SQL using scriptable <span 
class="nobr"><a 
href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SQLTemplate.html";
 title="Visit page outside Confluence" rel="nofollow">SQLTemplate<sup><img 
class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" 
align="absmiddle" alt="" border="0"/></sup></a></span> query. This chapter 
describes how simple SQLTemplates can be created and executed with DataContext 
to select or update the database data. Subsequent chapters show how to build 
SQL dynamically, bind parameters and describe result sets using SQLTemplate 
scripting features.</p>
 
 <h3><a name="SQLTemplateQuery-CreatingSQLTemplate"></a>Creating 
SQLTemplate</h3>
 

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Scripting SQLTemplate/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Scripting%20SQLTemplate/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Scripting SQLTemplate/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Scripting SQLTemplate/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SelectQuery Customization/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/SelectQuery%20Customization/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SelectQuery Customization/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SelectQuery Customization/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SelectQuery/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/SelectQuery/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SelectQuery/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/SelectQuery/index.html Sat Jul 22 11:45:50 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User 
Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>The most commonly used query is <span 
class="nobr"><a 
href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SelectQuery.html";
 title="Visit page outside Confluence" rel="nofollow">SelectQuery<sup><img 
class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" 
align="absmiddle" alt="" border="0"/></sup></a></span>. It is a descriptor that 
allows DataContext to fetch lists of DataObjects of the right type matching the 
specified criteria. SelectQuery together with the DataMap provides just enough 
information to the Cayenne runtime objects to build the right SQL SELECT 
statement and control various execution parameters.</p>
+<div id="ConfluenceContent">
+<p>The most commonly used query is <span class="nobr"><a 
href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SelectQuery.html";
 title="Visit page outside Confluence" rel="nofollow">SelectQuery<sup><img 
class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" 
align="absmiddle" alt="" border="0"/></sup></a></span>. It is a descriptor that 
allows DataContext to fetch lists of DataObjects of the right type matching the 
specified criteria. SelectQuery together with the DataMap provides just enough 
information to the Cayenne runtime objects to build the right SQL SELECT 
statement and control various execution parameters.</p>
 
 <h3><a name="SelectQuery-SelectQueryParts"></a>SelectQuery Parts</h3>
 

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Using Orderings/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/Using%20Orderings/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Using Orderings/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/Using Orderings/index.html Sat Jul 22 11:45:50 2006
@@ -63,7 +63,8 @@
 <li><a href="../../../../Documentation/User 
Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<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 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;

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Queries/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Queries/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial DataContext/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20DataContext/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial DataContext/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial DataContext/index.html Sat Jul 22 11:45:50 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User 
Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><ul>
+<div id="ConfluenceContent">
+<ul>
        <li>In Eclipse create a new class called "Main" in the 
<tt>"cayenne.tutorial"</tt> package.</li>
        <li>Create a standard "main" method to make it a runnable class:</li>
 </ul>

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial DataObjects/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20DataObjects/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial DataObjects/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial DataObjects/index.html Sat Jul 22 11:45:50 2006
@@ -59,7 +59,8 @@
 <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.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>
 
 <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">

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Delete/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Delete/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Delete/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Delete/index.html Sat Jul 22 11:45:50 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/trunk/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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Generate%20Database%20and%20Java%20Classes/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html 
(original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html Sat 
Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Mapping Query/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Mapping%20Query/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Mapping Query/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Mapping Query/index.html Sat Jul 22 11:45:50 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/trunk/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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Object%20Relational%20Mapping/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Object Relational Mapping/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Object Relational Mapping/index.html Sat Jul 22 
11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial SelectQuery/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20SelectQuery/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial SelectQuery/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial SelectQuery/index.html Sat Jul 22 11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Setup/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Setup/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Setup/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Setup/index.html Sat Jul 22 11:45:50 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/trunk/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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Starting%20Mapping%20Project/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Starting Mapping Project/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Starting Mapping Project/index.html Sat Jul 22 
11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Webapp/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Tutorial%20Webapp/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Webapp/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/Tutorial Webapp/index.html Sat Jul 22 11:45:50 2006
@@ -59,7 +59,8 @@
 <li><a href="../../../../Documentation/User 
Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Now we'll convert the tutorial that we created 
to a web application. The web part of it is done in JSP and is intentionally 
primitive from the UI perspective, to concentrate on Cayenne integration 
aspect. There may be some specifics depending on the web framework used (JSP, 
Struts, JSF, Click, WebWork, Tapestry, etc.), still the procedure outlined here 
is quite universal as it relies on the J2EE servlet specification.</p>
+<div id="ConfluenceContent">
+<p>Now we'll convert the tutorial that we created to a web application. The 
web part of it is done in JSP and is intentionally primitive from the UI 
perspective, to concentrate on Cayenne integration aspect. There may be some 
specifics depending on the web framework used (JSP, Struts, JSF, Click, 
WebWork, Tapestry, etc.), still the procedure outlined here is quite universal 
as it relies on the J2EE servlet specification.</p>
 
 <p>A typical Cayenne web application works like this:</p>
 

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Quick Start/index.html Sat Jul 22 11:45:50 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/trunk/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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Stored%20Procedures/Executing%20a%20Stored%20Procedure/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/Executing a Stored Procedure/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/Executing a Stored Procedure/index.html Sat Jul 22 
11:45:50 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/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/Selecting Objects/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Stored%20Procedures/Selecting%20Objects/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/Selecting Objects/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/Selecting Objects/index.html Sat Jul 22 11:45:50 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>
 

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/Stored Procedures and Transactions/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Stored%20Procedures/Stored%20Procedures%20and%20Transactions/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/Stored Procedures and Transactions/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/Stored Procedures and Transactions/index.html Sat Jul 
22 11:45:50 2006
@@ -52,7 +52,8 @@
 <li><a href="../../../../Documentation/User 
Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>There maybe a situations when stored procedures 
handle their own transactions and an application is configured to use 
Cayenne-managed transactions. This is obviously conflicting and undesirable 
behavior. In this case ProcedureQueries should be executed explicitly wrapped 
in an "external" Transaction. This is one of the few cases when a user should 
worry about transactions at all. Read more about manual transactions <a 
href="../../../../Documentation/User Guide/Design/Understanding 
Transactions/index.html" title="Understanding Transactions">here</a>.</p></div>
+<div id="ConfluenceContent"><p><br/>
+There maybe a situations when stored procedures handle their own transactions 
and an application is configured to use Cayenne-managed transactions. This is 
obviously conflicting and undesirable behavior. In this case ProcedureQueries 
should be executed explicitly wrapped in an "external" Transaction. This is one 
of the few cases when a user should worry about transactions at all. Read more 
about manual transactions <a href="../../../../Documentation/User 
Guide/Design/Understanding Transactions/index.html" title="Understanding 
Transactions">here</a>.</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/User 
Guide/Stored Procedures/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Stored%20Procedures/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/Stored Procedures/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>In addition to mapping database tables and 
views as entities, Cayenne allows mapping and executing database stored 
procedures. Just like table structure is described by DbEntities, stored 
procedures are described by Procedure class. Stored procedures are created 
using CayenneModeler, and are executed using <span class="nobr"><a 
href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/ProcedureQuery.html";
 title="Visit page outside Confluence" rel="nofollow">ProcedureQuery<sup><img 
class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" 
align="absmiddle" alt="" border="0"/></sup></a></span>, as described in the 
following chapters.</p>
+<div id="ConfluenceContent">
+<p>In addition to mapping database tables and views as entities, Cayenne 
allows mapping and executing database stored procedures. Just like table 
structure is described by DbEntities, stored procedures are described by 
Procedure class. Stored procedures are created using CayenneModeler, and are 
executed using <span class="nobr"><a 
href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/ProcedureQuery.html";
 title="Visit page outside Confluence" rel="nofollow">ProcedureQuery<sup><img 
class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" 
align="absmiddle" alt="" border="0"/></sup></a></span>, as described in the 
following chapters.</p>
 </div>
 </div>
   <div class="clearer">.</div>

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/index.html (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User 
Guide/index.html Sat Jul 22 11:45:50 2006
@@ -45,7 +45,8 @@
 <li><a href="../../Documentation/User 
Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="UserGuide-USERGUIDE"></a>USER 
GUIDE</h3>
+<div id="ConfluenceContent">
+<h3><a name="UserGuide-USERGUIDE"></a>USER GUIDE</h3>
 <ol>
        <li><a href="../../Documentation/User Guide/Introduction/index.html" 
title="Introduction">Introduction</a></li>
        <li><a href="../../Documentation/User Guide/Installation/index.html" 
title="Installation">Installation</a></li>

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/index.html
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/index.html?rev=424619&r1=424618&r2=424619&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/index.html
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/index.html
 Sat Jul 22 11:45:50 2006
@@ -27,7 +27,8 @@
     <span class="logoSpaceLink"><a href="../index.html">Cayenne User 
Documentation</a></span><br />
     <span class="pagetitle">Documentation</span>
   </div>
-<div id="ConfluenceContent"><h2><a 
name="Documentation-CayenneDocumentation"></a>Cayenne Documentation</h2>
+<div id="ConfluenceContent">
+<h2><a name="Documentation-CayenneDocumentation"></a>Cayenne Documentation</h2>
 
 <ul>
        <li><a href="../Documentation/User Guide/index.html" title="User 
Guide">User Guide</a>:  General information on how to get started with Cayenne, 
main Cayenne concepts, API details and deployment procedures.</li>


Reply via email to