You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/07/14 22:21:16 UTC
svn commit: r422017 - in
/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation:
Modeler Guide/Introduction to CayenneModeler/General Navigation/ User
Guide/DataContext/DataObject State Management/ User
Guide/DataObjects/DataObject...
Author: aadamchik
Date: Fri Jul 14 13:21:14 2006
New Revision: 422017
URL: http://svn.apache.org/viewvc?rev=422017&view=rev
Log:
fixing a few more docs inconsistencies
Added:
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/toolbar-main.jpg (with props)
Removed:
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-attribute.gif
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-relationship.gif
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/toolbar.jpg
Modified:
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-dbentity.gif
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-derived-dbentity.gif
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-dom.gif
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-new.gif
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-objentity.gif
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-stored-procedure.gif
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataObject State Management/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjects Example/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Generic Persistent Class/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Cayenne Contract/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Object Caching/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Persistent Object Lifecycle/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Primary Key Generation/Generated Columns/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Primary Key Generation/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataChannel/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataNode/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataSource/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DbAdapter/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/EntityResolver/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/Event Package/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/ObjectContext/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Understanding Transactions/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/index.html
incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Expressions/Building Expressions/index.html
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-dbentity.gif
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/icon-dbentity.gif?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-derived-dbentity.gif
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/icon-derived-dbentity.gif?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-dom.gif
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/icon-dom.gif?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-new.gif
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/icon-new.gif?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-objentity.gif
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/icon-objentity.gif?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/icon-stored-procedure.gif
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/icon-stored-procedure.gif?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html Fri Jul 14 13:21:14 2006
@@ -36,9 +36,11 @@
<p>CayenneModeler supports executing commands via its main menu and a button toolbar. Currently Modeler DOES NOT support contextual menus that open on right-click. All of the toolbar buttons have corresponding items in the menu that perform exact same operation (plus there are operations that are available via the menu only). If an item or a button action can not be performed in a given context an item is visually disabled.</p>
-<h4><a name="GeneralNavigation-Toolbar"></a>Toolbar</h4>
+<h4><a name="GeneralNavigation-Toolbars"></a>Toolbars</h4>
-<p><img src="toolbar.jpg" align="absmiddle" border="0" /> </p>
+<p>There is a main toolbar shown below, and a number of object-specific toolbars.</p>
+
+<p><img src="toolbar-main.jpg" align="absmiddle" border="0" /></p>
<p>The following is a quick reference of the toolbar button functions.</p>
@@ -72,21 +74,9 @@
<p>There is a special kind of DbEntity - DerivedDbEntity - that has limited capabilities of defining "virtual" database views. </p>
-<h5><a name="GeneralNavigation-Attributes%3A%21iconattribute.gif%21"></a>Attributes: <img src="icon-attribute.gif" align="absmiddle" border="0" /></h5>
-
-<p>Attributes define simple data fields. ObjAttributes are descriptors for Java class persistent properties, DbAttributes are descriptors for table or view columns. ObjAttributes map to DbAttributes. </p>
-
-<h5><a name="GeneralNavigation-Relationships%3A%21iconrelationship.gif%21"></a>Relationships: <img src="icon-relationship.gif" align="absmiddle" border="0" /></h5>
-
-<p>Relationships define how different entities relate to each other. ObjRelationships describe an association between two persistent Java classes (e.g. "Artist object has one or more Painting objects"), DbRelationships model the same concept in the database world (Primary Key - Foreign Key association). ObjRelationship consists of one or more DbRelationships. </p>
-
<h5><a name="GeneralNavigation-Procedures%3A%21iconstoredprocedure.gif%21"></a>Procedures: <img src="icon-stored-procedure.gif" align="absmiddle" border="0" /></h5>
<p>Procedure is a decriptor of a database stored procedure. It can be created in the modeler and later invoked using ProcedureQuery. Note that not all databases support stored procedures. </p>
-
-<h5><a name="GeneralNavigation-ProcedureParameters%3A%21iconattribute.gif%21"></a>ProcedureParameters: <img src="icon-attribute.gif" align="absmiddle" border="0" /></h5>
-
-<p>ProcedureParameters (though they use the same icon as entity attributes) define positional parameters used to call stored procedures. After ProcedureParameter is assigned to a Procedure in a particular position, it can later be referred by name in ProcedureQuery. ProcedureParameters are directional and can be IN, OUT, IN_OUT. </p>
<h5><a name="GeneralNavigation-Query%3A%21iconquery.gif%21"></a>Query: <img src="icon-query.gif" align="absmiddle" border="0" /></h5>
Added: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/toolbar-main.jpg
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/toolbar-main.jpg?rev=422017&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/toolbar-main.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataObject State Management/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/DataObject%20State%20Management/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataObject State Management/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/DataObject State Management/index.html Fri Jul 14 13:21:14 2006
@@ -71,7 +71,7 @@
...
DataContext context; <span class="code-comment">// assume <span class="code-keyword">this</span> exists
</span>
-Artist artist = (Artist) context.createAndRegisterNewObject(Artist.class);</pre>
+Artist artist = (Artist) context.newObject(Artist.class);</pre>
</div></div>
<p>This method relies on the presence of a no-argument constructor in the DataObject class.</p>
@@ -88,7 +88,7 @@
DataContext context; <span class="code-comment">// assume <span class="code-keyword">this</span> exists
</span>
<span class="code-comment">// artist will become PersistenceState.NEW
-</span>Artist artist = (Artist) context.createAndRegisterNewObject(Artist.class);</pre>
+</span>Artist artist = (Artist) context.newObject(Artist.class);</pre>
</div></div>
<p>When a DataContext is committed, such object becomes "COMMITTED":</p>
@@ -140,7 +140,7 @@
<p>Method commitChanges takes care of building correct SQL statements, generating primary keys and transactional behaviour. It roughly follows this scenario:</p>
<ul>
- <li>Checks if there are any changed objects (also detecting "phantom" modifications, e.g. if an object property was "udapted" with the equivalent value).</li>
+ <li>Checks if there are any changed objects (also detecting "phantom" modifications, e.g. if an object property was "updated" with the equivalent value).</li>
<li>Validates "dirty" objects (for more information on validation see <a href="../../../../Documentation/User Guide/DataObjects/DataObject Validation/index.html" title="DataObject Validation">this page</a>).</li>
<li>Generates primary keys for any NEW objects that require autogenerated key.</li>
<li>Builds any needed INSERT, UPDATE, DELETE queries.</li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjects Example/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/DataObjects%20Example/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjects Example/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/DataObjects Example/index.html Fri Jul 14 13:21:14 2006
@@ -70,7 +70,7 @@
<span class="code-comment">// create <span class="code-keyword">new</span> painting and register it with DataContext
</span> <span class="code-comment">// <span class="code-quote">"Painting"</span> string is a name of ObjEntity in the DataMap
-</span> Painting newPainting = (Painting)ctxt.createAndRegisterNewObject(Painting.class);
+</span> Painting newPainting = (Painting)ctxt.newObject(Painting.class);
newPainting.setPaintingTitle(<span class="code-quote">"Sunset as it is"</span>);
<span class="code-comment">// price it as unreasonable as other paintings
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Generic Persistent Class/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/Generic%20Persistent%20Class/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Generic Persistent Class/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/Generic Persistent Class/index.html Fri Jul 14 13:21:14 2006
@@ -74,7 +74,7 @@
<p>Create a new object:</p>
<div class="code"><div class="codeContent">
-<pre class="code-java">DataObject author = context.createAndRegisterNewObject(<span class="code-quote">"Person"</span>);</pre>
+<pre class="code-java">DataObject author = context.newObject(<span class="code-quote">"Person"</span>);</pre>
</div></div>
<p>Build SelectQuery:</p>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Cayenne Contract/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Cayenne%20Contract/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Cayenne Contract/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Cayenne Contract/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a><ul>
</ul>
</li>
@@ -23,6 +22,7 @@
<li><a href="../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Object Caching/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Object%20Caching/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Object Caching/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Object Caching/index.html Fri Jul 14 13:21:14 2006
@@ -15,14 +15,14 @@
<li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a><ul>
-</ul>
-</li>
<li><a href="../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a><ul>
+</ul>
+</li>
</ul>
</li>
<li><a href="../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Persistent Object Lifecycle/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Persistent%20Object%20Lifecycle/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Persistent Object Lifecycle/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Persistent Object Lifecycle/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a><ul>
</ul>
@@ -23,6 +22,7 @@
<li><a href="../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Primary Key Generation/Generated Columns/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Primary%20Key%20Generation/Generated%20Columns/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Primary Key Generation/Generated Columns/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Primary Key Generation/Generated Columns/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a></li>
@@ -26,6 +25,7 @@
</li>
</ul>
</li>
+<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Primary Key Generation/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Primary%20Key%20Generation/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Primary Key Generation/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Primary Key Generation/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a></li>
@@ -24,6 +23,7 @@
<li><a href="../../../../Documentation/User Guide/Design/Primary Key Generation/Generated Columns/index.html">Generated Columns</a></li>
</ul>
</li>
+<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataChannel/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Runtime%20Components/DataChannel/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataChannel/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataChannel/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a><ul>
@@ -32,6 +31,7 @@
</li>
<li><a href="../../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataNode/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Runtime%20Components/DataNode/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataNode/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataNode/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a><ul>
@@ -32,6 +31,7 @@
</li>
<li><a href="../../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataSource/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Runtime%20Components/DataSource/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataSource/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DataSource/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a><ul>
@@ -32,6 +31,7 @@
</li>
<li><a href="../../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DbAdapter/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Runtime%20Components/DbAdapter/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DbAdapter/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/DbAdapter/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a><ul>
@@ -32,6 +31,7 @@
</li>
<li><a href="../../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/EntityResolver/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Runtime%20Components/EntityResolver/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/EntityResolver/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/EntityResolver/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a><ul>
@@ -32,6 +31,7 @@
</li>
<li><a href="../../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/Event Package/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Runtime%20Components/Event%20Package/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/Event Package/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/Event Package/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a><ul>
@@ -32,6 +31,7 @@
</li>
<li><a href="../../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/ObjectContext/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Runtime%20Components/ObjectContext/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/ObjectContext/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/ObjectContext/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a><ul>
@@ -32,6 +31,7 @@
</li>
<li><a href="../../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Runtime%20Components/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Runtime Components/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a><ul>
@@ -30,6 +29,7 @@
</li>
<li><a href="../../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Understanding Transactions/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/Understanding%20Transactions/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Understanding Transactions/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/Understanding Transactions/index.html Fri Jul 14 13:21:14 2006
@@ -15,7 +15,6 @@
<li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a></li>
@@ -23,6 +22,7 @@
</ul>
</li>
<li><a href="../../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Design/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Design/index.html Fri Jul 14 13:21:14 2006
@@ -15,12 +15,12 @@
<li><a href="../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
<li><a href="../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
<li><a href="../../../Documentation/User Guide/Design/index.html">Design</a><ul>
-<li><a href="../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
<li><a href="../../../Documentation/User Guide/Design/Cayenne Contract/index.html">Cayenne Contract</a></li>
<li><a href="../../../Documentation/User Guide/Design/Persistent Object Lifecycle/index.html">Persistent Object Lifecycle</a></li>
<li><a href="../../../Documentation/User Guide/Design/Runtime Components/index.html">Runtime Components</a></li>
<li><a href="../../../Documentation/User Guide/Design/Understanding Transactions/index.html">Understanding Transactions</a></li>
<li><a href="../../../Documentation/User Guide/Design/Primary Key Generation/index.html">Primary Key Generation</a></li>
+<li><a href="../../../Documentation/User Guide/Design/Object Caching/index.html">Object Caching</a></li>
</ul>
</li>
<li><a href="../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Expressions/Building Expressions/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Expressions/Building%20Expressions/index.html?rev=422017&r1=422016&r2=422017&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Expressions/Building Expressions/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Expressions/Building Expressions/index.html Fri Jul 14 13:21:14 2006
@@ -36,7 +36,7 @@
<li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
</ul>
</div>
-<div id="ConfluenceContent"><p>The Expression class (<tt>org.objectstyle.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 <span class="nobr"><a href="http://www.objectstyle.org/cayenne/grammar/ExpressionParser.html" title="Visit page outside Confluence" rel="nofollow">formal grammar<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> 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.objectstyle.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 <span class="nobr"><a href="http://www.objectstyle.org/cayenne/1_2/grammar/ExpressionParser.html" title="Visit page outside Confluence" rel="nofollow">formal grammar<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> 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"><div class="codeContent">
<pre class="code-java">Expression e = Expression.fromString(<span class="code-quote">"paintingTitle like 'A%' and estimatedPrice < 1000"</span>);</pre>