You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2010/11/14 06:53:21 UTC
svn commit: r1034935 [2/4] - in
/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne
Guide: ./ Ant Tasks/ Ant Tasks/cdataport/ Ant Tasks/cdbgen/ Ant
Tasks/cdbimport/ Ant Tasks/cgen/ Caching and Fresh Data/ Caching and Fresh
Data/In...
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Generic Persistent Class/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/DataObjects/Generic%20Persistent%20Class/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Generic Persistent Class/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Generic Persistent Class/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -78,7 +78,7 @@
<p>If you don't enter anything for Java Class of an ObjEntity, Cayenne assumes generic mapping and uses the following implicit rules to determine a class of a generic object. First it will check whether a DataMap "Custom Superclass" is set. If so, runtime uses this class to instantiate new objects. If not, <tt>org.apache.cayenne.CayenneDataObject</tt> is used.</p>
-<p><img src="custom-generic-object.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="custom-generic-object.jpg?version=1&modificationDate=1134640831000" style="border: 0px solid black" /></span></p>
<p>CayenneModeler and Ant class generators skip ObjEntities that are mapped to CayenneDataObject explicitly or have no class mapping (i.e. implicitly mapped to a generic class).</p>
@@ -149,7 +149,7 @@ SelectQuery q = <span class="code-keywor
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Handling Inheritance/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/DataObjects/Handling%20Inheritance/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Handling Inheritance/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Handling Inheritance/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -61,11 +61,11 @@
<li><a href="../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</a></li>
</ul>
</div>
-<div id="ConfluenceContent"><p>"Inheritance" is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called "single table inheritance"). Such mapping is described in detail in the <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html" title="Modeling Inheritance">Modeler Guide</a>. The idea of single table inheritance is that a "class" of a database row is determined from the values in one or more columns of the base table. These columns are called "class designator columns".</p>
+<div id="ConfluenceContent"><p>"Inheritance" is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called "single table inheritance"). Such mapping is described in detail in the <a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/Modeling Single Table Inheritance/index.html" title="Modeling Single Table Inheritance">Modeler Guide</a>. The idea of single table inheritance is that a "class" of a database row is determined from the values in one or more columns of the base table. These columns are called "class designator columns".</p>
<h3><a name="HandlingInheritance-InheritanceandnewDataObjects"></a>Inheritance and new DataObjects</h3>
<p>Consider the following class hierarchy (also used in the Modeler Guide example):<br/>
-<img src="inheritance-diagram.jpg" align="absmiddle" border="0" /></p>
+<span class="image-wrap" style=""><img src="inheritance-diagram.jpg?version=1&modificationDate=1139447348000" style="border: 0px solid black" /></span></p>
<p>If a class designator column is "PERSON_TYPE", AbstractPerson class should define an attribute (for instance called "personType") that maps to PERSON_TYPE. This attribute is redundant and meanigless in Java, since person type is defined already by the Java class of the object, however we still have to keep it around so that when the new objects are saved, correct PERSON_TYPE data is stored in the database. </p>
@@ -120,7 +120,7 @@ List employees = context.performQuery(qu
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Relationships/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/DataObjects/Relationships/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Relationships/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/Relationships/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -80,7 +80,7 @@ painting.setToArtist(newArtist);
</span><span class="code-comment">// painting.setToArtist(<span class="code-keyword">null</span>);</span>
</pre>
</div></div>
-<div class='panelMacro'><table class='infoMacro'><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><p>When adding or removing an object from any kind of relationship, Cayenne will locate and modify an existing reverse relationship as appropriate.</p></td></tr></table></div>
+<div class='panelMacro'><table class='infoMacro'><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>When adding or removing an object from any kind of relationship, Cayenne will locate and modify an existing reverse relationship as appropriate.</td></tr></table></div>
<h3><a name="Relationships-ToManyRelationships"></a>To-Many Relationships</h3>
@@ -174,7 +174,7 @@ girl.setName(<span class="code-quote">"N
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/DataObjects/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/DataObjects/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Deployment/Configuring%20Logging/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -47,7 +47,6 @@
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html">Customizing Configuration</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html">DBCPDataSourceFactory</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html">Using JNDI</a></li>
-<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html">Deployment with Ant</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html">Configuring Logging</a><ul>
</ul>
</li>
@@ -58,7 +57,7 @@
<li><a href="../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</a></li>
</ul>
</div>
-<div id="ConfluenceContent"><p>Cayenne logging is based on Jakarta Apache <a href="http://jakarta.apache.org/commons/logging/" rel="nofollow">commons-logging package</a>. Commons-logging allows users to choose their own logging provider, such as Log4J or <tt>java.util.logging</tt>. Below is an example of a <a href="http://logging.apache.org/log4j/docs/" rel="nofollow">Log4J-based</a> configuration of the most important Cayenne logger that turns on and off SQL tracing:</p>
+<div id="ConfluenceContent"><p>Cayenne logging is based on Jakarta Apache <a href="http://jakarta.apache.org/commons/logging/" class="external-link" rel="nofollow">commons-logging package</a>. Commons-logging allows users to choose their own logging provider, such as Log4J or <tt>java.util.logging</tt>. Below is an example of a <a href="http://logging.apache.org/log4j/docs/" class="external-link" rel="nofollow">Log4J-based</a> configuration of the most important Cayenne logger that turns on and off SQL tracing:</p>
<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
<pre># Turn SQL tracing on
@@ -81,7 +80,7 @@ log4j.logger.org.apache.cayenne.util = D
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Deployment/Customizing%20Configuration/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -49,7 +49,6 @@
</li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html">DBCPDataSourceFactory</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html">Using JNDI</a></li>
-<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html">Deployment with Ant</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html">Configuring Logging</a></li>
</ul>
</li>
@@ -119,7 +118,7 @@ Configuration.initializeSharedConfigurat
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Deployment/DBCPDataSourceFactory/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -49,7 +49,6 @@
</ul>
</li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html">Using JNDI</a></li>
-<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html">Deployment with Ant</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html">Configuring Logging</a></li>
</ul>
</li>
@@ -58,13 +57,13 @@
<li><a href="../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</a></li>
</ul>
</div>
-<div id="ConfluenceContent"><p>As an alternative to a simple and easy-to-use DataSource bundled with Cayenne, it is possible to configure a more feature-rich DataSource based on Apache Jakarta <a href="http://jakarta.apache.org/commons/dbcp" rel="nofollow">commons-dbcp</a>. To enable commons-dbcp pool, select <tt>DBCPDataSourceFactory</tt> in the Modeler for a DataNode:</p>
+<div id="ConfluenceContent"><p>As an alternative to a simple and easy-to-use DataSource bundled with Cayenne, it is possible to configure a more feature-rich DataSource based on Apache Jakarta <a href="http://jakarta.apache.org/commons/dbcp" class="external-link" rel="nofollow">commons-dbcp</a>. To enable commons-dbcp pool, select <tt>DBCPDataSourceFactory</tt> in the Modeler for a DataNode:</p>
-<p><img src="dbcp-step1.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="dbcp-step1.jpg?version=1&modificationDate=1158521459000" style="border: 0px solid black" /></span></p>
<p>Configuration is done in a properties file that has to be edited in a text editor outside CayenneModeler. The name of this file is specified in the Modeler (with path relative to cayenne.xml location):</p>
-<p><img src="dbcp-step2.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="dbcp-step2.jpg?version=1&modificationDate=1158521459000" style="border: 0px solid black" /></span></p>
<p>Here is an example of such properties file contents:</p>
@@ -85,6 +84,7 @@ cayenne.dbcp.maxWait=10000</pre>
<h3><a name="DBCPDataSourceFactory-DataSourceProperties"></a>DataSource Properties</h3>
+<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'>Property</th>
@@ -107,9 +107,12 @@ cayenne.dbcp.maxWait=10000</pre>
<td class='confluenceTd'>Database login password</td>
</tr>
</tbody></table>
+</div>
+
<h3><a name="DBCPDataSourceFactory-ConnectionPoolProperties"></a>Connection Pool Properties</h3>
+<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'>Property</th>
@@ -184,9 +187,12 @@ cayenne.dbcp.maxWait=10000</pre>
<td class='confluenceTd'>Default catalog of connections created by the pool</td>
</tr>
</tbody></table>
+</div>
+
<h3><a name="DBCPDataSourceFactory-PreparedStatementPoolProperties"></a>PreparedStatement Pool Properties</h3>
+<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'>Property</th>
@@ -240,13 +246,15 @@ cayenne.dbcp.maxWait=10000</pre>
<td class='confluenceTd'> cayenne.dbcp.ps.whenExhaustedAction</td>
<td class='confluenceTd'>Specifies a pool behavior when the pool is exhausted and more PreparedStatements are requested. Possible values are strings that follow the constant names defined in <tt>org.apache.commons.pool.impl.GenericObjectPool}: {{WHEN_EXHAUSTED_BLOCK</tt>, <tt>WHEN_EXHAUSTED_GROW</tt>, <tt>WHEN_EXHAUSTED_FAIL</tt>. If ommitted, <tt>WHEN_EXHAUSTED_BLOCK</tt> is assumed.</td>
</tr>
-</tbody></table></div>
+</tbody></table>
+</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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Standalone Applications/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Deployment/Standalone%20Applications/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Standalone Applications/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Standalone Applications/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -49,7 +49,6 @@
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html">Customizing Configuration</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html">DBCPDataSourceFactory</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html">Using JNDI</a></li>
-<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html">Deployment with Ant</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html">Configuring Logging</a></li>
</ul>
</li>
@@ -98,7 +97,7 @@ DataContext.bindThreadDataContext(contex
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Using JNDI/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Deployment/Using%20JNDI/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Using JNDI/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Using JNDI/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -49,7 +49,6 @@
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html">Using JNDI</a><ul>
</ul>
</li>
-<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html">Deployment with Ant</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html">Configuring Logging</a></li>
</ul>
</li>
@@ -61,38 +60,41 @@
<div id="ConfluenceContent"><p>Cayenne can be setup to obtain a DataSource via JNDI, instead of using its own connection pool. To do that Cayenne DataNodes must be configured to use <tt>JNDIDataSourceFactory</tt>. This can be done in the modeler as shown on the pictures below.</p>
<p>1. Select JNDIDataSourceFactory:<br/>
-<img src="jndi-step1.jpg" align="absmiddle" border="0" /></p>
+<span class="image-wrap" style=""><img src="jndi-step1.jpg?version=1&modificationDate=1144230656000" style="border: 0px solid black" /></span></p>
<p>2. Enter DataSource JNDI Name:<br/>
-<img src="jndi-step2.jpg" align="absmiddle" border="0" /></p>
+<span class="image-wrap" style=""><img src="jndi-step2.jpg?version=1&modificationDate=1144230667000" style="border: 0px solid black" /></span></p>
<h3><a name="UsingJNDI-DevelopmentwithJNDIDataNodes"></a>Development with JNDI DataNodes</h3>
<p>To be able to connect to the database from CayenneModeler when JNDIDataSourceFactory is specified (and thus no explicit connection information is associated with the DataNode), you may configure a "local DataSource" (see a corresponding <a href="../../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html" title="Local DataSources">Modeler Guide chapter</a>).</p>
-<p>Cayenne also supports container-less runtime operation of the JNDI node. It works like this:</p>
-
-<ul>
- <li>JNDIDataSourceFactory attempts to locate a DataSource via a default JNDI provider.</li>
- <li>If the DataSource is not found, JNDIDataSourceFactory attempts to read local user preferences database, looking for a local DataSource matching the JNDI name.</li>
- <li>If such DataSource is found, it is used in the application as if it was obtained via JNDI.</li>
-</ul>
+<p>In runtime, a property-based mechanism to override Modeler DataSource definitions is used (actually the overrides take precedence of whether the DataSource is JNDI, DBCP, driver, etc). A quick configuration example is shown below:</p>
+<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
+<pre>-Dcayenne.jdbc.driver=com.mysql.jdbc.Driver -Dcayenne.jdbc.url=jdbc:mysql://localhost/mydb \
+-Dcayenne.jdbc.username=user -Dcayenne.jdbc.password=password</pre>
+</div></div>
-<p>This way Modeler preferences database works as a substitute of a JNDI provider, saving extra configuration steps in development mode, when an application may be run from the IDE. Requirements to use this feature:</p>
+<p>For more details and configuration options see javadocs of <tt>org.apache.cayenne.configuration.server.PropertyDataSourceFactory</tt>. </p>
-<ul>
- <li>The name of the local DataSource in the Modeler preferences must match the JNDI name of the DataNode.</li>
- <li><tt>cayenne-modeler.jar</tt> and <tt>hsqldb-x.x.x.jar</tt> must be in the application runtime CLASSPATH.</li>
-</ul>
+<h3><a name="UsingJNDI-DeploymentinContainer"></a>Deployment in Container</h3>
+<p>A JNDI DataSource is mapped in a servlet container / application server as appropriate for a given container. Below is a Tomcat 5.5 example, which is an XML snippet normally placed in <tt>$CATALINA_HOME/conf/server.xml</tt> file between the <tt><Host>...</Host></tt> tags:</p>
-<h3><a name="UsingJNDI-DeploymentinContainer"></a>Deployment in Container</h3>
+<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
+<pre><Context path="/myapp" docBase="myapp">
+ <Resource name="jdbc/myds" auth="Container"
+ type="javax.sql.DataSource" driverClassName="oracle.jdbc.driver.OracleDriver"
+ url="jdbc:oracle:thin:@127.0.0.1:1521:dbname"
+ username="userName" password="secret" maxActive="5" maxIdle="2"/>
+</Context></pre>
+</div></div>
-<p>Depending on how the DataSource is mapped in the container, you may optionally need to add a "resource-ref" entry to the <tt>web.xml</tt> file:</p>
+<p>Depending on how the DataSource is mapped in a container, you may optionally need to add a "resource-ref" entry to the <tt>web.xml</tt> file:</p>
<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
<pre><resource-ref>
@@ -102,27 +104,14 @@
</resource-ref></pre>
</div></div>
-<p>Below are sample DataSource configurations for Tomcat 5.5 and newer. The XML should be pasted into <tt>$CATALINA_HOME/conf/server.xml</tt> file between the <tt><Host>...</Host></tt> tags. Of course the application name and database parameters should be replaced with the correct values for the target environment. </p>
-
-
-<h4><a name="UsingJNDI-Tomcat5.5Configuration"></a>Tomcat 5.5 Configuration</h4>
-
-<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
-<pre><Context path="/myapp" docBase="myapp">
- <Resource name="jdbc/myds" auth="Container"
- type="javax.sql.DataSource" driverClassName="oracle.jdbc.driver.OracleDriver"
- url="jdbc:oracle:thin:@127.0.0.1:1521:dbname"
- username="userName" password="secret" maxActive="5" maxIdle="2"/>
-</Context></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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Web Applications/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Deployment/Web%20Applications/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Web Applications/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/Web Applications/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -49,7 +49,6 @@
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html">Customizing Configuration</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html">DBCPDataSourceFactory</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html">Using JNDI</a></li>
-<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html">Deployment with Ant</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html">Configuring Logging</a></li>
</ul>
</li>
@@ -85,7 +84,7 @@ DataContext context = ServletUtil.getSes
</pre>
</div></div>
-<p>The filter will ensure that for each matching request a ObjectContext (which is actually a DataContext instance) is bound to the request thread. So you can retrieve it anywhere in the application, even if you don't have a reference to the web environment:</p>
+<p>The filter will ensure that for each matching request a ObjectContext (which is actually a DataContext instance) is bound to the request thread. Context itself is session-scoped. So you can retrieve it anywhere in the application, even if you don't have a reference to the web environment:</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
<pre class="code-java">ObjectContext context = BaseContext.getThreadObjectContext();</pre>
@@ -110,7 +109,6 @@ DataContext context = ServletUtil.getSes
</filter-mapping></pre>
</div></div>
-
<p>Additionally the filter supports putting files in <tt>myapp/WEB-INF/</tt> directory instead of the CLASSPATH, so a .war file may look like this:</p>
<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
@@ -127,13 +125,18 @@ WEB-INF/lib/...</pre>
<param-name>cayenne.configuration.path</param-name>
<param-value>/WEB-INF/config/cayenne-files</param-value>
</context-param></pre>
-</div></div></div>
+</div></div>
+
+<h3><a name="WebApplications-ObjectContextScope"></a>ObjectContext Scope</h3>
+
+<p>ServletUtil and WebApplicationContextFilter would both provide an ObjectContext shared between the requests in the same user session (session-scoped context). This is the default behavior. However, depending on the application needs, you may choose to use application-scoped context (usually for read-only parts of the application, and combined with caching), or per-request context (to avoid race conditions on long-running operations). In those cases you won't be able to use ServletUtil and WebApplicationContextFilter, but you can easily write your own correctly scoped replacements, or set it up via an IoC container, such as Spring.</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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Deployment/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Deployment/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -47,7 +47,6 @@
<li><a href="../../../Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html">Customizing Configuration</a></li>
<li><a href="../../../Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html">DBCPDataSourceFactory</a></li>
<li><a href="../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html">Using JNDI</a></li>
-<li><a href="../../../Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html">Deployment with Ant</a></li>
<li><a href="../../../Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html">Configuring Logging</a></li>
</ul>
</li>
@@ -60,7 +59,7 @@
<p>Cayenne application deployment is about configuring the application so that at runtime it can find a main project file (cayenne.xml) and associated resources, such as DataMap and DataNode XML files.</p>
-<p>The central point in Cayenne deployment is the <a href="http://incubator.apache.org/cayenne/2_0/api/cayenne/org/apache/cayenne/conf/Configuration.html" rel="nofollow">Configuration</a> class. It locates and loads all the mapping and configuration information required for Cayenne at runtime. By default Configuration uses a singleton model, i.e. normally there is only one instance of Configuration (or a subclass) that exists in the application. This shared instance can be accessed in the following way:</p>
+<p>The central point in Cayenne deployment is the <a href="http://incubator.apache.org/cayenne/2_0/api/cayenne/org/apache/cayenne/conf/Configuration.html" class="external-link" rel="nofollow">Configuration</a> class. It locates and loads all the mapping and configuration information required for Cayenne at runtime. By default Configuration uses a singleton model, i.e. normally there is only one instance of Configuration (or a subclass) that exists in the application. This shared instance can be accessed in the following way:</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
<pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.conf.Configuration;
<span class="code-keyword">import</span> org.apache.cayenne.access.DataDomain;
@@ -79,7 +78,6 @@ DataDomain domain = conf.getDomain();
<li><a href="../../../Documentation/Cayenne Guide/Deployment/Customizing Configuration/index.html" title="Customizing Configuration">Customizing Configuration</a></li>
<li><a href="../../../Documentation/Cayenne Guide/Deployment/DBCPDataSourceFactory/index.html" title="DBCPDataSourceFactory">DBCPDataSourceFactory</a></li>
<li><a href="../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html" title="Using JNDI">Using JNDI</a></li>
- <li><a href="../../../Documentation/Cayenne Guide/Deployment/Deployment with Ant/index.html" title="Deployment with Ant">Deployment with Ant</a></li>
<li><a href="../../../Documentation/Cayenne Guide/Deployment/Configuring Logging/index.html" title="Configuring Logging">Configuring Logging</a></li>
</ol>
@@ -89,7 +87,7 @@ DataDomain domain = conf.getDomain();
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Cayenne Contract/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Cayenne%20Contract/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Cayenne Contract/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Cayenne Contract/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a><ul>
</ul>
@@ -159,7 +159,7 @@ assertFalse(b1.getListOfA().contains(a1)
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Persistent%20Object%20Lifecycle/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a><ul>
@@ -61,14 +61,15 @@
<table class="sectionMacro" border="0" cellpadding="5" cellspacing="0" width="100%"><tbody><tr>
<td class="confluenceTd" valign="top">
<p>A new object state transformations:<br/>
-<img src="new-persistent-object.png" align="absmiddle" border="0" /></p></td>
+<span class="image-wrap" style=""><img src="new-persistent-object.png?version=1&modificationDate=1152473164000" style="border: 0px solid black" /></span></p></td>
<td class="confluenceTd" valign="top">
<p>A fetched or committed object state transformations:<br/>
-<img src="fetched-persistent-object.png" align="absmiddle" border="0" /></p></td></tr></tbody></table>
+<span class="image-wrap" style=""><img src="fetched-persistent-object.png?version=1&modificationDate=1152473164000" style="border: 0px solid black" /></span></p></td></tr></tbody></table>
<p>The states are defined as follows:</p>
+<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'>State</th>
@@ -105,13 +106,15 @@
<td class='confluenceTd'>6</td>
<td class='confluenceTd'>The object is registered in a <tt>DataContext</tt> and will be deleted from the database upon commit.</td>
</tr>
-</tbody></table></div>
+</tbody></table>
+</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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/Generated Columns/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Primary%20Key%20Generation/Generated%20Columns/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/Generated Columns/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/Generated Columns/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -86,7 +86,7 @@ adapter.setSupportsGeneratedKeys(<span c
</ul>
-<p><img src="select_db_key1.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="select_db_key1.jpg?version=1&modificationDate=1133439775000" style="border: 0px solid black" /></span></p>
<ul>
@@ -94,7 +94,7 @@ adapter.setSupportsGeneratedKeys(<span c
</ul>
-<p><img src="select_db_key2.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="select_db_key2.jpg?version=1&modificationDate=1133439788000" style="border: 0px solid black" /></span></p>
<h2><a name="GeneratedColumns-HintsandLimitations"></a>Hints and Limitations</h2>
@@ -106,14 +106,13 @@ adapter.setSupportsGeneratedKeys(<span c
</ul>
-<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>MS SQLServer Note</b><br /><br/>
-MS drivers prior to 2005 version do not support generated columns, while newer drivers and <a href="http://jtds.sourceforge.net" rel="nofollow">jTDS</a> support it just fine. Cayenne can automatically detect the driver type and configure SQLServerAdapter, but only when AutoAdapter is used. To make sure auto-detection works, clear the "Custom Adapter" field for the corresponding DataNode in the Modeler.</td></tr></table></div></div>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>MS SQLServer Note</b><br />MS drivers prior to 2005 version do not support generated columns, while newer drivers and <a href="http://jtds.sourceforge.net" class="external-link" rel="nofollow">jTDS</a> support it just fine. Cayenne can automatically detect the driver type and configure SQLServerAdapter, but only when AutoAdapter is used. To make sure auto-detection works, clear the "Custom Adapter" field for the corresponding DataNode in the Modeler.</td></tr></table></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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Primary%20Key%20Generation/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Primary Key Generation/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -59,6 +59,7 @@
</div>
<div id="ConfluenceContent"><h2><a name="PrimaryKeyGeneration-PrimaryKeyGeneration"></a>Primary Key Generation</h2>
<p>Depending on the type of persistent objects and the database design, primary key values can be handled in a few different ways. A decision to use one or another technique will affect how the mapping is done. Here is a summary of possible scenarios. Each one is described below in details.</p>
+<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'> </th>
@@ -91,6 +92,8 @@
<td class='confluenceTd'>No</td>
</tr>
</tbody></table>
+</div>
+
<h3><a name="PrimaryKeyGeneration-MeaningfulPrimaryKey"></a>Meaningful Primary Key</h3>
@@ -103,7 +106,7 @@
<h3><a name="PrimaryKeyGeneration-PrimaryKeyProvidedbyDatabaseonINSERT"></a>Primary Key Provided by Database on INSERT</h3>
<p>Sometimes databases have their own proprietary mechanism to generate a primary key when a new row is inserted. This feature is called "auto increment" or "identity column". Cayenne supports such primary keys out of the box. For this mechanism to be invoked, the DbEntity primary key generation must be marked as "Database-Generated" in the Modeler. Currently MySQL and SQLServer adapters have this feature turned on by default.<br/>
-<img src="Picture 1.png" align="absmiddle" border="0" /></p>
+<span class="image-wrap" style=""><img src="Picture+1.png?version=1&modificationDate=1249017293000" style="border: 0px solid black" /></span></p>
<h3><a name="PrimaryKeyGeneration-CayenneGeneratedPrimaryKey"></a>Cayenne Generated Primary Key</h3>
@@ -135,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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataChannel/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Runtime%20Components/DataChannel/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataChannel/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataChannel/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataNode/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Runtime%20Components/DataNode/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataNode/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataNode/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataSource/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Runtime%20Components/DataSource/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataSource/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DataSource/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -67,14 +67,14 @@
</div>
<div id="ConfluenceContent"><p><a href="../../../../../Documentation/Cayenne Guide/Design/Runtime Components/DataNode/index.html" title="DataNode">DataNode</a> obtains connections via a <tt>javax.sql.DataSource</tt>. If an application is deployed in a J2EE container, DataSource is normally provided by container <a href="../../../../../Documentation/Cayenne Guide/Deployment/Using JNDI/index.html" title="Using JNDI">via JNDI</a>. For standalone applications (or if you don't want to use JNDI) Cayenne provides its own DataSource that includes connection pooling features. Whenever you select <tt>org.apache.cayenne.conf.DriverDataSourceFactory</tt> in the Modeler, you are choosing to use Cayenne DataSource. </p>
-<p>Cayenne DataSource implementation is located in the <tt>org.apache.cayenne.conn</tt> package and is fully independent from the rest of the framework. Since Cayenne DataSource is chosen automatically, users rarely need to know more details. One notable exception are applications requiring users to interactively <a href="http://cwiki.apache.org/CAY/setting-database-connection.html" rel="nofollow">enter database login information</a>. In this case you can write your own DataSource wrapper, and internally instantiate Cayenne DataSource (<tt>org.apache.cayenne.conn.PoolManager</tt>) after the user provides login and password.</p>
+<p>Cayenne DataSource implementation is located in the <tt>org.apache.cayenne.conn</tt> package and is fully independent from the rest of the framework. Since Cayenne DataSource is chosen automatically, users rarely need to know more details. One notable exception are applications requiring users to interactively <a href="http://cwiki.apache.org/CAY/setting-database-connection.html" class="external-link" rel="nofollow">enter database login information</a>. In this case you can write your own DataSource wrapper, and internally instantiate Cayenne DataSource (<tt>org.apache.cayenne.conn.PoolManager</tt>) after the user provides login and password.</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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Runtime%20Components/DbAdapter/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/EntityResolver/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Runtime%20Components/EntityResolver/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/EntityResolver/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/EntityResolver/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/Event Package/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Runtime%20Components/Event%20Package/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/Event Package/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/Event Package/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/ObjectContext/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Runtime%20Components/ObjectContext/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/ObjectContext/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/ObjectContext/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Runtime%20Components/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Runtime Components/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -66,7 +66,7 @@
<div id="ConfluenceContent"><h2><a name="RuntimeComponents-RuntimeComponents"></a>Runtime Components</h2>
<p>Cayenne runtime framework is an intermediary between a Java application and a relational database. The picture below shows the main components of the framework:</p>
-<p><img src="cayenne-runtime.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="cayenne-runtime.png?version=1&modificationDate=1152316624000" style="border: 0px solid black" /></span></p>
<h3><a name="RuntimeComponents-VerticalStructureCayennePersistenceStack"></a>Vertical Structure - Cayenne Persistence Stack</h3>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/Understanding%20Transactions/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/Understanding Transactions/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -58,7 +58,7 @@
</div>
<div id="ConfluenceContent"><p>Cayenne has its own simple transaction API centered around <tt>org.apache.cayenne.access.Transaction</tt> class. Its goal is to ensure consistency of the DataContext database operations. It works either as a standalone mechanism, or in conjunction with another transaction framework, such as JTA or Spring. To switch between the two modes of operation, use "Container-Managed Transactions" checkbox in the DataDomain editing panel in CayenneModeler:</p>
-<p><img src="transactions-types.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="transactions-types.png?version=1&modificationDate=1153828064000" style="border: 0px solid black" /></span></p>
<p>If this box is unchecked (default), standalone mode is used and Cayenne will take care of transactional resources management on its own. If it is checked, Cayenne won't commit or rollback transactional resources, relying on the external transaction manager to do that.</p>
@@ -197,7 +197,7 @@ Transaction tx = domain.createTransactio
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Design/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Design/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</a></li>
<li><a href="../../../Documentation/Cayenne Guide/Design/index.html">Design</a><ul>
<li><a href="../../../Documentation/Cayenne Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../Documentation/Cayenne Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
@@ -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-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/BNF%20for%20ExpressionParser/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/BNF for ExpressionParser/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -109,7 +109,7 @@ pathExpression ::= ( <PROPERTY_PATH
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Expressions/Building%20Expressions/index.html?rev=1034935&r1=1034934&r2=1034935&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Expressions/Building Expressions/index.html Sun Nov 14 05:53:19 2010
@@ -31,7 +31,7 @@
<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/Tutorial/index.html">Tutorial</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></li>
@@ -57,7 +57,7 @@
<li><a href="../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</a></li>
</ul>
</div>
-<div id="ConfluenceContent"><p>The Expression class (<tt>org.apache.cayenne.exp.Expression</tt>) provides <tt>Expression.fromString(String)</tt> as a convenience method to create expressions of arbitrary complexity. The structure of expressions is fairly intuitive, with the <a href="http://incubator.apache.org/cayenne/1_2/grammar/ExpressionParser.html" rel="nofollow">formal grammar</a> showing the formal syntax and operators currently supported, but this topic is devoted to showing examples of usage. To demonstrate, an expression that matches Paintings with names that start with "A" and a price less than $1000.00 can be written as:</p>
+<div id="ConfluenceContent"><p>The Expression class (<tt>org.apache.cayenne.exp.Expression</tt>) provides <tt>Expression.fromString(String)</tt> as a convenience method to create expressions of arbitrary complexity. The structure of expressions is fairly intuitive, with the <a href="/confluence/pages/createpage.action?spaceKey=CAYDOC&title=ExpressionParser&linkCreation=true&fromPageId=10551" class="createlink">formal grammar</a> showing the formal syntax and operators currently supported, but this topic is devoted to showing examples of usage. To demonstrate, an expression that matches Paintings with names that start with "A" and a price less than $1000.00 can be written as:</p>
<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
<pre class="code-java">Expression e = Expression.fromString(<span class="code-quote">"paintingTitle like 'A%' and estimatedPrice < 1000"</span>);
@@ -196,6 +196,10 @@ values = dataContext.performQuery(query)
</pre>
</div></div>
+<h3><a name="BuildingExpressions-Typematchingwithexpressionpaths"></a>Type matching with expression paths</h3>
+
+<p>It is important to note that Cayenne will not perform any type conversion across between the expression path and the parameter. So <tt>artist.artistName</tt> can only be matched against a <tt>String</tt>, and <tt>painting.artist</tt> - against instances of <tt>Artist</tt>.</p>
+
<h3><a name="BuildingExpressions-OptionalNamedParameterValues"></a>Optional Named Parameter Values</h3>
<p>Cayenne by default automatically omits parts of an expression which have no matching value. Using the expression from above:</p>
@@ -219,7 +223,7 @@ values = dataContext.performQuery(query)
<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
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>