cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r657422 [2/4] - in /cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation: ./ Cayenne Guide/ Cayenne Guide/Ant Tasks/ Cayenne Guide/Ant Tasks/cdataport/ Cayenne Guide/Ant Tasks/cdbgen/ Cayenne Guide/Ant Tasks/cdeploy...
Date Sat, 17 May 2008 18:36:08 GMT
Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Understanding%20Transactions/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html Sat May 17 11:36:04 2008
@@ -193,7 +193,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html Sat May 17 11:36:04 2008
@@ -74,7 +74,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/BNF%20for%20ExpressionParser/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html Sat May 17 11:36:04 2008
@@ -66,8 +66,21 @@
 andCondition 	::= 	notCondition ( "and" notCondition )*
 notCondition 	::= 	( "not" | "!" ) simpleCondition
                  | 	simpleCondition
-simpleCondition 	::= 	scalarExpression ( simpleNotCondition | ( "=" | "==" ) scalarExpression | ( "!=" | "&lt;&gt;" ) scalarExpression | "&lt;=" scalarExpression | "&lt;" scalarExpression | "&gt;" scalarExpression | "&gt;=" scalarExpression | "like" scalarExpression | "likeIgnoreCase" scalarExpression | "in" ( namedParameter | "(" scalarCommaList ")" ) | "between" scalarExpression "and" scalarExpression )?
-simpleNotCondition 	::= 	( "not" | "!" ) ( "like" scalarExpression | "likeIgnoreCase" scalarExpression | "in" ( namedParameter | "(" scalarCommaList ")" ) | "between" scalarExpression "and" scalarExpression )
+simpleCondition 	::= 	scalarExpression ( simpleNotCondition | 
+                                     ( "=" | "==" ) scalarExpression | 
+                                     ( "!=" | "&lt;&gt;" ) scalarExpression | 
+                                     "&lt;=" scalarExpression | 
+                                     "&lt;" scalarExpression | 
+                                     "&gt;" scalarExpression | 
+                                     "&gt;=" scalarExpression | 
+                                     "like" scalarExpression | 
+                                     "likeIgnoreCase" scalarExpression | 
+                                     "in" ( namedParameter | "(" scalarCommaList ")" ) 
+                                     | "between" scalarExpression "and" scalarExpression )?
+simpleNotCondition 	::= 	( "not" | "!" ) ( "like" scalarExpression | 
+                                                  "likeIgnoreCase" scalarExpression | 
+                                                  "in" ( namedParameter | "(" scalarCommaList ")" ) | 
+                                                  "between" scalarExpression "and" scalarExpression )
 scalarCommaList 	::= 	( scalarConstExpression ( "," scalarConstExpression )* )
 scalarExpression 	::= 	scalarNumericExpression
                  | 	&lt;SINGLE_QUOTED_STRING&gt;
@@ -96,7 +109,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/Building%20Expressions/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html Sat May 17 11:36:04 2008
@@ -208,7 +208,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Expression Factory Utilities/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/Expression%20Factory%20Utilities/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Expression Factory Utilities/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Expression Factory Utilities/index.html Sat May 17 11:36:04 2008
@@ -164,7 +164,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/In-Memory Evaluation/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/In-Memory%20Evaluation/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/In-Memory Evaluation/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/In-Memory Evaluation/index.html Sat May 17 11:36:04 2008
@@ -114,7 +114,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/NULL Handling/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/NULL%20Handling/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/NULL Handling/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/NULL Handling/index.html Sat May 17 11:36:04 2008
@@ -77,7 +77,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Path Expressions/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/Path%20Expressions/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Path Expressions/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Path Expressions/index.html Sat May 17 11:36:04 2008
@@ -57,17 +57,26 @@
 <li><a href="../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent">
-<p>Before we start discussing how to build expressions, it is important to understand one group of expressions widely used in Cayenne: path expressions. There are two types of path expressions: object path used to navigate graphs of Java objects that follow Java Bean property naming conventions and database path used to navigate the database schema.</p>
+<div id="ConfluenceContent"><p>Before we start discussing how to build expressions, it is important to understand one group of expressions widely used in Cayenne: <em>path expressions</em>. There are two types of path expressions: object path used to navigate graphs of Java objects that follow Java Bean property naming conventions and database path used to navigate the database schema. General form of path expressions is the following:</p>
+
+<div class="preformatted"><div class="preformattedContent">
+<pre>[db:]segment[+][.segment[+]...]</pre>
+</div></div>
+
+<ul>
+	<li>"db:" an optional prefix indicating the the following path is a DB path.</li>
+	<li>"segment" - a name of a relationship or an attribute in the path. Path must have at least one segment; segments are separated by dot (".").</li>
+	<li>"+" - OUTER JOIN indicator: a plus sign at the end of a segment name indicates that when a JOIN is created for the path, it must be an OUTER JOIN.</li>
+</ul>
+
 
 <h3><a name="PathExpressions-ObjectPathExpressions"></a>Object Path Expressions</h3>
 <p>An Object Path Expression is a property navigation path. Such path is represented by a String made of dot-separated names of properties of a Java Bean class. E.g. a path expression "toArtist.artistName" is a valid property path for a Painting class, pointing to the name of the Artist who created a given Painting. A few more examples:</p>
 
 <ul>
-	<li><b>paintingTitle</b><br/>
-      Can be used to navigate to the value of "paintingTitle" property of the Painting class.</li>
-	<li><b>toArtist.exhibitArray.closingDate</b><br/>
-      Can be used to navigate to a closing date of any of the exhibits of a Painting's Artist object.</li>
+	<li><tt>paintingTitle</tt> Can be used to navigate to the value of "paintingTitle" property of the Painting class.</li>
+	<li><tt>toArtist.exhibitArray.closingDate</tt> Can be used to navigate to a closing date of any of the exhibits of a Painting's Artist object.</li>
+	<li><tt>toArtist.exhibitArray+.closingDate</tt> Same with an OUTER JOIN on exhibits</li>
 </ul>
 
 
@@ -77,14 +86,12 @@
 <p>Database Path Expressions provide an easy way to navigate through DB table joins. Instead of complex join semantics such expressions utilize the names of DbRelationships defined in Cayenne DataMap. Translating the above object path examples into the DB realm, database path expressions might look like this:</p>
 
 <ul>
-	<li><b>PAINTING_TITLE</b><br/>
-      Can be used to match the value of "PAINTING_TITLE" column of a PAINTING table.</li>
-	<li><b>toArtist.artistExhibitArray.toExhibit.CLOSING_DATE</b><br/>
-      Can be used to match a closing date of any of the exhibits of a related artist record.</li>
+	<li><tt>db:PAINTING_TITLE</tt> Can be used to match the value of "PAINTING_TITLE" column of a PAINTING table.</li>
+	<li><tt>db:toArtist.artistExhibitArray.toExhibit.CLOSING_DATE</tt> Can be used to match a closing date of any of the exhibits of a related artist record.</li>
 </ul>
 
 
-<p>Though database path expressions are widely used by Cayenne framework internally, they are rarely used in applications. There are only a few cases when their explicit use is justified.</p>
+<p>Though database path expressions are widely used by Cayenne framework internally, they are rarely used in applications. Although there are a few cases when their explicit use is justified.</p>
 
 <h3><a name="PathExpressions-MatchingPathExpressions"></a>Matching Path Expressions</h3>
 
@@ -94,7 +101,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/index.html Sat May 17 11:36:04 2008
@@ -77,7 +77,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Installation/Cayenne%20and%20Maven/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html Sat May 17 11:36:04 2008
@@ -84,7 +84,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Installation/JAR%20Files%20and%20Dependencies/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html Sat May 17 11:36:04 2008
@@ -75,9 +75,8 @@
 <p>When using <tt>cayenne-server-x.x.jar</tt> you'll need a few third party jars (all included in <tt>"lib/third-party"</tt> directory of the distribution):</p>
 
 <ul>
-	<li><span class="nobr"><a href="http://objectstyle.org/ashwood/" title="Visit page outside Confluence" rel="nofollow">ObjectStyle Ashwood Graph Library<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 1.1</li>
+	<li><span class="nobr"><a href="http://objectstyle.org/ashwood/" title="Visit page outside Confluence" rel="nofollow">ObjectStyle Ashwood Graph Library<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 2.0</li>
 	<li><span class="nobr"><a href="http://jakarta.apache.org/velocity/" title="Visit page outside Confluence" rel="nofollow">Apache Velocity Template Engine<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 1.3 (and all its dependencies bundled with velocity-dep)</li>
-	<li><span class="nobr"><a href="http://jakarta.apache.org/commons/lang/" title="Visit page outside Confluence" rel="nofollow">Apache Commons Lang<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 2.1</li>
 	<li><span class="nobr"><a href="http://jakarta.apache.org/commons/collections" title="Visit page outside Confluence" rel="nofollow">Apache Commons Collections<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 3.1</li>
 	<li><span class="nobr"><a href="http://jakarta.apache.org/commons/logging/" title="Visit page outside Confluence" rel="nofollow">Apache Commons Logging<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 1.1</li>
 </ul>
@@ -102,7 +101,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Upgrade/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Installation/Upgrade/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Upgrade/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Upgrade/index.html Sat May 17 11:36:04 2008
@@ -83,9 +83,87 @@
 </ul>
 
 
+<h3><a name="Upgrade-Upgradingto3.0"></a>Upgrading to 3.0</h3>
+
+<ul>
+	<li>If you are still using ObjectStyle.org releases of Cayenne, read "Upgrading to 2.0" for the information on how to change the package names.</li>
+</ul>
+
+
+<ul>
+	<li>Java 5 is now required as a minimum for Cayenne Modeler and the Cayenne libraries.</li>
+</ul>
+
+
+<ul>
+	<li>After the move to Java 5, generics have been implemented in many of the Cayenne APIs. If you don't use generics in your project this should not affect you, but if you do you will need to review any new compiler errors or warnings. The effect of generics is at compile time only, so their introduction will not change the runtime behaviour of your application once compiled.</li>
+</ul>
+
+
+<ul>
+	<li>Jar files:
+	<ul>
+		<li>all jar files now include version numbers in their names.</li>
+		<li>"cayenne-nodeps.jar" is renamed to "cayenne-server-x.x.x.jar"</li>
+		<li>"fat" cayenne.jar file that included dependencies is no longer distributed. All dependencies that it contained are included as separate jars under "cayenne-x.x.x/lib/third-party/". The new "cayenne-server-x.x.x.jar" plus dependencies should be used in place of cayenne.jar.</li>
+		<li>A new "cayenne-agent-x.x.x.jar" is included. It is used for class enhancement with POJO's and JPA. "Classic" Cayenne users can ignore this file.</li>
+	</ul>
+	</li>
+</ul>
+
+
+<ul>
+	<li>Ant class generator is using what was called "version 1.2" by default. This means that if you were<br/>
+  using custom Velocity templates in 1.1 mode, you should either change the templates or specify 'version="1.1"'<br/>
+  in the buildfile explicitly.</li>
+</ul>
+
+
+<ul>
+	<li>Cross-platform Modeler Startup is now done without a batch file or a shell script.<br/>
+  A "fat" CayenneModeler.jar is included in the "cayenne-x.x.x/bin" directory<br/>
+  and can be run either by double-clicking the jar (on platforms that support that)<br/>
+  or by running "java -jar CayenneModeler.jar".</li>
+</ul>
+
+
+<ul>
+	<li>FireBird adapter is no longer distributed with Cayenne. The one we had was half-working<br/>
+  and we could not support it anymore.</li>
+</ul>
+
+
+<ul>
+	<li>DerivedDbEntities are removed from Cayenne.</li>
+</ul>
+
+
+<ul>
+	<li>DVModeler and DataViews are no longer shipped with Cayenne. See <span class="nobr"><a href="http://cwiki.apache.org/CAYDV/" title="Visit page outside Confluence" rel="nofollow">http://cwiki.apache.org/CAYDV/<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> for more details.</li>
+</ul>
+
+
+<ul>
+	<li>DataContextTransactionEventListener, DataObjectTransactionEventListener, DataContextEvent are removed.</li>
+</ul>
+
+
+<ul>
+	<li>Long PK: Cayenne now supports "long" primary key generation (previously it only supported "int"). You may<br/>
+  have to change the existing PK lookup tables on some databases to take advantage of that (this is optional,<br/>
+  and is needed if you expect your PK to exceed maximum value of an "int" allowed in your database). E.g. on <br/>
+  MySQL you may run the following SQL:</li>
+</ul>
+
+
+  <div class="code"><div class="codeContent">
+<pre class="code-java">ALTER TABLE AUTO_PK_SUPPORT CHANGE COLUMN NEXT_ID NEXT_ID BIGINT NOT NULL;</pre>
+</div></div>
+
+
 <h3><a name="Upgrade-Upgradingto2.0"></a>Upgrading to 2.0</h3>
 
-<p>2.0 is a mirror of 1.2 (third digit in release number is a patch level that matches 1.2 version, e.g. "2.0.1" has the same patch level as "1.2.1"). The main change is that all packages were renamed from "org.objectstyle.&#42;" to "org.apache.&#42;". This affects user API and also mapping XML files (as they sometimes reference Cayenne classes by name).</p>
+<p>2.0 is a mirror of 1.2 (third digit in release number is a patch level that matches 1.2 version, e.g. "2.0.1" has the same patch level as "1.2.1"). The main change is that all packages were renamed from "org.objectstyle.cayenne&#42;" to "org.apache.cayenne.&#42;". This affects user API and also mapping XML files (as they sometimes reference Cayenne classes by name).</p>
 
 <ul>
 	<li>First you need to upgrade the mapping files as described in general upgrade instructions above.</li>
@@ -93,12 +171,12 @@
 
 
 <ul>
-	<li>Upgrading the code: Replace "org.objectstyle." with "org.apache." everywhere in imports and do a clean recompile.</li>
+	<li>Upgrading the code: Replace "org.objectstyle.cayenne" with "org.apache.cayenne" everywhere in imports and do a clean recompile.</li>
 </ul>
 
 
 <ul>
-	<li>Upgrading logging configuration: If you are using custom logging configuration file, make sure that all the Cayenne loggers are changed from "org.objectstyle" to "org.apache".</li>
+	<li>Upgrading logging configuration: If you are using custom logging configuration file, make sure that all the Cayenne loggers are changed from "org.objectstyle.cayene" to "org.apache.cayenne".</li>
 </ul>
 
 
@@ -181,7 +259,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Installation/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/index.html Sat May 17 11:36:04 2008
@@ -55,7 +55,7 @@
 <div id="ConfluenceContent"><h3><a name="Installation-SystemRequirements"></a>System Requirements</h3>
 
 <ul>
-	<li><b>JDK:</b> Cayenne, including GUI tools, is written in 100% Java, and runs on any Java-compatible platform. Required JDK version is 1.4 or higher. If your deployment environment uses JDK 1.3, you can still use Cayenne, just downgrade to version 1.1.x - the last  version compatible with JDK 1.3.</li>
+	<li><b>JDK:</b> Cayenne, including GUI tools, is written in 100% Java, and runs on any Java-compatible platform. Required JDK version is 1.5 or higher. <em>(The last version of Cayenne compatible with JDK 1.4 is 1.2.x/2.0.x; JDK 1.3 - 1.1.x)</em></li>
 </ul>
 
 
@@ -72,11 +72,11 @@
 
 <h3><a name="Installation-ObtainingCayenne"></a>Obtaining Cayenne</h3>
 
-<p>Installing Cayenne is simple - just download and unpack the distribution. Download page is located here: <span class="nobr"><a href="http://incubator.apache.org/cayenne/download.html" title="Visit page outside Confluence" rel="nofollow">http://incubator.apache.org/cayenne/download.html<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. Select a distribution matching your target platform (cross-platform version, as the name implies, works on any OS that has Java).</p>
+<p>Installing Cayenne is simple - just download and unpack the distribution. Download page is located here: <span class="nobr"><a href="http://cayenne.apache.org/download.html" title="Visit page outside Confluence" rel="nofollow">http://cayenne.apache.org/download.html<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. Select a distribution for your development platform (cross-platform version, as the name implies, works on any OS that has Java).</p>
 
-<p>Once you've done that, you can <a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">start the Modeler</a> and use appropriate jar files in your application (see <a href="../../../Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html" title="JAR Files and Dependencies">JAR Files and Dependencies</a> for more information). </p>
+<p>Once you've done that, you can <a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">start the Modeler</a> and use appropriate jar files in your application. See <a href="../../../Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html" title="JAR Files and Dependencies">JAR Files and Dependencies</a> for more information. </p>
 
-<p>If you are using Maven2, the runtime dependencies can be obtained in a standard Maven way (i.e. <a href="../../../Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html" title="Cayenne and Maven">by declaring them in the POM</a>), still you may want to download the distribution to get hold of the Modeler.</p>
+<p>If you are using Maven2, the runtime dependencies can be obtained in a standard Maven way (i.e. <a href="../../../Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html" title="Cayenne and Maven">by declaring them in the POM</a>), still you likely want to download the distribution, as it includes the Modeler.</p>
 
 <h3><a name="Installation-Sections"></a>Sections</h3>
 
@@ -92,7 +92,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Introduction/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Introduction/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Introduction/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Introduction/index.html Sat May 17 11:36:04 2008
@@ -73,7 +73,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Lifecycle%20Callbacks/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html Sat May 17 11:36:04 2008
@@ -50,9 +50,6 @@
 </ul>
 </div>
 <div id="ConfluenceContent"><h2><a name="LifecycleCallbacks-LifecycleCallbacks"></a>Lifecycle Callbacks</h2>
-<p><em>(since 3.0M1)</em></p>
-
-<p><em>TODO: annotations, Modeler support</em></p>
 
 <p>Users can register callback methods that will be invoked during the lifecycle of persistent objects. Callback mechanism matches closely the one defined in the <a href="../../../Documentation/JPA Guide/index.html" title="JPA Guide">JPA Specification</a> (except that it works with JDK 1.4 and allows preconfigured listeners). There are seven lifecycle callbacks described below (PrePersist, PostPersist, PreUpdate, PostUpdate, PreRemove, PostRemove, PostLoad). There are two types of invocations for each one of them: <b>callback on a persistent object</b> itself or a <b>callback on  an arbitrary listener object</b>.</p>
 
@@ -152,9 +149,7 @@
 
 <h2><a name="LifecycleCallbacks-RegisteringCallbacks"></a>Registering Callbacks</h2>
 
-<p>Listeners and persistent object callbacks can be mapped in the Modeler <em>(TODO: GUI not implemented yet</em>)_</p>
-
-<p>Alternatively callbacks can be registered with <tt>LifecycleCallbackRegistry</tt>, which is shared by all contexts within DataDomain.</p>
+<p>Normally listeners and persistent object callbacks are mapped in the Modeler, but here we'll show how to do that in the code. Callbacks can be registered with <tt>LifecycleCallbackRegistry</tt>, which is shared by all contexts within DataDomain.</p>
 
 <p>Obtaining the shared registry instance:</p>
 <div class="code"><div class="codeContent">
@@ -240,7 +235,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Maven2%20Plugins/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html Sat May 17 11:36:04 2008
@@ -93,7 +93,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Maven2%20Plugins/maven2-cgen/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html Sat May 17 11:36:04 2008
@@ -243,7 +243,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Caching Lookup Tables/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Caching%20Lookup%20Tables/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Caching Lookup Tables/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Caching Lookup Tables/index.html Sat May 17 11:36:04 2008
@@ -72,7 +72,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Data Rows/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Data%20Rows/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Data Rows/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Data Rows/index.html Sat May 17 11:36:04 2008
@@ -101,7 +101,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Iterating Through Data Rows/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Iterating%20Through%20Data%20Rows/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Iterating Through Data Rows/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Iterating Through Data Rows/index.html Sat May 17 11:36:04 2008
@@ -113,7 +113,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Paginated%20Queries/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html Sat May 17 11:36:04 2008
@@ -103,7 +103,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Prefetching/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html Sat May 17 11:36:04 2008
@@ -175,7 +175,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Turning%20off%20Context%20Synchronization/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html Sat May 17 11:36:04 2008
@@ -82,7 +82,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/index.html Sat May 17 11:36:04 2008
@@ -83,7 +83,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/Caching%20Query%20Results/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html Sat May 17 11:36:04 2008
@@ -181,7 +181,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Customizing Queries/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/Customizing%20Queries/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Customizing Queries/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Customizing Queries/index.html Sat May 17 11:36:04 2008
@@ -153,7 +153,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/EJBQLQuery/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html Sat May 17 11:36:04 2008
@@ -125,7 +125,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/NamedQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/NamedQuery/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/NamedQuery/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/NamedQuery/index.html Sat May 17 11:36:04 2008
@@ -78,7 +78,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/ObjectIdQuery/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html Sat May 17 11:36:04 2008
@@ -61,10 +61,7 @@
 <li><a href="../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</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>
-
-<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>
+<div id="ConfluenceContent"><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>
 
 <p>Normally if you need to find an object that matches a certain primary key value, you would use <tt>DataObjectUtils.objectForPK(DataContext,String,int)</tt>. This method will look up an object in the cache, and only run a query if it is not yet cached. <tt>ObjectIdQuery</tt> gives the user more control of the object caching behavior. It supports three possible caching policies:</p>
 
@@ -119,7 +116,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Queries Stored in DataMap/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/Queries%20Stored%20in%20DataMap/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Queries Stored in DataMap/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Queries Stored in DataMap/index.html Sat May 17 11:36:04 2008
@@ -93,7 +93,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/QueryChain/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/QueryChain/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/QueryChain/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/QueryChain/index.html Sat May 17 11:36:04 2008
@@ -77,7 +77,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/RelationshipQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/RelationshipQuery/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/RelationshipQuery/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/RelationshipQuery/index.html Sat May 17 11:36:04 2008
@@ -74,7 +74,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SQLTemplate%20Query/Advanced%20SQLTemplate/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html Sat May 17 11:36:04 2008
@@ -39,6 +39,7 @@
 <li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html">SQLTemplate Query</a><ul>
 <li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html">SQLTemplate Basics</a></li>
 <li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html">Scripting SQLTemplate</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html">SQLTemplate Result Mapping</a></li>
 <li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html">Advanced SQLTemplate</a><ul>
 </ul>
 </li>
@@ -94,7 +95,7 @@
   <div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SQLTemplate%20Query/SQLTemplate%20Basics/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html Sat May 17 11:36:04 2008
@@ -41,6 +41,7 @@
 </ul>
 </li>
 <li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html">Scripting SQLTemplate</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html">SQLTemplate Result Mapping</a></li>
 <li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html">Advanced SQLTemplate</a></li>
 </ul>
 </li>
@@ -125,7 +126,7 @@
   <div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Added: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SQLTemplate%20Query/SQLTemplate%20Result%20Mapping/index.html?rev=657422&view=auto
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html (added)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html Sat May 17 11:36:04 2008
@@ -0,0 +1,156 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+<html>
+  <head>
+    <title>Apache Cayenne Documentation - SQLTemplate Result Mapping</title>
+    <style type="text/css">@import "../../../../../style.css";</style>
+  </head>
+<body>
+  <div class="header">
+    <div style="float: left;"><a href="http://cayenne.apache.org/"><img src="../../../../../images/logo.gif" align="absmiddle" border="0"></a></div>
+    <span class="logoSpaceLink"><a href="../../../../../index.html">Cayenne User Documentation</a></span><br />
+    <span class="pagetitle">SQLTemplate Result Mapping</span>
+  </div>
+<div id="cayenne_toc">
+<ul>
+<li><a href="../../../../../Documentation/Cayenne Guide/Introduction/index.html">Introduction</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Installation/index.html">Installation</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Quick Start/index.html">Quick Start</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/DataContext/index.html">DataContext</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/index.html">Queries</a><ul>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SelectQuery/index.html">SelectQuery</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html">SQLTemplate Query</a><ul>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html">SQLTemplate Basics</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html">Scripting SQLTemplate</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html">SQLTemplate Result Mapping</a><ul>
+</ul>
+</li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html">Advanced SQLTemplate</a></li>
+</ul>
+</li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html">EJBQLQuery</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/NamedQuery/index.html">NamedQuery</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html">ObjectIdQuery</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/QueryChain/index.html">QueryChain</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/RelationshipQuery/index.html">RelationshipQuery</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/Queries Stored in DataMap/index.html">Queries Stored in DataMap</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/Caching Query Results/index.html">Caching Query Results</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/Customizing Queries/index.html">Customizing Queries</a></li>
+</ul>
+</li>
+<li><a href="../../../../../Documentation/Cayenne Guide/DataObjects/index.html">DataObjects</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Stored Procedures/index.html">Stored Procedures</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Expressions/index.html">Expressions</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Lifecycle Callbacks/index.html">Lifecycle Callbacks</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Performance Tuning/index.html">Performance Tuning</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Caching and Fresh Data/index.html">Caching and Fresh Data</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Deployment/index.html">Deployment</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Ant Tasks/index.html">Ant Tasks</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Maven2 Plugins/index.html">Maven2 Plugins</a></li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</a></li>
+</ul>
+</div>
+<div id="ConfluenceContent"><p>This chapter pertains to selecting SQLTemplates that fetch a single result set. By default the returned result is a List of DataRows or Persistent objects, depending on how the query was configured. However SQLTemplate is much more powerful and can be set up to fetch  lists of scalars, and lists of Object[] instances with an arbitrary mix of objects and scalars.</p>
+
+<h3><a name="SQLTemplateResultMapping-DefaultResults"></a>Default Results</h3>
+
+<p>To get either DataObjects or DataRows, not much configuration is needed:</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java">SQLTemplate query = <span class="code-keyword">new</span> SQLTemplate(Artist.class, <span class="code-quote">"SELECT * FROM ARTIST"</span>);
+
+<span class="code-comment">// List of Artist
+</span>List artists = context.performQuery(query);</pre>
+</div></div>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java">SQLTemplate query = <span class="code-keyword">new</span> SQLTemplate(Artist.class, <span class="code-quote">"SELECT * FROM ARTIST"</span>);
+
+<span class="code-comment">// *** Force DataRows
+</span>query.setFetchingDataRows(<span class="code-keyword">true</span>);
+
+<span class="code-comment">// List of DataRow
+</span>List rows = context.performQuery(query);</pre>
+</div></div>
+
+<h3><a name="SQLTemplateResultMapping-ScalarResults"></a>Scalar Results</h3>
+
+<p>To select a list of scalar values, you will need to use a SQLResultSetMapping class to tell Cayenne how to deal with it:</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java">SQLTemplate query = <span class="code-keyword">new</span> SQLTemplate(Painting.class, <span class="code-quote">"SELECT ESTIMATED_PRICE P FROM PAINTING"</span>);
+
+<span class="code-comment">// *** let Cayenne know that result is a scalar
+</span>SQLResultSetMapping rsMap = <span class="code-keyword">new</span> SQLResultSetMapping();
+rsMap.addColumnResult(<span class="code-quote">"P"</span>);
+query.setResultSetMapping(rsMap);
+
+<span class="code-comment">// List of <span class="code-object">Number</span>'s
+</span>List prices = context.performQuery(query);</pre>
+</div></div>
+
+<p>Or if the query nature guarantees only a single row in the result (aggregate query), do this:</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java">SQLTemplate query = <span class="code-keyword">new</span> SQLTemplate(Painting.class, <span class="code-quote">"SELECT SUM(ESTIMATED_PRICE) S FROM PAINTING"</span>);
+
+<span class="code-comment">// *** let Cayenne know that result is a scalar
+</span>SQLResultSetMapping rsMap = <span class="code-keyword">new</span> SQLResultSetMapping();
+rsMap.addColumnResult(<span class="code-quote">"S"</span>);
+query.setResultSetMapping(rsMap);
+
+<span class="code-comment">// List of <span class="code-object">Number</span>'s
+</span><span class="code-object">Number</span> assetsValue = (<span class="code-object">Number</span>) DataObjectUtils.objectForQuery(context, query)</pre>
+</div></div>
+
+<h3><a name="SQLTemplateResultMapping-MixedResults"></a>Mixed Results</h3>
+
+<p>SQLResultSetMapping can be used to fetch a mix of objects and scalars. In this case the result will be <tt>Object[]</tt> that contains scalars and objects in the order they were configured in SQLResultSetMapping:</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java">SQLTemplate query = <span class="code-keyword">new</span> SQLTemplate(Artist.class, <span class="code-quote">"SELECT t0.ARTIST_ID, t0.NAME, t0.DATE_OF_BIRTH, COUNT(t1.PAINTING_ID) C "</span> +
+      <span class="code-quote">"FROM ARTIST t0 LEFT JOIN PAINTING t1 ON (t0.ARTIST_ID = t1.ARTIST_ID) "</span> +
+      <span class="code-quote">"GROUP BY t0.ARTIST_ID, t0.NAME, t0.DATE_OF_BIRTH"</span>);
+
+<span class="code-comment">// *** let Cayenne know that result is a mix of Artist objects and the count of their paintings
+</span>EntityResult artistResult = <span class="code-keyword">new</span> EntityResult(Artist.class);
+artistResult.addDbField(Artist.ARTIST_ID_PK_COLUMN, <span class="code-quote">"ARTIST_ID"</span>);
+artistResult.addObjectField(Artist.NAME_PROPERTY, <span class="code-quote">"NAME"</span>);
+artistResult.addObjectField(Artist.DATE_OF_BIRTH_PROPERTY, <span class="code-quote">"DATE_OF_BIRTH"</span>);
+
+SQLResultSetMapping rsMap = <span class="code-keyword">new</span> SQLResultSetMapping();
+rsMap.addEntityResult(artistResult);
+rsMap.addColumnResult(<span class="code-quote">"C"</span>);
+query.setResultSetMapping(rsMap);
+
+<span class="code-comment">// List of <span class="code-object">Object</span>[]
+</span><span class="code-object">Number</span> assetsValue = (<span class="code-object">Number</span>) DataObjectUtils.objectForQuery(context, query)</pre>
+</div></div>
+</div>
+</div>
+  <div class="clearer">.</div>
+  <div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
+
+  <div class="smalltext copyright">
+    Copyright &copy;2001-2008 Apache Software Foundation
+  </div>
+
+</body>
+</html>

Propchange: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SQLTemplate%20Query/Scripting%20SQLTemplate/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html Sat May 17 11:36:04 2008
@@ -41,6 +41,7 @@
 <li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html">Scripting SQLTemplate</a><ul>
 </ul>
 </li>
+<li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html">SQLTemplate Result Mapping</a></li>
 <li><a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html">Advanced SQLTemplate</a></li>
 </ul>
 </li>
@@ -288,7 +289,7 @@
   <div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SQLTemplate%20Query/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html Sat May 17 11:36:04 2008
@@ -39,6 +39,7 @@
 <li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html">SQLTemplate Query</a><ul>
 <li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html">SQLTemplate Basics</a></li>
 <li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html">Scripting SQLTemplate</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html">SQLTemplate Result Mapping</a></li>
 <li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html">Advanced SQLTemplate</a></li>
 </ul>
 </li>
@@ -71,6 +72,7 @@
 <ol>
 	<li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html" title="SQLTemplate Basics">SQLTemplate Basics</a></li>
 	<li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html" title="Scripting SQLTemplate">Scripting SQLTemplate</a></li>
+	<li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html" title="SQLTemplate Result Mapping">SQLTemplate Result Mapping</a></li>
 	<li><a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html" title="Advanced SQLTemplate">Advanced SQLTemplate</a></li>
 </ol>
 </div>
@@ -79,7 +81,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Parameterized Queries/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SelectQuery/Parameterized%20Queries/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Parameterized Queries/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Parameterized Queries/index.html Sat May 17 11:36:04 2008
@@ -146,7 +146,7 @@
   <div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Qualifier Expressions/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SelectQuery/Qualifier%20Expressions/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Qualifier Expressions/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Qualifier Expressions/index.html Sat May 17 11:36:04 2008
@@ -67,29 +67,31 @@
 <li><a href="../../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</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/Cayenne Guide/Expressions/index.html" title="Expressions">Expressions</a>.</td></tr></table>
+<div id="ConfluenceContent"><p>This chapter is dedicated to the use of expressions as qualifiers in SelectQuery. Expressions in general are discussed <a href="../../../../../Documentation/Cayenne Guide/Expressions/index.html" title="Expressions">here</a>.</p>
+
+<h3><a name="QualifierExpressions-BuildingQualifier"></a>Building Qualifier </h3>
 
 <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>
 
 <p>SelectQuery provides a few ways to initialize and modify the qualifier:</p>
 
 <ul>
-	<li>public <b>SelectQuery</b>(Class objectClass, Expression e)<br/>
-      Passing expression as a second argument in constructor.</li>
-	<li>public void <b>setQualifier</b>(Expression qualifier)<br/>
-      Explicitly setting the qualifier expression.</li>
-	<li>public void <b>andQualifier</b>(Expression e)<br/>
-      Adding an expression to an already existing qualifier using logical AND.</li>
-	<li>public void <b>orQualifier</b>(Expression e)<br/>
-      Adding an expression to an already existing qualifier using logical OR.</li>
+	<li><tt>public <b>SelectQuery</b>(Class&lt;?&gt; objectClass, Expression e)</tt> : Passing expression as a second argument in constructor.</li>
+	<li><tt>public void <b>setQualifier</b>(Expression qualifier)</tt> : Explicitly setting the qualifier expression.</li>
+	<li><tt>public void <b>andQualifier</b>(Expression e)</tt> : Chaining an expression with an already existing qualifier using logical AND.</li>
+	<li><tt>public void <b>orQualifier</b>(Expression e)</tt> : Chaining an expression with an already existing qualifier using logical OR.</li>
 </ul>
-</div>
+
+
+<h3><a name="QualifierExpressions-SpecifyingJoinSemantics"></a>Specifying Join Semantics</h3>
+
+<p>Each <a href="../../../../../Documentation/Cayenne Guide/Expressions/Path Expressions/index.html" title="Path Expressions">path expression</a> in a qualifier results in a SQL JOIN in a generated SQL. By default all joins are INNER joins. If LEFT OUTER joins are desirable, users can specify them with a plus sign ("&#43;") after each affected relationship segment in a path expression. E.g. a path like <tt>"paintingArray&#43;.name"</tt> would result in a LEFT OUTER JOIN for an Artist SelectQuery, ensuring that artists without joins are also included in the query result.</p></div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/SelectQuery Customization/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SelectQuery/SelectQuery%20Customization/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/SelectQuery Customization/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/SelectQuery Customization/index.html Sat May 17 11:36:04 2008
@@ -88,7 +88,7 @@
   <div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Using Orderings/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SelectQuery/Using%20Orderings/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Using Orderings/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Using Orderings/index.html Sat May 17 11:36:04 2008
@@ -113,7 +113,7 @@
   <div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SelectQuery/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html Sat May 17 11:36:04 2008
@@ -142,7 +142,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/index.html Sat May 17 11:36:04 2008
@@ -108,7 +108,7 @@
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataContext/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20DataContext/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataContext/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataContext/index.html Sat May 17 11:36:04 2008
@@ -120,7 +120,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataObjects/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20DataObjects/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataObjects/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataObjects/index.html Sat May 17 11:36:04 2008
@@ -185,7 +185,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Delete/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20Delete/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Delete/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Delete/index.html Sat May 17 11:36:04 2008
@@ -122,7 +122,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20Generate%20Database%20and%20Java%20Classes/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html Sat May 17 11:36:04 2008
@@ -109,7 +109,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Mapping Query/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20Mapping%20Query/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Mapping Query/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Mapping Query/index.html Sat May 17 11:36:04 2008
@@ -132,7 +132,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Object Relational Mapping/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20Object%20Relational%20Mapping/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Object Relational Mapping/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Object Relational Mapping/index.html Sat May 17 11:36:04 2008
@@ -126,7 +126,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>

Modified: cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20SelectQuery/index.html?rev=657422&r1=657421&r2=657422&view=diff
==============================================================================
--- cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html (original)
+++ cayenne/main/tags/3.0M4/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html Sat May 17 11:36:04 2008
@@ -129,7 +129,7 @@
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
 
   <div class="smalltext copyright">
-    Copyright &copy;2001-2007 Apache Software Foundation
+    Copyright &copy;2001-2008 Apache Software Foundation
   </div>
 
 </body>



Mime
View raw message