m4 docs from wiki
git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/tags/3.0M4@657422 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdataport/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdataport/index.html
index d14e13f..9ddd6e2 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdataport/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdataport/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdbgen/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdbgen/index.html
index 5935665..01d4366 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdbgen/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdbgen/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdeploy/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdeploy/index.html
index 9ee97ce..206e8fb 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdeploy/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cdeploy/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cgen/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cgen/index.html
index 0df3ce7..3b0cba2 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cgen/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/cgen/index.html
@@ -234,7 +234,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/index.html
index 40cd8e1..44d592e 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Ant Tasks/index.html
@@ -91,7 +91,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Caching and Fresh Data/RefreshQuery/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Caching and Fresh Data/RefreshQuery/index.html
index 02b4759..437cf86 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Caching and Fresh Data/RefreshQuery/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Caching and Fresh Data/RefreshQuery/index.html
@@ -97,7 +97,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Caching and Fresh Data/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Caching and Fresh Data/index.html
index 9d2ece7..7831082 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Caching and Fresh Data/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Caching and Fresh Data/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Custom DbAdapter/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Custom DbAdapter/index.html
index 0d0b4c5..a80b824 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Custom DbAdapter/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Custom DbAdapter/index.html
@@ -54,21 +54,26 @@
</li>
</ul>
</div>
-<div id="ConfluenceContent"><h3><a name="CustomDbAdapter-HowdoIwriteanadaptertosupportadatabasethatisnotyetsupported%3F"></a>How do I write an adapter to support a database that is not yet supported?</h3>
+<div id="ConfluenceContent"><h2><a name="CustomDbAdapter-HowdoIwriteanadaptertosupportadatabasethatisnotyetsupported%3F"></a>How do I write an adapter to support a database that is not yet supported?</h2>
-<p>You need to implement a custom <span class="nobr"><a href="http://cayenne.apache.org/doc/api/org/apache/cayenne/dba/DbAdapter.html" title="Visit page outside Confluence" rel="nofollow">DbAdapter<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. Most likely you won't have to do it from scratch and can extend a JdbcAdapter or one of the existing db-specific adapters. </p>
+<p>You need to implement a custom <span class="nobr"><a href="http://cayenne.apache.org/doc/api/org/apache/cayenne/dba/DbAdapter.html" title="Visit page outside Confluence" rel="nofollow">DbAdapter<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. Most likely you won't have to do it from scratch and can extend a JdbcAdapter or one of the existing db-specific adapters. </p>
-<h5><a name="CustomDbAdapter-%28Optional%29thingstodobeforeyoustart%3A"></a>(Optional) things to do before you start:</h5>
+<h3><a name="CustomDbAdapter-IftheadapterisforadatabasethatwecurrentlydonotsupportandyouareplanningtodonateittoCayenne%2Cyoucandothisfirst%3A"></a>If the adapter is for a database that we currently do not support and you are planning to donate it to Cayenne, you can do this first:</h3>
+
<ul>
<li>Open a JIRA issue where all contributed code will go.</li>
- <li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYSITE/Mailing+lists" title="Mailing lists">Subscribe</a> to the cayenne-dev mailing list, as this is where all Cayenne internals are discussed (those that are of no interest to most users).</li>
+ <li><span class="nobr"><a href="http://cayenne.apache.org/mailing-lists.html" title="Visit page outside Confluence" rel="nofollow">Subscribe<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> to the developer mailing list and introduce yourself to Cayenne developers.</li>
</ul>
<h5><a name="CustomDbAdapter-Implementationprocedureisroughlythefollowing%3A"></a>Implementation procedure is roughly the following:</h5>
<ul>
- <li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYSITE/Code+repository" title="Code repository">Check out</a> latest Cayenne source from SVN. If you use Eclipse, follow <a href="http://cwiki.apache.org/confluence/confluence/display/CAYSITE/Eclipse" title="Eclipse">these instructions</a> to setup the projects.</li>
+ <li><span class="nobr"><a href="http://cayenne.apache.org/code-repository.html" title="Visit page outside Confluence" rel="nofollow">Check out<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> the latest Cayenne source from SVN. If you use Eclipse, follow <span class="nobr"><a href="http://cayenne.apache.org/eclipse.html" title="Visit page outside Confluence" rel="nofollow">these instructions<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> to setup the projects.</li>
+</ul>
+
+
+<ul>
<li>Create a barebone adapter that inherits from JdbcAdapter.</li>
</ul>
@@ -80,12 +85,12 @@
</ul>
-<table cellpadding='5' width='85%' cellspacing='8px' class='tipMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>Correct mapping is needed for the Modeler to do schema generation. Techically it is not required for the runtime. However <tt>types.xml</tt> should still be there.</td></tr></table>
+<table cellpadding='5' width='85%' cellspacing='8px' class='tipMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>Correct mapping is needed for the Modeler to do schema generation. Technically it is not required for the runtime. However <tt>types.xml</tt> should still be there.</td></tr></table>
<ul>
- <li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYSITE/Legacy+Ant+Unit+Tests" title="Legacy Ant Unit Tests">Run existing Cayenne unit tests</a> with the new adapter, analyze the failures and change adapter code accordingly.</li>
+ <li><span class="nobr"><a href="http://cayenne.apache.org/running-unit-tests.html" title="Visit page outside Confluence" rel="nofollow">Run existing Cayenne unit tests<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> with the new adapter, analyze the failures and change adapter code accordingly.</li>
<li>Repeat the last step until all tests pass.</li>
- <li>Report success in JIRA and cayenne-devel - one of the committers will integrate your code to Cayenne.</li>
+ <li>Report success in JIRA and the dev list - one of the committers will integrate your code to Cayenne.</li>
</ul>
</div>
</div>
@@ -93,7 +98,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Custom Query Cache Provider/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Custom Query Cache Provider/index.html
index 3dec17e..872fd8d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Custom Query Cache Provider/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Custom Query Cache Provider/index.html
@@ -79,7 +79,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Extended Types/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Extended Types/index.html
index 7b19f0e..59b3a8d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Extended Types/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/Extended Types/index.html
@@ -78,38 +78,13 @@
<h3><a name="ExtendedTypes-Threetierconsiderations"></a>Three tier considerations</h3>
-<p>If you are using Cayenne in a three tier (ROP) environment, serialization of the extended type becomes important. More information can be found <a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Customization/index.html" title="Remote Object Persistence Customization">here.</a></p>
-
-<h3><a name="ExtendedTypes-MappingJavaEnums"></a>Mapping Java Enums</h3>
-
-<p>Note that <span class="nobr"><a href="http://java.sun.com/j2se/1.5.0/docs/guide/language/enums.html" title="Visit page outside Confluence" rel="nofollow">custom enums<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> are supported by Cayenne natively. Cayenne stores an enum name in the database if the corresponding database column is a character column, and enum ordinal, if the column is numeric. So in a simple case no special ExtendedType is needed to map enums. Still often you may need one when you want to store a non-standard enum property in the database. </p>
-
-<p>Take for example the following enum:</p>
-<div class="code"><div class="codeContent">
-<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">enum</span> MyEnum {
-
- E1(55), E2(97), E3(101);
-
- <span class="code-keyword">private</span> <span class="code-object">int</span> code;
-
- <span class="code-keyword">private</span> MyEnum(<span class="code-object">int</span> code) {
- <span class="code-keyword">this</span>.code = code;
- }
-
- <span class="code-keyword">public</span> <span class="code-object">int</span> getCode() {
- <span class="code-keyword">return</span> code;
- }
-}</pre>
-</div></div>
-
-<p>To store and retrieve string values "E1", "E2", "E3" no ExtendedType is needed. To store "code" value a custom ExtendedType is needed. </p>
-</div>
+<p>If you are using Cayenne in a three tier (ROP) environment, serialization of the extended type becomes important. More information can be found <a href="../../../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Customization/index.html" title="Remote Object Persistence Customization">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>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/index.html
index 4b2dd4f..f4911ab 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Customization/index.html
@@ -69,7 +69,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataContextDelegate/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataContextDelegate/index.html
index e6c1840..0ee3372 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataContextDelegate/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataContextDelegate/index.html
@@ -85,7 +85,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataContextFactory/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataContextFactory/index.html
index 768d6c7..3686019 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataContextFactory/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataContextFactory/index.html
@@ -67,7 +67,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataObject State Management/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataObject State Management/index.html
index 56baa6e..7cdd34c 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataObject State Management/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/DataObject State Management/index.html
@@ -189,7 +189,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Moving Objects Between Contexts/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Moving Objects Between Contexts/index.html
index 9e037fd..bfc9cd7 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Moving Objects Between Contexts/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Moving Objects Between Contexts/index.html
@@ -85,7 +85,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Nested DataContexts/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Nested DataContexts/index.html
index fc2261c..842d2c1 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Nested DataContexts/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Nested DataContexts/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/ObjectContext Memory Management/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/ObjectContext Memory Management/index.html
index 22311e2..c96e44d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/ObjectContext Memory Management/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/ObjectContext Memory Management/index.html
@@ -96,7 +96,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Obtaining DataContext/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Obtaining DataContext/index.html
index d50dc89..36ba8fc 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Obtaining DataContext/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Obtaining DataContext/index.html
@@ -138,7 +138,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Running Queries/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Running Queries/index.html
index b8bc4a6..3fba3c1 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Running Queries/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/Running Queries/index.html
@@ -131,7 +131,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/index.html
index eb1382a..35cb6e6 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataContext/index.html
@@ -80,7 +80,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Accessing PK and FK Values/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Accessing PK and FK Values/index.html
index 7640ece..fe37915 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Accessing PK and FK Values/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Accessing PK and FK Values/index.html
@@ -139,7 +139,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObject Validation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObject Validation/index.html
index 64b4015..1f7e565 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObject Validation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObject Validation/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObjectUtils/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObjectUtils/index.html
index 66acc55..cbc294b 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObjectUtils/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObjectUtils/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObjects Example/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObjects Example/index.html
index 3d0f406..8f747e9 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObjects Example/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/DataObjects Example/index.html
@@ -124,7 +124,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Deleting Objects/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Deleting Objects/index.html
index 02e7ed7..d8662cd 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Deleting Objects/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Deleting Objects/index.html
@@ -102,7 +102,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Flattened Relationships/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Flattened Relationships/index.html
index 9fc1454..64caffa 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Flattened Relationships/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Flattened Relationships/index.html
@@ -68,7 +68,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Generic Persistent Class/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Generic Persistent Class/index.html
index ff420d8..1ac4e5b 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Generic Persistent Class/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Generic Persistent Class/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Handling Inheritance/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Handling Inheritance/index.html
index f75a8e2..0f94d8a 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Handling Inheritance/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Handling Inheritance/index.html
@@ -151,7 +151,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Relationships/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Relationships/index.html
index 8a8f789..ed2d834 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Relationships/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Relationships/index.html
@@ -169,7 +169,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/index.html
index 94ce4fd..af5136a 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/index.html
@@ -85,7 +85,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html
index 5ea9363..0770c67 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html
@@ -81,7 +81,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html
index 7a55db0..43fc1aa 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html
index 7aaaeaa..5246b6d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html
@@ -246,7 +246,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html
index 0e00d99..08bba02 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Standalone Applications/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Standalone Applications/index.html
index 90a7b09..3b0e597 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Standalone Applications/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Standalone Applications/index.html
@@ -95,7 +95,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Using JNDI/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Using JNDI/index.html
index ff6727d..0730341 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Using JNDI/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Using JNDI/index.html
@@ -156,7 +156,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Web Applications/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Web Applications/index.html
index 468927d..924e438 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Web Applications/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Web Applications/index.html
@@ -133,7 +133,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/index.html
index f2e967f..8d08e06 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Cayenne Contract/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Cayenne Contract/index.html
index 03995a1..2a3ceea 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Cayenne Contract/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Cayenne Contract/index.html
@@ -160,7 +160,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Object Caching/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Object Caching/index.html
index d254aca..ca73dbb 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Object Caching/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Object Caching/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html
index f3c3f31..f185a80 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html
@@ -112,7 +112,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/Generated Columns/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/Generated Columns/index.html
index 987bc81..22cc77d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/Generated Columns/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/Generated Columns/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/index.html
index 666ec04..c5e1e3f 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/index.html
@@ -135,7 +135,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataChannel/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataChannel/index.html
index 2787e1a..2f96df3 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataChannel/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataChannel/index.html
@@ -94,7 +94,7 @@
<div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataNode/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataNode/index.html
index 0e31451..1ee3b41 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataNode/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataNode/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataSource/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataSource/index.html
index 0a08339..cd5848a 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataSource/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataSource/index.html
@@ -75,7 +75,7 @@
<div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html
index 59c18e0..29b32d7 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html
@@ -91,7 +91,7 @@
<div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/EntityResolver/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/EntityResolver/index.html
index 05f9624..6f7d6e9 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/EntityResolver/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/EntityResolver/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/Event Package/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/Event Package/index.html
index 60b029a..a3bccb3 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/Event Package/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/Event Package/index.html
@@ -85,7 +85,7 @@
<div style="height: 12px; background-image: url('../../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/ObjectContext/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/ObjectContext/index.html
index ce5d84f..45e28d9 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/ObjectContext/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/ObjectContext/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/index.html
index 0a89a69..08aff07 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/index.html
@@ -96,7 +96,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html
index d3115d6..edb4f3b 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html
index 454a24a..84dc4c1 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html
index 790ec60..8a60814 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html
@@ -66,8 +66,21 @@
andCondition ::= notCondition ( "and" notCondition )*
notCondition ::= ( "not" | "!" ) simpleCondition
| simpleCondition
-simpleCondition ::= scalarExpression ( simpleNotCondition | ( "=" | "==" ) scalarExpression | ( "!=" | "<>" ) scalarExpression | "<=" scalarExpression | "<" scalarExpression | ">" scalarExpression | ">=" 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 |
+ ( "!=" | "<>" ) scalarExpression |
+ "<=" scalarExpression |
+ "<" scalarExpression |
+ ">" scalarExpression |
+ ">=" 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
| <SINGLE_QUOTED_STRING>
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html
index 72a4f2a..1a67b77 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Expression Factory Utilities/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Expression Factory Utilities/index.html
index 100269b..701d8fd 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Expression Factory Utilities/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Expression Factory Utilities/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/In-Memory Evaluation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/In-Memory Evaluation/index.html
index 54fb8d8..c2009c7 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/In-Memory Evaluation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/In-Memory Evaluation/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/NULL Handling/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/NULL Handling/index.html
index 4fb291b..f09d5fe 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/NULL Handling/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/NULL Handling/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Path Expressions/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Path Expressions/index.html
index 3e1242f..46b6234 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Path Expressions/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Path Expressions/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/index.html
index cebb2a6..b433210 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html
index 5fa66a9..f7b4788 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Cayenne and Maven/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html
index c169cef..a87203e 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/JAR Files and Dependencies/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Upgrade/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Upgrade/index.html
index 7c8cd9a..f106ba7 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Upgrade/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/Upgrade/index.html
@@ -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.*" to "org.apache.*". 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*" to "org.apache.cayenne.*". 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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/index.html
index c8b2e68..c9d30a1 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Installation/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Introduction/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Introduction/index.html
index 8c1f06c..ddeaa40 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Introduction/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Introduction/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html
index 0c3911f..d8ccbd0 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html
index 6cc1790..5feb630 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html
index 262368d..3f621a7 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Caching Lookup Tables/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Caching Lookup Tables/index.html
index 6147a76..6222c05 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Caching Lookup Tables/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Caching Lookup Tables/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Data Rows/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Data Rows/index.html
index 6f772b3..8858ad5 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Data Rows/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Data Rows/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Iterating Through Data Rows/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Iterating Through Data Rows/index.html
index 1c8abc3..93f3e16 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Iterating Through Data Rows/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Iterating Through Data Rows/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html
index 462c062..bf77651 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html
index e261c52..2dbd663 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html
index 0d2e4b6..2d76442 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/index.html
index 8dc3829..1ee6490 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html
index d9168d3..b1369ea 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Customizing Queries/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Customizing Queries/index.html
index a038b1e..e38e677 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Customizing Queries/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Customizing Queries/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html
index f37151d..38a2808 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/NamedQuery/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/NamedQuery/index.html
index ee49abe..2f1c704 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/NamedQuery/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/NamedQuery/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html
index c47bbcc..608acde 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Queries Stored in DataMap/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Queries Stored in DataMap/index.html
index aa5c40b..180ef1d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Queries Stored in DataMap/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Queries Stored in DataMap/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/QueryChain/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/QueryChain/index.html
index 2930e1f..baba194 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/QueryChain/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/QueryChain/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/RelationshipQuery/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/RelationshipQuery/index.html
index db783b1..1ad20c2 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/RelationshipQuery/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/RelationshipQuery/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html
index ca1d353..ee1c9c4 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html
index d3b1b43..c5a8225 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Basics/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html
new file mode 100644
index 0000000..1fcffe1
--- /dev/null
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html
@@ -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 ©2001-2008 Apache Software Foundation
+ </div>
+
+</body>
+</html>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html
index 6c42b96..3797e9a 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html
index 7660118..0c9b258 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Parameterized Queries/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Parameterized Queries/index.html
index 03a9db9..6f78073 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Parameterized Queries/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Parameterized Queries/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Qualifier Expressions/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Qualifier Expressions/index.html
index 09e4179..0b884c0 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Qualifier Expressions/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Qualifier Expressions/index.html
@@ -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<?> 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 ("+") after each affected relationship segment in a path expression. E.g. a path like <tt>"paintingArray+.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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/SelectQuery Customization/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/SelectQuery Customization/index.html
index 608778b..9b43324 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/SelectQuery Customization/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/SelectQuery Customization/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Using Orderings/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Using Orderings/index.html
index 3dfc500..974ce51 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Using Orderings/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/Using Orderings/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html
index 03e97bb..e55c87a 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/index.html
index 4ac29da..f6e8558 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataContext/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataContext/index.html
index f9cbb64..b6c5fc9 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataContext/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataContext/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataObjects/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataObjects/index.html
index 66d4b72..8a4904d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataObjects/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial DataObjects/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Delete/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Delete/index.html
index c951a27..f2b9c18 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Delete/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Delete/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html
index 8d1b839..f4add6e 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Generate Database and Java Classes/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Mapping Query/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Mapping Query/index.html
index 89aa634..36e8dec 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Mapping Query/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Mapping Query/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Object Relational Mapping/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Object Relational Mapping/index.html
index ebdff00..c6199ef 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Object Relational Mapping/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Object Relational Mapping/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html
index 45df7f0..72837c1 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Setup/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Setup/index.html
index b4fe883..01f7d10 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Setup/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Setup/index.html
@@ -106,7 +106,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Starting Mapping Project/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Starting Mapping Project/index.html
index 5245265..a3d8a36 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Starting Mapping Project/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Starting Mapping Project/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Webapp/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Webapp/index.html
index 11d7bf7..09406da 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Webapp/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Webapp/index.html
@@ -275,7 +275,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/index.html
index 613cc58..21d7573 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/index.html
@@ -94,7 +94,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Executing a Stored Procedure/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Executing a Stored Procedure/index.html
index c1af158..ddff522 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Executing a Stored Procedure/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Executing a Stored Procedure/index.html
@@ -118,7 +118,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Selecting Objects/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Selecting Objects/index.html
index b9438fe..8316293 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Selecting Objects/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Selecting Objects/index.html
@@ -54,10 +54,7 @@
<li><a href="../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</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>
-
-<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>
+<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 addition to returning data, such procedures can perform any other database operations.</p>
<p>Below is an example of creating a ProcedureQuery, initializing its parameters, and processing execution results.</p>
@@ -66,22 +63,19 @@
<span class="code-comment">// <span class="code-quote">"my_procedure"</span> is a name of a stored procedure,
</span><span class="code-comment">// that must exist in the DataMap
-</span>ProcedureQuery query = <span class="code-keyword">new</span> ProcedureQuery(<span class="code-quote">"my_procedure"</span>);
+</span>ProcedureQuery query = <span class="code-keyword">new</span> ProcedureQuery(<span class="code-quote">"my_procedure"</span>, Artist.class);
<span class="code-comment">// Set <span class="code-quote">"IN"</span> parameter values
</span>query.addParam(<span class="code-quote">"paramter1"</span>, <span class="code-quote">"abc"</span>);
query.addParam(<span class="code-quote">"parameter2"</span>, <span class="code-keyword">new</span> <span class="code-object">Integer</span>(3000));
<span class="code-comment">// run query as a normal select query
-</span>List rows = ctxt.performQuery(query);
+</span>List objects = ctxt.performQuery(query);
<span class="code-comment">// process results
-</span>Iterator it = rows.iterator();
+</span>Iterator it = objects.iterator();
<span class="code-keyword">while</span>(it.hasNext()) {
- Map row = (Map)it.next();
-
- <span class="code-comment">// <span class="code-keyword">do</span> something with result, e.g. instantiate a real DataObject
-</span> MyDataObject object = (MyDataObject)ctxt.objectFromDataRow(<span class="code-quote">"MyDataObject"</span>, row);
+ Artist artist = (Artist) it.next();
....
}</pre>
</div></div></div>
@@ -90,7 +84,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Stored Procedures and Transactions/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Stored Procedures and Transactions/index.html
index c4f62b8..2764f4b 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Stored Procedures and Transactions/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Stored Procedures and Transactions/index.html
@@ -61,7 +61,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/index.html
index 69563c9..be9b982 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/index.html
@@ -68,7 +68,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/index.html
index 96a0dae..8d0e230 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Agent/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Agent/index.html
index 2f1b7cb..5632891 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Agent/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Agent/index.html
@@ -39,18 +39,40 @@
<li><a href="../../../Documentation/JPA Guide/JPA Cayenne Provider Properties/index.html">JPA Cayenne Provider Properties</a></li>
</ul>
</div>
-<div id="ConfluenceContent"><p>Cayenne JPA provider requires enhancement of the Entity classes. In J2EE environment container takes care of registering the enhancer classes. In J2SE environment (such as command-line applications, or web containers like Jetty or Tomcat) runtime class enhancement is more tricky.</p>
+<div id="ConfluenceContent"><h2><a name="JPAAgent-CayenneAgent"></a>Cayenne Agent</h2>
+
+<p>Cayenne JPA provider requires enhancement of the Entity classes. In J2EE environment container takes care of registering the enhancer classes. In J2SE environment (such as command-line applications, or web containers like Jetty or Tomcat) runtime class enhancement is more tricky.</p>
<p>A common portable approach to integrate enhancer in J2SE environment is via Java instrumentation API (see <tt>java.lang.instrument</tt> package documentation for details). This requires Cayenne "agent" to be specified in the JVM startup options. Cayenne Agent is a special jar file that comes with Cayenne distribution called <tt>"cayenne-agent-x.x.x.jar"</tt>. It has no external dependencies (not even on Cayenne itself).</p>
+
+<h2><a name="JPAAgent-AgentArguments"></a>Agent Arguments</h2>
+
+<p>The following arguments can be optionally passed to Cayenne Agent on startup:</p>
+
+<table class='confluenceTable'><tbody>
+<tr>
+<td class='confluenceTd'><tt>jpa-eager-load</tt></td>
+<td class='confluenceTd'>Loads all JPA units available on CLASSPATH. This option ensures correct enhancement of all persistent classes, regardless of the provider loading order. Without this option, classes loaded before their persistence unit was instantiated will not be properly enhanced. However use with caution as this option can slow down the application significantly (i.e. use only if you are having problems with class enhancement).</td>
+</tr>
+</tbody></table>
+
+
+<h2><a name="JPAAgent-Examples"></a>Examples</h2>
+
<ul>
- <li>Command-line example:
-<div class="preformatted"><div class="preformattedContent">
-<pre>java -javaagent:/path/to/cayenne-agent-xxxx.jar org.example.Main</pre>
-</div></div></li>
+ <li>Command-line example:</li>
</ul>
+<div class="preformatted"><div class="preformattedContent">
+<pre>java -javaagent:/path/to/cayenne-agent-xxxx.jar org.example.Main</pre>
+</div></div>
+
+<div class="preformatted"><div class="preformattedContent">
+<pre>java -javaagent:/path/to/cayenne-agent-xxxx.jar=jpa-eager-load org.example.Main</pre>
+</div></div>
+
<ul>
<li>Jetty Example<br/>
<em>TODO</em></li>
@@ -67,7 +89,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Cayenne Provider Properties/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Cayenne Provider Properties/index.html
index 1bc955b..d77d560 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Cayenne Provider Properties/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Cayenne Provider Properties/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Installation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Installation/index.html
index eb67a18..69d3fe2 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Installation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Installation/index.html
@@ -63,7 +63,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Introduction/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Introduction/index.html
index 5c384fb..81d398e 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Introduction/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Introduction/index.html
@@ -53,7 +53,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Quick Start/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Quick Start/index.html
index 54978ea..0a9df96 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Quick Start/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA Quick Start/index.html
@@ -45,7 +45,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA persistence.xml/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA persistence.xml/index.html
index b052219..f712cf3 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA persistence.xml/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/JPA persistence.xml/index.html
@@ -57,7 +57,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/index.html
index e7fa271..71953c5 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/JPA Guide/index.html
@@ -55,7 +55,7 @@
<div style="height: 12px; background-image: url('../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html
index 4fc2086..6534815 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html
@@ -56,7 +56,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html
index d90c311..dce70e0 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/index.html
index bd93d43..7785ddb 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/index.html
@@ -62,7 +62,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html
index 3094c20..8e6f75d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html
index e0e2985..eadaa0c 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html
@@ -70,7 +70,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html
index e0d67e2..7409c4a 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html
@@ -67,7 +67,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html
index 7a78250..3e44eef 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html
@@ -81,7 +81,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html
index c2276f4..2670fdd 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html
@@ -70,7 +70,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html
index cf3b6f8..a4885be 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html
index d662f25..550adb2 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html
@@ -87,7 +87,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/index.html
index 55b59ab..b0288cf 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html
index 61a383f..bb11881 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html
@@ -90,7 +90,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Object Validation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Object Validation/index.html
index bc9c843..e9895a1 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Object Validation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Object Validation/index.html
@@ -55,7 +55,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Transactional Behavior/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Transactional Behavior/index.html
index 606223e..70f5510 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Transactional Behavior/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Transactional Behavior/index.html
@@ -57,7 +57,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html
index cc7b872..0dc2c01 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html
@@ -66,7 +66,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html
index 6a041ca..04ae134 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html
index d8c847a..fcda0d2 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
index e0741ca..7185809 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
@@ -70,7 +70,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html
index 739ee0a..4e1031b 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html
index 68e26c4..23c808d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html
@@ -62,7 +62,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/index.html
index 26e6feb..6b61507 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/index.html
@@ -62,7 +62,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html
index 3f355f4..3c9f200 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html
@@ -38,6 +38,7 @@
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a><ul>
</ul>
@@ -73,7 +74,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html
index 86da439..c3ed941 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html
@@ -38,6 +38,7 @@
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a><ul>
@@ -81,7 +82,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html
index f3924e1..618a64a 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html
@@ -40,6 +40,7 @@
</li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
@@ -153,7 +154,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html
index d0b8ac5..50aaa22 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html
@@ -38,6 +38,7 @@
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a><ul>
</ul>
</li>
@@ -65,7 +66,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html
new file mode 100644
index 0000000..6a4d49f
--- /dev/null
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html
@@ -0,0 +1,175 @@
+<!--
+ 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 - Modeling Enumerations</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">Modeling Enumerations</span>
+ </div>
+<div id="cayenne_toc">
+<ul>
+<li><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/index.html">Introduction to CayenneModeler</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/ORM Case Study/index.html">ORM Case Study</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a><ul>
+</ul>
+</li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html">Modeling Remote Persistence</a></li>
+</ul>
+</li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Queries/index.html">Modeling Queries</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Configuring Deployment Settings/index.html">Configuring Deployment Settings</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Preferences Panel/index.html">Preferences Panel</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
+</ul>
+</div>
+<div id="ConfluenceContent"><h2><a name="ModelingEnumerations-MappingandModelingJavaEnumerations"></a>Mapping and Modeling Java Enumerations</h2>
+
+<p>Cayenne natively supports Java 1.5 <span class="nobr"><a href="http://java.sun.com/j2se/1.5.0/docs/guide/language/enums.html" title="Visit page outside Confluence" rel="nofollow">custom enumerations<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. There are two levels of support. The more flexible method is to implement the Cayenne ExtendedEnumeration interface and provide the database value for each enumeration. The advantage of implementing this interface is it allows you to specify the exact database value represented by each enumeration and the enumerations are not order-fragile. If you do not implement this interface, Cayenne will use a fallback approach and only use the enum's actual name (for a text column) or the ordinal position (for a numeric column, which is fragile).</p>
+
+<p>Regardless of which incarnation you use, in Cayenne Modeler's ObjEntity editor, under the Attributes tab, give the full class name for your enumeration under the Java Type column. This column is pre-filled with java.lang.String, etc., but you can provide your own Java type there:</p>
+
+<p><div align="center"><img src="ColorEnum.png" border="0" /></div></p>
+
+<p>Cayenne will auto-register the enumeration at runtime.</p>
+
+<p>There is currently no other modeler support for mapping the enumerations (no "enum editor" in Cayenne Modeler). You have to hand-create the enumerations yourself, but this isn't too difficult to do. Choose either Extended/Standard below and use the examples as a pattern for creating your own.</p>
+
+<h3><a name="ModelingEnumerations-ExtendedEnumerations"></a>Extended Enumerations</h3>
+
+<p>Cayenne's extended enumerations need to implement ExtendedEnumeration, which contains only the getDatabaseValue() method. This method is used to specify the exact database value each enumeration represents.</p>
+
+<p>Here is an example mapping enumerations to integers:</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.ExtendedEnumeration;
+
+<span class="code-keyword">public</span> <span class="code-keyword">enum</span> Color <span class="code-keyword">implements</span> ExtendedEnumeration {
+ RED(3), GREEN(6), BLUE(9);
+
+ <span class="code-keyword">private</span> <span class="code-object">Integer</span> value;
+
+ <span class="code-keyword">private</span> Color(<span class="code-object">Integer</span> value)
+ {
+ <span class="code-keyword">this</span>.value = value;
+ }
+
+ <span class="code-keyword">public</span> <span class="code-object">Integer</span> getDatabaseValue()
+ {
+ <span class="code-keyword">return</span> value;
+ }
+}</pre>
+</div></div>
+
+<p>This instructs Cayenne to read/write 3, 6, and 9 as RED, GREEN, and BLUE, respectively. The order is unimportant – if someone re-orders them to be BLUE, GREEN, and RED, all values will still map correctly.</p>
+
+<p>An example mapping enumerations to strings:</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.ExtendedEnumeration;
+
+<span class="code-keyword">public</span> <span class="code-keyword">enum</span> State <span class="code-keyword">implements</span> ExtendedEnumeration {
+ ALABAMA(<span class="code-quote">"AL"</span>), ALASKA(<span class="code-quote">"AK"</span>), ARIZONA(<span class="code-quote">"AZ"</span>), MARYLAND(<span class="code-quote">"MD"</span>), VIRGINIA(<span class="code-quote">"VA"</span>);
+
+ <span class="code-keyword">private</span> <span class="code-object">String</span> value;
+
+ <span class="code-keyword">private</span> State(<span class="code-object">String</span> value)
+ {
+ <span class="code-keyword">this</span>.value = value;
+ }
+
+ <span class="code-keyword">public</span> <span class="code-object">String</span> getDatabaseValue()
+ {
+ <span class="code-keyword">return</span> value;
+ }
+}</pre>
+</div></div>
+
+<p>In this example, long state names are mapped to the database as their two-letter standard abbreviation.</p>
+
+<p>The final example illustrates how the database can store one value, but you might want to utilize a different internal value for calculations or some other purpose:</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.ExtendedEnumeration;
+
+<span class="code-keyword">public</span> <span class="code-keyword">enum</span> InterestTerm <span class="code-keyword">implements</span> ExtendedEnumeration
+{
+ YEARLY(1, 1), QUARTERLY(2, 4), MONTHLY(3, 12);
+
+ <span class="code-keyword">private</span> <span class="code-object">Integer</span> dbValue;
+ <span class="code-keyword">private</span> <span class="code-object">int</span> value;
+
+ <span class="code-keyword">private</span> InterestTerm(<span class="code-object">Integer</span> dbValue, <span class="code-object">int</span> value)
+ {
+ <span class="code-keyword">this</span>.dbValue = dbValue;
+ <span class="code-keyword">this</span>.value = value;
+ }
+
+ <span class="code-keyword">public</span> <span class="code-object">Integer</span> getDatabaseValue()
+ {
+ <span class="code-keyword">return</span> dbValue;
+ }
+
+ <span class="code-keyword">public</span> <span class="code-object">int</span> value()
+ {
+ <span class="code-keyword">return</span> value;
+ }
+}</pre>
+</div></div>
+
+<p>Cayenne will store 1, 2, and 3 as the database values in this case, but the code can call the value() method (which is not part of the ExtendedEnumeration interface) to use a different value for calculations.</p>
+
+<p>As you can see, the constructor can take as many parameters as required and you can add as many methods as you need. Only getDatabaseValue() is required by Cayenne and that will determine the value persisted for each enumeration.</p>
+
+<h3><a name="ModelingEnumerations-StandardEnumerations"></a>Standard Enumerations</h3>
+
+<p>Cayenne's support for standard enumerations maps the enum's actual name (if a string column) or the ordinal position (if a numeric column). Given the Color example declared this way:</p>
+
+<div class="code"><div class="codeContent">
+<pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">enum</span> Color {
+ RED, GREEN, BLUE;
+}</pre>
+</div></div>
+
+<p>Cayenne will persist "RED", "GREEN", or "BLUE" to the database for a string column (you cannot specify the value persisted). For a numeric column, it will persist 0, 1, and 2, respectively (again, you cannot specify the value – they are simply the order defined in the Java code). Numeric columns are especially fragile because if someone re-orders the Java enum to be BLUE, GREEN, and RED, then all previously persisted values of RED and BLUE will swap places when you read from the database (which most likely is incorrect).</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 ©2001-2008 Apache Software Foundation
+ </div>
+
+</body>
+</html>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html
index 654bc2f..4a78076 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html
@@ -40,6 +40,7 @@
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a><ul>
</ul>
</li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
@@ -104,7 +105,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html
index 25dc672..5563391 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html
@@ -40,6 +40,7 @@
</ul>
</li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
@@ -75,7 +76,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html
index e8a65b3..1a492f3 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html
@@ -38,6 +38,7 @@
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
@@ -74,7 +75,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/index.html
index b20eddd..3924e2c 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/index.html
@@ -38,6 +38,7 @@
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html">Delete Rules</a></li>
@@ -59,6 +60,7 @@
<ol>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html" title="Modeling ObjEntities">Modeling ObjEntities</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html" title="Modeling Inheritance">Modeling Inheritance</a></li>
+ <li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html" title="Modeling Enumerations">Modeling Enumerations</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html" title="Many-to-Many Relationships">Many-to-Many Relationships</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html" title="CayenneModeler Flattened Relationships">Flattened Relationships</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html" title="Delete Rules">Delete Rules</a></li>
@@ -70,7 +72,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Queries/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Queries/index.html
index 4d0fc1a..c630259 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Queries/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Queries/index.html
@@ -50,7 +50,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Tips/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Tips/index.html
index f1ab113..385461c 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Tips/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Tips/index.html
@@ -61,7 +61,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Converting an Existing Business Framework/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Converting an Existing Business Framework/index.html
index 8882506..dae2877 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Converting an Existing Business Framework/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Converting an Existing Business Framework/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Java Interface to an Existing Database/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Java Interface to an Existing Database/index.html
index 8f49910..3ab1d04 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Java Interface to an Existing Database/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Java Interface to an Existing Database/index.html
@@ -66,7 +66,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/New System/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/New System/index.html
index 1a344aa..2dd9566 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/New System/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/New System/index.html
@@ -66,7 +66,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/index.html
index 6215111..bc812c9 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/index.html
@@ -76,7 +76,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html
index a003b12..3d064c7 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html
@@ -62,7 +62,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html
index 15f400e..6ee1722 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html
@@ -57,7 +57,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html
index 782ee3d..36ca99b 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html
@@ -59,7 +59,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/index.html
index e56ff5b..d9a8527 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/index.html
index 4b4661c..7f3e609 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/index.html
@@ -63,7 +63,7 @@
<div style="height: 12px; background-image: url('../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Database Support/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Database Support/index.html
index 2f73231..83ffa10 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Database Support/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Database Support/index.html
@@ -320,7 +320,7 @@
</tr>
<tr>
<td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.microsoft.com/sql/default.asp" title="Visit page outside Confluence" rel="nofollow">http://www.microsoft.com/sql/default.asp<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><span class="nobr"><a href="http://www.microsoft.com/sql/technologies/jdbc/default.mspx" title="Visit page outside Confluence" rel="nofollow">http://www.microsoft.com/sql/technologies/jdbc/default.mspx<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
</tr>
<tr>
<td class='confluenceTd'>Driver Name</td>
@@ -416,7 +416,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.1 Features/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.1 Features/index.html
index 705c254..591bbe6 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.1 Features/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.1 Features/index.html
@@ -182,7 +182,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.2 Features/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.2 Features/index.html
index 29b30f0..1baff68 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.2 Features/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.2 Features/index.html
@@ -198,7 +198,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 3.0 Features/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 3.0 Features/index.html
index 7f03181..23aa14c 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 3.0 Features/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 3.0 Features/index.html
@@ -38,7 +38,7 @@
<li><a href="../../../Documentation/Overview/Guide to 1.1 Features/index.html">Guide to 1.1 Features</a></li>
</ul>
</div>
-<div id="ConfluenceContent"><p>This page summarizes the new features and changes introduced in 3.0 release, roughly corresponding to the latest released milestone. Consult RELEASE-NOTES.txt file bundled with each release for the full list of changes, fixes and improvements.</p>
+<div id="ConfluenceContent"><p>This page highlights the new features and changes introduced in 3.0 release, roughly corresponding to the latest released milestone. It is a high level overview and as such is by no means complete. Consult RELEASE-NOTES.txt file included in each release for the full list of changes.</p>
<h2><a name="Guideto3.0Features-DistributionContentsStructure"></a>Distribution Contents Structure</h2>
@@ -77,15 +77,31 @@
<p>Stopped supporting <tt>DerivedDbEntity</tt> - its functionality (aggregate queries) is achieved via EJBQL and other means.</p>
<h3><a name="Guideto3.0Features-Embeddables"></a>Embeddables</h3>
-<p><em>(as of M3 there's no Modeler support)</em></p>
+<p><em>(as of M4 there's no Modeler support)</em></p>
<p>Added a new mapping artifact - Embeddable, that allows to map composite objects to a single table. </p>
<h3><a name="Guideto3.0Features-FlattenedAttributes"></a>Flattened Attributes</h3>
-<p><em>(as of M3 there's no Modeler support)</em></p>
+<p><em>(as of M4 there's no Modeler support)</em></p>
<p>Just like with "flattened" relationships, now there is a way to map an ObjAttribute that spans one or more DbRelationships and is mapped to a column of a joined table.</p>
+<h3><a name="Guideto3.0Features-PersistingPrimitivesandaNumberofOtherSimpleProperties"></a>Persisting Primitives and a Number of Other Simple Properties</h3>
+
+<p>DataObjects are now allowed to have primitive properties, such as int, boolean, etc. Also Cayenne can now persist the following extra simple property types: java.util.Calendar, java.math.BigInteger, java.io.Serializable, char[], java.lang.Character, java.lang.Character[], java.lang.Byte[].</p>
+
+<h3><a name="Guideto3.0Features-SupportforToManyRelationshipMapsandCollections."></a>Support for To-Many Relationship Maps and Collections.</h3>
+
+<p>In addition to mapping a to-many relationship as a List, Cayenne now supports to-many Maps (keyed by target object pk, or an arbitrary unique property), Sets and generic Collections. Note that relationship maps is the only conceptually new type of relationships. Collection and Set are not that different from the earlier List behavior (that was a Collection, and just like Set ensured uniqueness of its objects).</p>
+
+<h3><a name="Guideto3.0Features-Supportfor%22extended%22EnumsMapping"></a>Support for "extended" Enums Mapping</h3>
+
+<p>In addition to vanilla Java enums, Cayenne allows enums to provide a custom database value for each enumerated instance by implementing <tt>org.apache.cayenne.ExtendedEnumeration</tt>. This way a persistent value doesn't have to be tied to the enum Java name or position.</p>
+
+<h3><a name="Guideto3.0Features-DbAttributeScaleandPrecision"></a>DbAttribute Scale and Precision</h3>
+
+<p>Changed DbAttribute "precision" property to "scale" (as it meant scale all along) and added a separate "precision" attribute to track precision.</p>
+
<h2><a name="Guideto3.0Features-CayennePersistenceAPI"></a>Cayenne Persistence API</h2>
@@ -104,24 +120,28 @@
<pre class="code-java">ObjectContext context = DataContext.createDataContext();</pre>
</div></div>
-<p>This protects your code from the actual implementation evolution, allows you to customize context behavior by using interface wrappers. There are plans to update all Cayenne API to return ObjectContext everywhere DataContext might be returned.</p>
+<p>This protects your code from the evolution of the underlying implementation, allows you to customize context behavior by using interface wrappers. There are plans to update all Cayenne API to return ObjectContext everywhere DataContext might be returned.</p>
<h3><a name="Guideto3.0Features-EJBQLQueries"></a>EJB QL Queries</h3>
<p><em>(as of M3 there's no Modeler support)</em></p>
<p>Never mind the "EJB" in the name. EJBQL queries are a powerful object query mechanism borrowed from the JPA specification and added to Cayenne API. <a href="../../../Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html" title="EJBQLQuery">EJBQLQuery</a> is a first-class citizen, just like SelectQuery.</p>
+<h3><a name="Guideto3.0Features-SQLTemplateQueryImprovements"></a>SQLTemplate Query Improvements</h3>
+
+<ul>
+ <li><a href="../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html" title="Advanced SQLTemplate">Significantly simplified</a> the process for fetching DataObjects (vs. DataRows) via a SQLTemplate query with <tt>'setColumnNamesCapitalization'</tt> method.</li>
+ <li>Added support for <a href="../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/SQLTemplate Result Mapping/index.html" title="SQLTemplate Result Mapping">fetching scalar and mixed scalar/object results</a> using <tt>SQLResultSetMapping</tt>.</li>
+</ul>
+
+
<h3><a name="Guideto3.0Features-EntityLifecycleCallbacks"></a>Entity Lifecycle Callbacks</h3>
<p>Just like EJBQL, lifecycle callbacks is a JPA-inspired feature that allows to perform custom operations at certain points in the object lifecycle. For more details see <a href="../../../Documentation/Cayenne Guide/Lifecycle Callbacks/index.html" title="Lifecycle Callbacks">this page</a>.</p>
-
<h3><a name="Guideto3.0Features-DataContextChanges"></a>DataContext Changes</h3>
-<ul>
- <li>Implemented <tt>DataContext.rollbackChangesLocally()</tt>. This was missing in 2.0, limiting the operation of the nested DataContexts.</li>
-</ul>
-
+<p>Implemented <tt>DataContext.rollbackChangesLocally()</tt>. This was missing in 2.0, limiting the operation of the nested DataContexts.</p>
<h3><a name="Guideto3.0Features-CacheManagement"></a>Cache Management</h3>
@@ -137,6 +157,7 @@
<ul>
<li>Added missing DB expressions to ExpressionFactory.</li>
+ <li>Added support for OUTER JOINS <em>(as of M4 there is no <tt>Expression.fromString()</tt> support)</em>.</li>
<li>Added support for matching against TRUE and FALSE.</li>
</ul>
@@ -162,22 +183,6 @@
-<h3><a name="Guideto3.0Features-DbAttributeScaleandPrecision"></a>DbAttribute Scale and Precision</h3>
-
-<p>Changed DbAttribute "precision" property to "scale" (as it meant scale all along) and added a separate "precision" attribute to track precision.</p>
-
-<h3><a name="Guideto3.0Features-PrimitivePropertiesinDataObjects"></a>Primitive Properties in DataObjects</h3>
-
-<p>DataObjects are now allowed to have primitive properties, such as int, boolean, etc.</p>
-
-<h3><a name="Guideto3.0Features-SupportforPersistingaNumberofExtraSimplePropertyTypes"></a>Support for Persisting a Number of Extra Simple Property Types</h3>
-
-<p>Cayenne can now persist the following extra simple property types: java.util.Calendar, java.math.BigInteger, java.io.Serializable, char[], java.lang.Character, java.lang.Character[], java.lang.Byte[].</p>
-
-<h3><a name="Guideto3.0Features-SupportforToManyRelationshipMapsandCollections."></a>Support for To-Many Relationship Maps and Collections.</h3>
-
-<p>In addition to mapping a to-many relationship as a List, Cayenne now supports to-many Maps (keyed by target object pk, or an arbitrary unique property), Sets and generic Collections. Note that relationship maps is the only conceptually new type of relationships. Collection and Set are not that different from the earlier List behavior (that was a Collection, and just like Set ensured uniqueness of its objects).</p>
-
<h2><a name="Guideto3.0Features-RemoteObjectPersistence"></a>Remote Object Persistence</h2>
@@ -186,7 +191,6 @@
-
<h2><a name="Guideto3.0Features-CayenneModeler"></a>CayenneModeler</h2>
<ul>
@@ -197,6 +201,8 @@
<li>Added lifecycle callback and listener mapping functionality.</li>
<li>Added support for merging DataMap changes back to the database.</li>
<li>Removed support for DerivedDbEntity</li>
+ <li>Added confirmation dialog for delete actions</li>
+ <li>Reopen Last Project on Startup</li>
</ul>
@@ -206,9 +212,10 @@
<h3><a name="Guideto3.0Features-ImprovedPerformance"></a>Improved Performance</h3>
<ul>
- <li>Paginated query algorithm is changed, resulting in very significant performance improvements on large data sets (this also improves ROP paginated query performance).</li>
- <li>ROP new context creation speed is improved, as EntityResolver is cached on the client after first retrieval.</li>
+ <li>Paginated query algorithm is changed, resulting in very significant performance improvements on large data sets (this also improves ROP paginated query performance). This includes faster query times and much smaller memory footprint of an unresolved list.</li>
<li>Reduced the scope of lock on a shared cache during commit, that should result in improved concurrency.</li>
+ <li>ROP new context creation speed is improved, as EntityResolver is cached on the client after first retrieval.</li>
+ <li>ROP uses a "diff compression" algorithm on commit, reducing the amount of data passed around.</li>
</ul>
@@ -241,7 +248,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/License/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/License/index.html
index 0f57ad2..009ecd9 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/License/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/License/index.html
@@ -249,7 +249,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/index.html
index fdb13de..8b322f2 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Overview/index.html
@@ -42,7 +42,7 @@
<p>Cayenne allows to reduce the development time in any database project by creating an object-oriented abstraction of the database schema. Development teams using Cayenne will be able to concentrate on the core business requirements and the data model instead of the SQL details.</p>
-<p>Cayenne features include management of persistent Java objects mapped to relational databases, single method call queries and updates (including atomic updates of all modified objects), seamless integration of multiple databases into a single virtual data source, remote object persistence, etc. Cayenne is distributed with CayenneModeler - a complete GUI mapping tool that supports reverse-engineering of RDBMS schema, editing database mappings and generation of Java source code for the persistent objects.</p>
+<p>Cayenne features include management of persistent Java objects mapped to relational databases, single method call queries and updates (including atomic updates of all modified objects), seamless integration of multiple databases into a single virtual data source, remote object persistence, etc. Cayenne is distributed with CayenneModeler - a complete GUI mapping tool that supports reverse-engineering of RDBMS schema, editing database mappings and generation of Java source code for the persistent objects. Any SQL database which provides JDBC connectivity will work with Cayenne, although for better integration we provide adapters for the <a href="../../Documentation/Overview/Database Support/index.html" title="Database Support">following DB's</a>.</p>
<p>Cayenne comes with a comprehensive set of HTML documentation and full source code, including source code for the GUI tools. Free support is provided via user mailing lists. Commercial support and consulting services are also available.</p>
@@ -64,10 +64,6 @@
</ul>
-<h2><a name="Overview-Supporteddatabases"></a>Supported databases</h2>
-
-<p>Almost any SQL database which provides JDBC connectivity will work with Cayenne. Some common choices can be seen <a href="../../Documentation/Overview/Database Support/index.html" title="Database Support">here</a>.</p>
-
<h3><a name="Overview-Sections"></a>Sections</h3>
<ol>
@@ -83,7 +79,7 @@
<div style="height: 12px; background-image: url('../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html
index 44aa3de..c17754f 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html
@@ -156,7 +156,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Client Deployment/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Client Deployment/index.html
index adbb6f2..d38b4ef 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Client Deployment/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Client Deployment/index.html
@@ -91,7 +91,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Client/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Client/index.html
index 0fdec13..fa8b300 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Client/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Client/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/Remote Object Persistence Lifecycle Callbacks/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/Remote Object Persistence Lifecycle Callbacks/index.html
index 20aee65..abfc874 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/Remote Object Persistence Lifecycle Callbacks/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/Remote Object Persistence Lifecycle Callbacks/index.html
@@ -56,7 +56,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/index.html
index e667935..73dfe49 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Coding Server/index.html
@@ -69,7 +69,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Comparison/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Comparison/index.html
index 655d572..a7cd469 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Comparison/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Comparison/index.html
@@ -58,7 +58,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Customization/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Customization/index.html
index e8d4db4..46ca864 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Customization/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Customization/index.html
@@ -55,7 +55,7 @@
<ul>
- <li>Hessian will then set the values for all fields in your custom extended type. These fields therefore need to be serializable in themselves unless they are set as volatile.</li>
+ <li>Hessian will then set the values for all fields in your custom extended type, except those set as transient. These fields therefore need to be serializable in themselves.</li>
</ul>
@@ -81,7 +81,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Features/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Features/index.html
index e18cbaf..cd82bdb 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Features/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Features/index.html
@@ -67,7 +67,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html
index b3ba881..1245f5d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html
@@ -51,17 +51,16 @@
<h3><a name="RemoteObjectPersistenceInstallation-ServerJarFiles"></a>Server Jar Files</h3>
-<p>Cayenne web service is no different from a regular Cayenne application, so it requires <b><tt>cayenne.jar</tt></b> or <b><tt>cayenne-nodeps.jar</tt></b>. One additional required third party library is <b><tt>hessian.jar</tt></b>, version 3.0.20. Hessian can be downloaded from <span class="nobr"><a href="http://www.caucho.com/hessian/" title="Visit page outside Confluence" rel="nofollow">http://www.caucho.com/hessian/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</p>
+<p>Cayenne web service is no different from a regular Cayenne application, so it requires <b><tt>cayenne-server.jar</tt></b> and all standard dependencies. One additional required third party library is <b><tt>hessian.jar</tt></b>, version 3.1.5, which is included in "lib/third-party" or can be downloaded from <span class="nobr"><a href="http://www.caucho.com/hessian/" title="Visit page outside Confluence" rel="nofollow">http://www.caucho.com/hessian/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</p>
<h3><a name="RemoteObjectPersistenceInstallation-ClientJarFiles"></a>Client Jar Files</h3>
-<p>On the client <b><tt>cayenne-client-nodeps.jar</tt></b> is needed. This is a stripped down version of Cayenne runtime. It doesn't bundle any dependencies, so the following third-party libraries need to be installed: </p>
+<p>On the client <b><tt>cayenne-client.jar</tt></b> is needed. This is a stripped down version of Cayenne runtime. The following third party dependencies are needed (all included in "lib/third-party" directory of the distribution):</p>
<ul>
<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>
- <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://www.caucho.com/hessian/" title="Visit page outside Confluence" rel="nofollow">Hessian Library<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 3.0.20.</li>
+ <li><span class="nobr"><a href="http://www.caucho.com/hessian/" title="Visit page outside Confluence" rel="nofollow">Hessian Library<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 3.1.5.</li>
</ul>
</div>
</div>
@@ -69,7 +68,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html
index 099d3b5..dfc085d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html
@@ -65,7 +65,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html
index ae519d7..bbfbcb7 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html
@@ -64,7 +64,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Authentication/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Authentication/index.html
index 13aaafd..573670f 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Authentication/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Authentication/index.html
@@ -199,7 +199,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html
index e9688b1..2dcbd14 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Code/index.html
@@ -191,7 +191,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Project/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Project/index.html
index 98ad1b9..9e205d1 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Project/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Client Project/index.html
@@ -112,7 +112,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Setup/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Setup/index.html
index bc2ac72..a0440b2 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Setup/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial Setup/index.html
@@ -97,7 +97,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial WebService/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial WebService/index.html
index 5f75c12..c51197d 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial WebService/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/Remote Object Persistence Tutorial WebService/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/index.html
index 4905343..08ae8a1 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Quick Start/index.html
@@ -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 ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Security/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Security/index.html
index 06fd624..9340357 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Security/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Security/index.html
@@ -58,7 +58,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/index.html
index 0e52c43..c2ab32a 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/index.html
@@ -66,7 +66,7 @@
<div style="height: 12px; background-image: url('../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
diff --git a/cayenne/docs/doc/src/main/resources/doc/Documentation/index.html b/cayenne/docs/doc/src/main/resources/doc/Documentation/index.html
index 8fa9627..2b2c13b 100644
--- a/cayenne/docs/doc/src/main/resources/doc/Documentation/index.html
+++ b/cayenne/docs/doc/src/main/resources/doc/Documentation/index.html
@@ -53,7 +53,7 @@
<div style="height: 12px; background-image: url('../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2007 Apache Software Foundation
+ Copyright ©2001-2008 Apache Software Foundation
</div>
</body>
