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/07/27 16:27:09 UTC
svn commit: r979722 [2/4] - in
/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation:
./ Cayenne Guide/Ant Tasks/cdataport/ Cayenne Guide/Ant Tasks/cdbgen/
Cayenne Guide/Ant Tasks/cdbimport/ Cayenne Guide/Ant Tasks/cdeploy/ Ca...
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Paginated%20Queries/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Paginated Queries/index.html Tue Jul 27 14:27:06 2010
@@ -98,7 +98,7 @@ q.setPageSize(50);
</pre>
</div></div>
-<div class='panelMacro'><table class='tipMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Combining data rows and paginated queries</b><br />Cayenne supports combining both performance optimizations in the same query - fetching data rows (see previous chapters) and paginated queries. So if users work with tabular data and don't care much about real objects, combining the two approaches would improve speed and memory use even more. </td></tr></table></div></div>
+<div class='panelMacro'><table class='tipMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Combining data rows and paginated queries</b><br />Cayenne supports combining both performance optimizations in the same query - fetching data rows (see previous chapters) and paginated queries. So if users work with tabular data and don't care much about real objects, combining the two approaches would improve speed and memory use even more.</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>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Prefetching/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Prefetching/index.html Tue Jul 27 14:27:06 2010
@@ -114,7 +114,7 @@ query.addPrefetch(<span class="code-quot
<p>Each node specifies the name of prefetch path segment and execution semantics. There are two flavors of prefetch semantics - <b>joint</b> and <b>disjoint</b>. Semantics of each node is initially determined by Cayenne when a new prefetch path is added, and can be later customized by the user (e.g., see joint example below).</p>
-<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><p>In most cases prefetch semantics is of no concern to the users. Cayenne will do its best to configure the right semantics on the fly. Don't tweak semantics unless you understand the implications and have some proof that different semantics would result in better select performance on your database. </p></td></tr></table></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>In most cases prefetch semantics is of no concern to the users. Cayenne will do its best to configure the right semantics on the fly. Don't tweak semantics unless you understand the implications and have some proof that different semantics would result in better select performance on your database.</td></tr></table></div>
<p>Some internal semantics rules:</p>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Performance%20Tuning/Turning%20off%20Context%20Synchronization/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Performance Tuning/Turning off Context Synchronization/index.html Tue Jul 27 14:27:06 2010
@@ -76,7 +76,7 @@
<div class='panelMacro'><table class='tipMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Don't use this for idle applications</b><br />Note that this optimization does not affect percieved user commit time, as synchronization is done in a separate thread. It only affects the overall throughput. So it only makes sense if your application already utilizes close to a 100% of CPU.</td></tr></table></div>
-<p><em>Further improvements in this area are tracked via <a href="http://issues.apache.org/cayenne/browse/CAY-554" rel="nofollow">CAY-554 Jira issue</a>.</em></p></div>
+<p><em>Further improvements in this area are tracked via <a href="http://issues.apache.org/cayenne/browse/CAY-554" class="external-link" rel="nofollow">CAY-554 Jira issue</a>.</em></p></div>
</div>
<div class="clearer">.</div>
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/Caching%20Query%20Results/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/Caching Query Results/index.html Tue Jul 27 14:27:06 2010
@@ -67,6 +67,7 @@
<p>The following cache policies are supported:</p>
+<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'>Policy</th>
@@ -99,6 +100,8 @@
<td class='confluenceTd'>Never use cache, alwyas do a fetch and store result in cache for future use</td>
</tr>
</tbody></table>
+</div>
+
<p>It is important to understand that caching of <b>result lists</b> is done independently from caching of <b>individual DataObjects and DataRows</b>. Therefore the API is different as well. Also cached results lists are not synchronized across VMs (even the shared cache).</p>
@@ -143,15 +146,14 @@ List objects2 = context.performQuery(que
<p>The example above shows caching with <tt>SelectQuery</tt>, but it works exactly the same way for <tt>SQLTemplate</tt> and <tt>ProcedureQuery</tt>. Similarly <tt>SHARED_CACHE</tt> and <tt>SHARED_CACHE_REFRESH</tt> cache policies create cache shared by all DataDontexts that work with a given DataDomain. </p>
-<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>Upgrading to Cayenne 1.2 and Newer</b><br /><br/>
-Cache refreshing API has changed in 1.2. Cayenne 1.1 relied on the use of <tt>SelectQuery.setRefreshingObjects(..)</tt> to determine whether to expire cached result lists. This is no longer the case (setting this flag only refreshes <b>individual objects</b> as it should, and has no effect whatsoever on list caching). Instead caching and cache refreshing is controlled by the cache policy as described above.</td></tr></table></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>Upgrading to Cayenne 1.2 and Newer</b><br />Cache refreshing API has changed in 1.2. Cayenne 1.1 relied on the use of <tt>SelectQuery.setRefreshingObjects(..)</tt> to determine whether to expire cached result lists. This is no longer the case (setting this flag only refreshes <b>individual objects</b> as it should, and has no effect whatsoever on list caching). Instead caching and cache refreshing is controlled by the cache policy as described above.</td></tr></table></div>
<h3><a name="CachingQueryResults-QueriesMappedinCayenneModeler"></a>Queries Mapped in CayenneModeler</h3>
<p>The easiest way to set up caching is by creating a named query in CayenneModeler with the appropriate caching type.</p>
-<p><img src="caching.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="caching.jpg?version=1&modificationDate=1139788141000" style="border: 0px solid black" /></span></p>
<p>Then it can be executed via DataContext:</p>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/EJBQLQuery/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html Tue Jul 27 14:27:06 2010
@@ -63,7 +63,7 @@
</div>
<div id="ConfluenceContent"><p><em>(available since 3.0 in both classic and JPA modes; as of June 2007 only a subset of EJBQL syntax is supported)</em></p>
-<p>EJBQL is an object query language that is not unlike SQL, only it operates in terms of the Java object model. In fact "EJB" in its name is entirely misleading - the language is applicable in the non-"enterprise" environments just as well. Standard EJBQL syntax is specified in the <a href="http://cwiki.apache.org/confluence/confluence/display/CAYJPA/JPA+Guide" title="JPA Guide">JPA specification</a>, still Cayenne supports it in a classic mode, and no JPA runtime is required to execute such queries. This chapter deals specifically with classic mode operation. </p>
+<p>EJBQL is an object query language that is not unlike SQL, only it operates in terms of the Java object model. In fact "EJB" in its name is entirely misleading - the language is applicable in the non-"enterprise" environments just as well. Standard EJBQL syntax is specified in the <a href="https://cwiki.apache.org/confluence/confluence/display/CAYJPA/JPA%20Guide" title="JPA Guide">JPA specification</a>, still Cayenne supports it in a classic mode, and no JPA runtime is required to execute such queries. This chapter deals specifically with classic mode operation. </p>
<h3><a name="EJBQLQuery-EJBQLSyntax"></a>EJBQL Syntax</h3>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/ObjectIdQuery/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/ObjectIdQuery/index.html Tue Jul 27 14:27:06 2010
@@ -65,6 +65,7 @@
<p>Normally if you need to find an object that matches a certain primary key value, you would use <tt>DataObjectUtils.objectForPK(DataContext,String,int)</tt>. This method will look up an object in the cache, and only run a query if it is not yet cached. <tt>ObjectIdQuery</tt> gives the user more control of the object caching behavior. It supports three possible caching policies:</p>
+<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'>Policy</th>
@@ -83,6 +84,8 @@
<td class='confluenceTd'>This policy suppresses database fetch. If an object is already cached (either at the DataContext or DataDomain level), query returns this object. Otherwise it returns an empty result.</td>
</tr>
</tbody></table>
+</div>
+
<p>An example of getting a guranteed fresh object:</p>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SQLTemplate%20Query/Scripting%20SQLTemplate/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html Tue Jul 27 14:27:06 2010
@@ -69,7 +69,7 @@
</div>
<div id="ConfluenceContent"><p>SQLTemplate's internal SQL string is a dynamic script that is processed at runtime to generate PreparedStatement SQL code. Dynamic nature of SQLTemplate makes possible a few important things - it allows to bind parameters on the fly; it provides a way to pass extra information to Cayenne that is not included in the SQL text; it supports including/excluding chunks of SQL depending on runtime parameters.</p>
-<p>Scripting of SQL strings is done using <a href="http://velocity.apache.org" rel="nofollow">Apache Velocity</a>. Velocity was chosen primarily for its concise template language (no XML tags within SQL!) that doesn't conflict with the SQL syntax. When creating dynamic SQL template, all standard Velocity directives are available, including <tt>#set</tt>, <tt>#foreach</tt>, <tt>#if</tt>. However due to the nature of the SQL and the need to integrate it with Cayenne runtime, only a few Cayenne custom directives are normally used. These directives (<tt>#bind</tt>..., <tt>#result</tt>, <tt>#chain</tt>, <tt>#chunk</tt>) are described below.</p>
+<p>Scripting of SQL strings is done using <a href="http://velocity.apache.org" class="external-link" rel="nofollow">Apache Velocity</a>. Velocity was chosen primarily for its concise template language (no XML tags within SQL!) that doesn't conflict with the SQL syntax. When creating dynamic SQL template, all standard Velocity directives are available, including <tt>#set</tt>, <tt>#foreach</tt>, <tt>#if</tt>. However due to the nature of the SQL and the need to integrate it with Cayenne runtime, only a few Cayenne custom directives are normally used. These directives (<tt>#bind</tt>..., <tt>#result</tt>, <tt>#chain</tt>, <tt>#chunk</tt>) are described below.</p>
<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>Directive Syntax Note</b><br />Velocity directives start with pound sign (#) and have their parameters separated by space, not comma. E.g. <tt>#bind('SOMESTRING' 'VARCHAR')</tt>.</td></tr></table></div>
<h3><a name="ScriptingSQLTemplate-NamedParameters"></a>Named Parameters</h3>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SelectQuery/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SelectQuery/index.html Tue Jul 27 14:27:06 2010
@@ -70,6 +70,7 @@
<h3><a name="SelectQuery-SelectQueryParts"></a>SelectQuery Parts</h3>
<p>A SelectQuery consists of a root object, qualifier expression and orderings list. Here is a logical correspondence of Cayenne SelectQuery parts and SQL constructs:</p>
+<div class='table-wrap'>
<table class='confluenceTable'><tbody>
<tr>
<th class='confluenceTh'> Cayenne SelectQuery </th>
@@ -92,6 +93,8 @@
<td class='confluenceTd'> no </td>
</tr>
</tbody></table>
+</div>
+
<p>The only required query part is root. Query root tells Cayenne what kind of objects to fetch. It can be one of the following:</p>
<ul>
<li><em>(most commonly used)</em> Java class for the type of persistent objects in question.</li>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Delete/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Tutorial/Tutorial%20Delete/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Delete/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Delete/index.html Tue Jul 27 14:27:06 2010
@@ -68,7 +68,7 @@
<p>In the Modeler go to "Artist" ObjEntity, "Relationships" tab and select "Cascade" for the "paintings" relationship delete rule:</p>
-<p><img src="modeler-deleterule.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-deleterule.png?version=1&modificationDate=1261498005000" style="border: 0px solid black" /></span></p>
<p>Repeat this step for other relationships:</p>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Java Classes/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Tutorial/Tutorial%20Java%20Classes/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Java Classes/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Java Classes/index.html Tue Jul 27 14:27:06 2010
@@ -98,7 +98,7 @@
<p>Now let's check the entity class pairs. Each one is made of a superclass (e.g. <em>Artist) and a subclass (e.g. Artist). You <b>should not</b> modify the superclasses whose names start with "</em>" (underscore), as they will be replaced on subsequent generator runs. Instead all custom logic should be placed in the subclasses in <tt>"org.example.cayenne.persistent"</tt> package - those will never be overwritten by the class generator.</p>
-<p><img src="eclipse-generatedclasses.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="eclipse-generatedclasses.png?version=1&modificationDate=1261359280000" style="border: 0px solid black" /></span></p>
<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>Class Generation Hint</b><br />Often you'd start by generating classes from the Modeler, but at the later stages of the project the generation is usually automated either via <a href="../../../../Documentation/Cayenne Guide/Ant Tasks/cgen/index.html" title="cgen">Ant cgen task</a> or <a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html" title="maven2-cgen">Maven cgen mojo</a>. All three methods are interchangeable, however Ant and Maven methods would ensure that you never forget to regenerate classes on mapping changes, as they are integrated into the build cycle.</td></tr></table></div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Object Relational Mapping/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Tutorial/Tutorial%20Object%20Relational%20Mapping/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Object Relational Mapping/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Object Relational Mapping/index.html Tue Jul 27 14:27:06 2010
@@ -62,7 +62,7 @@
</div>
<div id="ConfluenceContent"><p>The goal of this section is to learn how to create a simple Object-Relational model with CayenneModeler. We will create a complete ORM model for the following database schema:</p>
-<p><img src="database-schema.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="database-schema.jpg?version=1&modificationDate=1225017065000" style="border: 0px solid black" /></span></p>
<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>Very often you'd have an existing database already, and it can be quickly imported in Cayenne via <tt>"Tools > Reengineer Database Schema"</tt>. This will save you lots of time compared to manual mapping. However understanding how to create the mapping by hand is important, so we are showing the "manual" approach below.</td></tr></table></div>
@@ -72,7 +72,7 @@
<p>Select "UntitledDomainMap" on the left-hand side project tree and click "Create DbEntity" button (or use <tt>"Project > Create DbEntity"</tt> menu). A new DbEntity is created. In "DbEntity Name" field enter "ARTIST". Then click on "Create Attribute" button on the entity toolbar (third button from the left). This action changes the view to the "Attribute" tab and adds a new attribute (attribute means a "table column" in this case) called "untitledAttr". Let's rename it to ID, make it an INTEGER and make it a PK:</p>
-<p><img src="modeler-artistid.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-artistid.png?version=1&modificationDate=1261355676000" style="border: 0px solid black" /></span></p>
<p>Similarly add NAME VARCHAR(200) and DATE_OF_BIRTH DATE attributes. After that repeat this procedure for PAINTING and GALLERY entities to match DB schema shown above.</p>
@@ -93,7 +93,7 @@
</ul>
-<p><img src="modeler-dbrelationship.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-dbrelationship.png?version=1&modificationDate=1261356951000" style="border: 0px solid black" /></span></p>
<ul>
<li>Click "Done" to confirm the changes and close the dialog.</li>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Setup/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Tutorial/Tutorial%20Setup/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Setup/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Setup/index.html Tue Jul 27 14:27:06 2010
@@ -68,11 +68,11 @@
<h3><a name="TutorialSetup-InstallEclipseIDEandtheMavenPlugin"></a>Install Eclipse IDE and the Maven Plugin</h3>
-<p>Download Eclipse <a href="http://www.eclipse.org/downloads/" rel="nofollow">from here</a>. This tutorial is based on the Galileo package (Eclipse 3.5), JEE edition, still it should work with any recent vanilla Eclipse distribution.</p>
+<p>Download Eclipse <a href="http://www.eclipse.org/downloads/" class="external-link" rel="nofollow">from here</a>. This tutorial is based on the Galileo package (Eclipse 3.5), JEE edition, still it should work with any recent vanilla Eclipse distribution.</p>
-<p>After downloading Eclipse, unpack it somewhere in the filesystem, and start it. The only plugin that you need for the tutorial is <a href="http://m2eclipse.sonatype.org/" rel="nofollow">m2eclipse</a>. To install it, in Eclipse go to "Help > Install New Software", then click on "Add.." to add a new download site, and enter "Maven" in the "Name" field, and "http://m2eclipse.sonatype.org/update/" in the "Location" field. You may install any of the optional components that you think you need, but for this tutorial we only select a few basic components as shown on the following screenshot:</p>
+<p>After downloading Eclipse, unpack it somewhere in the filesystem, and start it. The only plugin that you need for the tutorial is <a href="http://m2eclipse.sonatype.org/" class="external-link" rel="nofollow">m2eclipse</a>. To install it, in Eclipse go to "Help > Install New Software", then click on "Add.." to add a new download site, and enter "Maven" in the "Name" field, and "http://m2eclipse.sonatype.org/sites/m2e" in the "Location" field. You may install any of the optional components that you think you need, but for this tutorial we only select a few basic components as shown on the following screenshot:</p>
-<p><img src="maven-plugin-install.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="maven-plugin-install.png?version=1&modificationDate=1261352735000" style="border: 0px solid black" /></span></p>
<p>From here follow the Eclipse dialog instructions to finish the installation.</p>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Starting Project/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Tutorial/Tutorial%20Starting%20Project/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Starting Project/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Starting Project/index.html Tue Jul 27 14:27:06 2010
@@ -65,7 +65,7 @@
<h3><a name="TutorialStartingProject-CreateanewProjectinEclipse"></a>Create a new Project in Eclipse</h3>
<p>In Eclipse select <tt>"File > New > Other..."</tt> and then <tt>"Maven > Maven Project"</tt>. Click "Next". On the following screen check "Create a simple project" checkbox and click "Next" again. In the dialog shown on the screenshot below, fill the "Group Id" and "Artifact Id" fields and click "Finish". <br/>
-<img src="tutorial-eclipse-project.png" align="absmiddle" border="0" /></p>
+<span class="image-wrap" style=""><img src="tutorial-eclipse-project.png?version=1&modificationDate=1261352793000" style="border: 0px solid black" /></span></p>
<p>Now you should have a new empty project in the Eclipse workspace. Check that the project Java compiler settings are correct. Rightclick on the "tutorial" project, select <tt>"Properties > Java Compiler"</tt> and ensure that "Compiler compliance level" is at least "1.5" (some versions of Maven plugin seem to be setting it to 1.4 by default).</p>
@@ -75,9 +75,9 @@
<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>If you are really into Maven, you can <a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html" title="maven2-modeler">start CayenneModeler from Maven</a> if you wish. We'll do it in a more traditional way here.</td></tr></table></div>
-<p>Download the latest release <a href="http://cayenne.apache.org/download.html" rel="nofollow">from here</a>. Unpack the distribution somewhere in the file system and start CayenneModeler, following <a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">platform-specific instructions</a>. On most platforms it is done simply by doubleclicking the Modeler icon. The welcome screen of the Modeler looks like this:</p>
+<p>Download the latest release <a href="http://cayenne.apache.org/download.html" class="external-link" rel="nofollow">from here</a>. Unpack the distribution somewhere in the file system and start CayenneModeler, following <a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">platform-specific instructions</a>. On most platforms it is done simply by doubleclicking the Modeler icon. The welcome screen of the Modeler looks like this:</p>
-<p><img src="modeler-started.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-started.png?version=1&modificationDate=1261352793000" style="border: 0px solid black" /></span></p>
<h3><a name="TutorialStartingProject-CreateaNewMappingProjectinCayenneModeler"></a>Create a New Mapping Project in CayenneModeler</h3>
@@ -99,7 +99,7 @@
<p>Also you will need to change "Schema Update Strategy". Select <tt>"org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"</tt> from the dropdown, so that Cayenne creates a new schema on Derby based on the ORM mapping when the application starts.</p>
-<p><img src="base-datanode.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="base-datanode.png?version=1&modificationDate=1261354162000" style="border: 0px solid black" /></span></p>
<h3><a name="TutorialStartingProject-CreateaDataMap"></a>Create a DataMap</h3>
@@ -108,13 +108,13 @@
<p>You can leave all the DataMap defaults unchanged except for one - "Java Package". Enter "org.example.cayenne.persistent". This name will later be used for all persistent classes.</p>
-<p><img src="base-datamap.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="base-datamap.png?version=1&modificationDate=1261354162000" style="border: 0px solid black" /></span></p>
<h3><a name="TutorialStartingProject-SavetheProject"></a>Save the Project</h3>
<p>Before you proceed with the actual mapping, let's save the project. Click on "Save" button in the toolbar and navigate to the <tt>"tutorial"</tt> Eclipse project folder that was created earlier in this section and its <tt>"src/main/resources"</tt> subfolder and save the project there. Now go back to Eclipse, right click on "tutorial" project and select "Refresh", you will see three Cayenne XML files.</p>
-<p><img src="eclipse-xmlfiles.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="eclipse-xmlfiles.png?version=1&modificationDate=1261354451000" style="border: 0px solid black" /></span></p>
<p>Note that the location of the XML files is not coincidental. Cayenne runtime looks for <tt>"cayenne.xml"</tt> file in the application CLASSPATH and <tt>"src/main/resources"</tt> folder should already be a "class folder" in Eclipse for our project (and is also a standard location that Maven would copy to a jar file, if we were using Maven from command-line).</p>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Webapp/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Tutorial/Tutorial%20Webapp/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Webapp/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Tutorial/Tutorial Webapp/index.html Tue Jul 27 14:27:06 2010
@@ -245,7 +245,7 @@
</ul>
-<p><img src="eclipse-mvnrun.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="eclipse-mvnrun.png?version=1&modificationDate=1261502277000" style="border: 0px solid black" /></span></p>
<ul>
<li>Click "Apply" and "Run". On the first execution it may take a few minutes for Jetty plugin to download all dependencies, but eventually you'll see the logs like this:</li>
@@ -292,7 +292,7 @@ INFO: finished configuration loading in
<ul>
<li>So the Jetty container just started and loaded Cayenne.</li>
- <li>Now go to <a href="http://localhost:8080/tutorial/" rel="nofollow">http://localhost:8080/tutorial/</a> URL. You should see "No artists found message" in the web browser and the following output in the Eclipse console:</li>
+ <li>Now go to <a href="http://localhost:8080/tutorial/" class="external-link" rel="nofollow">http://localhost:8080/tutorial/</a> URL. You should see "No artists found message" in the web browser and the following output in the Eclipse console:</li>
</ul>
@@ -328,7 +328,7 @@ INFO: +++ transaction committed.</pre>
</ul>
-<p><img src="firefox-webapp.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="firefox-webapp.png?version=1&modificationDate=1261502277000" style="border: 0px solid black" /></span></p>
<p>You are done with the tutorial!</p></div>
</div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Cayenne%20Project%20Structure/Cayenne%20DataMaps/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html Tue Jul 27 14:27:06 2010
@@ -51,7 +51,7 @@
<div id="ConfluenceContent">
<p>TO BE DONE</p>
-<p><img src="entities.gif" align="absmiddle" border="0" /></p></div>
+<p><span class="image-wrap" style=""><img src="entities.gif?version=1&modificationDate=1140120522000" style="border: 0px solid black" /></span></p></div>
</div>
<div class="clearer">.</div>
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Cayenne%20Project%20Structure/Cayenne%20Projects/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html Tue Jul 27 14:27:06 2010
@@ -52,12 +52,12 @@
<p>Cayenne project is a set of XML configuration files needed for a Java application to work with Cayenne. It is editable by CayenneModeler. A project has roughly the following structure:</p>
-<p><img src="cayenne-project.gif" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="cayenne-project.gif?version=1&modificationDate=1140120355000" style="border: 0px solid black" /></span></p>
<p>This structure is saved in the following set of files:</p>
<ul class="alternate" type="square">
- <li><b>cayenne.xml file</b>: This is a main project file in each application. It should always be called <tt>cayenne.xml</tt>. It configures the layout of the data sources used by the application, breaking it by domains and nodes. It also links to other parts of Cayenne project described below. Nodes represent physical datasources. For each database JDBC URL there should be a single node configured. Domains represent virtual datasources that are a combination of one or more physical datasources. In a simplest (and most common) case, there will be only one domain (virtual datasource) that has a single node (physical datasource). But Cayenne is flexible to allow grouping multiple nodes under domains thus hiding lots of underlying details and allowing applications to work with multiple databases as if it was a single one. XML structure of <tt>cayenne.xml</tt> is described in this <a href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenn
e-java/src/cayenne/dtd/cayenne-project-1_1.dtd" rel="nofollow">DTD file</a>.</li>
+ <li><b>cayenne.xml file</b>: This is a main project file in each application. It should always be called <tt>cayenne.xml</tt>. It configures the layout of the data sources used by the application, breaking it by domains and nodes. It also links to other parts of Cayenne project described below. Nodes represent physical datasources. For each database JDBC URL there should be a single node configured. Domains represent virtual datasources that are a combination of one or more physical datasources. In a simplest (and most common) case, there will be only one domain (virtual datasource) that has a single node (physical datasource). But Cayenne is flexible to allow grouping multiple nodes under domains thus hiding lots of underlying details and allowing applications to work with multiple databases as if it was a single one. XML structure of <tt>cayenne.xml</tt> is described in this <a href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenn
e-java/src/cayenne/dtd/cayenne-project-1_1.dtd" class="external-link" rel="nofollow">DTD file</a>.</li>
</ul>
@@ -67,7 +67,7 @@
<ul class="alternate" type="square">
- <li><b>DataSource file</b>: In a standalone Java application, Java code has no access to DataSource objects that are normally provided by deployment containers. Cayenne framework still needs a DataSource to connect to the database. Therefore Cayenne has a set of wrapper classes located in <tt>org.apache.cayenne.conn</tt> package, to create DataSource objects based on regular JDBC drivers. DataSource file provides needed information about database URL, JDBC driver, login, password and connection pooling parameters of a single DataSource. <em>Note: such configuration file can be present in development so that CayenneModeler tool could obtain a database connection, even if an application wouldn't use it in deployment and instead would use a DataSource provided by the container</em>. DTD for the DataSource file can be found <a href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/dtd/cayenne-driver-1_1.dtd" rel="nofoll
ow">here</a>.</li>
+ <li><b>DataSource file</b>: In a standalone Java application, Java code has no access to DataSource objects that are normally provided by deployment containers. Cayenne framework still needs a DataSource to connect to the database. Therefore Cayenne has a set of wrapper classes located in <tt>org.apache.cayenne.conn</tt> package, to create DataSource objects based on regular JDBC drivers. DataSource file provides needed information about database URL, JDBC driver, login, password and connection pooling parameters of a single DataSource. <em>Note: such configuration file can be present in development so that CayenneModeler tool could obtain a database connection, even if an application wouldn't use it in deployment and instead would use a DataSource provided by the container</em>. DTD for the DataSource file can be found <a href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/dtd/cayenne-driver-1_1.dtd" class="exte
rnal-link" rel="nofollow">here</a>.</li>
</ul>
</div>
</div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Create%20DataNode/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html Tue Jul 27 14:27:06 2010
@@ -58,11 +58,11 @@
<p><b>Create DataNode.</b> DataNodes are created under parent DataDomains. To create a DataNode, select one of the DataDomains on the left-hand side, and then select "<tt>Project -> Create DataNode</tt>" menu item or click on "New DataNode" icon. A new DataNode will be created under the selected domain. After the DataNode is created, you can assign it any name you want instead of the default "[DomainName]Node". </p>
-<p><img src="datanode.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="datanode.jpg?version=1&modificationDate=1140459376000" style="border: 0px solid black" /></span></p>
<p><b>Configure DB Adapter.</b> As mentioned <a href="../../../../Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html" title="DbAdapter">in Cayenne User Guide</a>, RDBMS engines sometimes require special handling outside of standard JDBC scope. Cayenne abstracts it via database-specific adapters. An adapter must be selected from a "DB adapter" dropdown, regardless what type of DataSource factory (see below) is used . Standard adapters distributed with Cayenne (including a generic JDBCAdapter) are listed in the dropdown. If you created your own adapter, type the full class name of a class that implements DbAdapter interface instead. </p>
-<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>Hint</b><br /><p>If entering custom DbAdapter results in Modeler showing a warning, it is likely a CLASSPATH issue. In this case you will need to setup the location of compiled custom adapter classes in "Tools > Preferences > ClassPath".</p></td></tr></table></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>Hint</b><br />If entering custom DbAdapter results in Modeler showing a warning, it is likely a CLASSPATH issue. In this case you will need to setup the location of compiled custom adapter classes in "Tools > Preferences > ClassPath".</td></tr></table></div>
<p><b>Select Local DataSource.</b> This is an optional, though recommended step. A "Local DataSource" dropdown allows to create an association between a DataNode and a <a href="../../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html" title="Local DataSources">previously configured DataSources</a>. Such association is transparently stored as one of the preferences and does not affect your project XML files. This is a good way to separate database connection info stored in a given Cayenne project (i.e. deployment information) from local preferred connection settings. Also it allows to connect using JNDI DataNodes.</p>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Create%20New%20Project/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html Tue Jul 27 14:27:06 2010
@@ -59,11 +59,11 @@
<p>Start New Project. Select "<tt>File > New Project</tt>" menu item (or click "<tt>New Project</tt>" toolbar button):</p>
-<p><img src="new-project.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="new-project.jpg?version=1&modificationDate=1140458949000" style="border: 0px solid black" /></span></p>
<p>A new project is created with a single empty DataDomain: </p>
-<p><img src="new-project-done.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="new-project-done.jpg?version=1&modificationDate=1140458949000" style="border: 0px solid black" /></span></p>
<p>When you click on "UntitledDomain", this opens an editor for this domain and also activates two new actions: "<tt>Create DataNode</tt>" and "<tt>Create DataMap</tt>". </p></div>
</div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Generate%20Database%20Schema/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html Tue Jul 27 14:27:06 2010
@@ -58,11 +58,11 @@
<p>To be done...</p>
-<p><img src="generate-connect.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="generate-connect.jpg?version=1&modificationDate=1140460244000" style="border: 0px solid black" /></span></p>
-<p><img src="generate-options.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="generate-options.jpg?version=1&modificationDate=1140460244000" style="border: 0px solid black" /></span></p>
-<p><img src="generate-options-tables.jpg" align="absmiddle" border="0" /></p></div>
+<p><span class="image-wrap" style=""><img src="generate-options-tables.jpg?version=1&modificationDate=1140460244000" style="border: 0px solid black" /></span></p></div>
</div>
<div class="clearer">.</div>
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Generate%20Java%20Classes/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html Tue Jul 27 14:27:06 2010
@@ -58,7 +58,7 @@
<p>To generate classes from the Modeler, you must select either a DataMap or an ObjEntity in the project tree and then select <tt>"Tools > Generate Classes"</tt> from the menu. A "Code Generation" dialog opens:</p>
-<p><img src="generator1.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="generator1.jpg?version=1&modificationDate=1152549369000" style="border: 0px solid black" /></span></p>
<p>It has two tabs - "Code Generator" for setting generator parameters, and "Entities" for entity selection. If you had an ObjEntity selected prior to opening the dialog, only this entity will be selected. Otherwise all entities that do not have validation failures will be selected. Users of course can change the selection to run generator for an arbitrary subset of entities.</p>
@@ -76,7 +76,7 @@
<p>As the name implies this mode allows much more customization of the generation procedure, such as custom Velocity templates (that are configured in Modeler Preferences), single run per entity or single run for the entire DataMap, etc. The options available in the dialog closely mirror those of the <a href="../../../../Documentation/Cayenne Guide/Ant Tasks/cgen/index.html" title="cgen">cgen</a> Ant task.</p>
-<p><img src="generator2.jpg" align="absmiddle" border="0" /></p></div>
+<p><span class="image-wrap" style=""><img src="generator2.jpg?version=1&modificationDate=1152549369000" style="border: 0px solid black" /></span></p></div>
</div>
<div class="clearer">.</div>
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Generate%20Primary%20Key%20Support/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html Tue Jul 27 14:27:06 2010
@@ -59,11 +59,11 @@
<p><b>Create Primary Key Support.</b> Select a DataMap and choose "<tt>Tools -> Generate Database Schema</tt>" from the menu, "Connect to Database" dialog appears.</p>
-<p><img src="generate-options-pk.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="generate-options-pk.jpg?version=1&modificationDate=1140631847000" style="border: 0px solid black" /></span></p>
<p><b>Configure Database Connection.</b> "Connect to Database" dialog allows to specify alternative connection parameters. If a DataMap has a DataNode, then this DataNode connection information is shown by default. You can use suggested default connection, select one of the stored local DataSources from "Saved DataSources" dropdown (those can be edited on the spot by clicking "..." button), or type your own info. When desired connection is selected, click "Continue". Cayenne will attempt to connect to the database and if connection is successful, "Options" dialog is presented.</p>
-<p><img src="generate-connect.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="generate-connect.jpg?version=1&modificationDate=1140631847000" style="border: 0px solid black" /></span></p>
<p>You must uncheck all options except for "Create Primary key Support", and then click "Generate". If there were any database specific errors during generation they will be listed in a status window. Sometimes such errors can be simply ignored (e.g. when a there was an existing primary key support already configured in the DB).</p></div>
</div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Reverse%20Engineer%20Database/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html Tue Jul 27 14:27:06 2010
@@ -58,11 +58,11 @@
<p><b>Start Reverse Engineering.</b> To reverse engineer a database you need to select either a DataDomain or one of its children on the project tree. Then select "Tools > Reengineer Database Schema" from the menu. "Connect to Database" dialog will be presented.</p>
-<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> Reverse-engineering behavior is sensitive to the current project tree selection. If you selected a DataDomain or a DataNode, a new DataMap will be created and all reengineered tables will be put in this DataMap. If you had an existing DataMap (or one of its entities) selected when you started reverse engineering, new tables will be merged into the existing DataMap.</td></tr></table></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>Reverse-engineering behavior is sensitive to the current project tree selection. If you selected a DataDomain or a DataNode, a new DataMap will be created and all reengineered tables will be put in this DataMap. If you had an existing DataMap (or one of its entities) selected when you started reverse engineering, new tables will be merged into the existing DataMap.</td></tr></table></div>
<p><b>Configure Database Connection.</b> "Connect to Database" dialog allows to specify alternative connection parameters. If a DataNode was selected when reverse engineering started, its connection information is shown by default. You can use suggested default connection, select one of the stored local DataSources from "Saved DataSources" dropdown (those can be edited on the spot by clicking "..." button), or type your own info. When desired connection is selected, click "Continue". Cayenne will attempt to connect to the database and if connection is successful, "Select Options" dialog is presented.</p>
-<p><img src="reengineer-connect.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="reengineer-connect.png?version=1&modificationDate=1227357835000" style="border: 0px solid black" /></span></p>
<p><b>Configure Options.</b> "Select Options" dialog allows to specify what needs to be reverse engineered. If a database supports schemas, one of the listed schemas should be selected. Table and stored procedure patterns allow to control which tables/procedures are included in reverse engineering. Patterns should be in the format used by SQL LIKE clause (e.g. "ABC", "ABC%" or" %" or "A%T", etc.).</p>
@@ -70,13 +70,13 @@
<p>org.apache.cayenne.map.naming.BasicNamingStrategy generates names in Cayenne 2.0-style. Thus, to-one relationships will be prefixed by "to", to-many relationships will be postfixed by 'Array'. Examples of such names are "toArtist" and "paintingArray".</p>
-<p>org.apache.cayenne.modeler.util.SmartNamingStrategy uses FK column names for to-one relationship names (e.g. if FK column is called "ARTIST_ID" or "ARTISTID" the relationship's name will be just "artist"). To-many relationship names are pluralized forms of other-side entities names, e.g. "paintings". Pluralization is done in rules of English language using <a href="https://inflector.dev.java.net/" rel="nofollow">Inflector</a>.</p>
+<p>org.apache.cayenne.modeler.util.SmartNamingStrategy uses FK column names for to-one relationship names (e.g. if FK column is called "ARTIST_ID" or "ARTISTID" the relationship's name will be just "artist"). To-many relationship names are pluralized forms of other-side entities names, e.g. "paintings". Pluralization is done in rules of English language using <a href="https://inflector.dev.java.net/" class="external-link" rel="nofollow">Inflector</a>.</p>
<p>To use one of predefined strategies or your own one you must specify strategy class name in "Naming Stragegy" field of "Select Options" dialog. JAR with user strategy must be attached using Tools->Preferences->ClassPath bookmark. NamingStrategy implementation must have a public default constructor.</p>
<p><b>Running Reverse Engineering.</b> After desired options are selected, click "Continue". Progress dialog will open. It will close automatically when reverse-engineering is done. After that all database tables and stored procedures that matched selected criteria will be added to the DataMap. Default ObjEntity mapping will be created as well.</p>
-<p><img src="reengineer-schema.png" align="absmiddle" border="0" /></p></div>
+<p><span class="image-wrap" style=""><img src="reengineer-schema.png?version=1&modificationDate=1227357854000" style="border: 0px solid black" /></span></p></div>
</div>
<div class="clearer">.</div>
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Setting%20DataMap%20Defaults/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html Tue Jul 27 14:27:06 2010
@@ -58,7 +58,7 @@
<p>DataMap editing panel allows to define a number of default values for the entities in this map.</p>
-<p><img src="datamap-defaults.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="datamap-defaults.jpg?version=1&modificationDate=1140632137000" style="border: 0px solid black" /></span></p>
<p>Defaults are stored in the DataMap XML file and used in CayenneModeler to make entity creation/modification easier. The following defaults are supported:</p>
<ul>
@@ -79,7 +79,7 @@
<ul>
<li><b>Optimistic Locking.</b> Default optimistic locking policy for ObjEntities. Clicking "Update.." button next to the optimistic locking checkbox will reset the optimistic locking policy of all existing ObjEntities to match the default.</li>
<li><b>Client Entities.</b> Allows you to specify remote persistence client classes. Clicking "Update.." button next to Client Java Package field will reset the client java package of all existing Java classes in the DataMap.
-<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>Defaults are ignored in runtime</b><br /><p>Note that none of the defaults affect entities runtime behavior. For example if a DbEntity "ARTIST" has empty schema, and a DataMap defines a default schema to be "SCHEMA1", Cayenne will assume that ARTIST entity does not use schema.</p></td></tr></table></div></li>
+<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>Defaults are ignored in runtime</b><br />Note that none of the defaults affect entities runtime behavior. For example if a DbEntity "ARTIST" has empty schema, and a DataMap defines a default schema to be "SCHEMA1", Cayenne will assume that ARTIST entity does not use schema.</td></tr></table></div></li>
</ul>
</div>
</div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Configuring%20Deployment%20Settings/Configuring%20Caching%20Behavior/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html Tue Jul 27 14:27:06 2010
@@ -53,7 +53,7 @@
<p>"Cache Configuration" panel allows to configure a max number of objects in the shared LRU cache. By default it is set to 10000, which is appropriate for most applications. It is up to the user whether to change this parameter, however we advise to set it to a value to be higher than an estimated max. number of objects committed in a single transaction.</p>
-<p><img src="cache-size.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="cache-size.png?version=1&modificationDate=1183886870000" style="border: 0px solid black" /></span></p>
<h2><a name="ConfiguringCachingBehavior-CacheSharing"></a>Cache Sharing</h2>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Configuring%20Deployment%20Settings/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html Tue Jul 27 14:27:06 2010
@@ -51,7 +51,7 @@
<p>Cayenne project deployment settings, aside from <a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html" title="Create DataNode">DataNode</a> configuration discussed elsewhere, are done using DataDomain panel. This chapter describes various supported settings.</p>
-<p><img src="modeler-datadomain.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-datadomain.png?version=1&modificationDate=1261942616000" style="border: 0px solid black" /></span></p>
<h3><a name="ConfiguringDeploymentSettings-Sections"></a>Sections</h3>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html Tue Jul 27 14:27:06 2010
@@ -58,19 +58,19 @@
<p>There is a main toolbar shown below, and a number of object-specific toolbars.</p>
-<p><img src="modeler-toolbar.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-toolbar.png?version=1&modificationDate=1261940989000" style="border: 0px solid black" /></span></p>
<p>The following is a quick reference of the toolbar button functions.</p>
-<h5><a name="GeneralNavigation-Project%3A%21iconnew.gif%21%21iconopen.gif%21%21iconsave.gif%21"></a>Project: <img src="icon-new.gif" align="absmiddle" border="0" /> <img src="icon-open.gif" align="absmiddle" border="0" /> <img src="icon-save.gif" align="absmiddle" border="0" /></h5>
+<h5><a name="GeneralNavigation-Project%3A%21iconnew.gif%21%21iconopen.gif%21%21iconsave.gif%21"></a>Project: <span class="image-wrap" style=""><img src="icon-new.gif?version=1&modificationDate=1152907573000" style="border: 0px solid black" /></span> <span class="image-wrap" style=""><img src="icon-open.gif?version=1&modificationDate=1152907655000" style="border: 0px solid black" /></span> <span class="image-wrap" style=""><img src="icon-save.gif?version=1&modificationDate=1152907655000" style="border: 0px solid black" /></span></h5>
<p>Cayenne Project is a logical deployment unit, that consists of a main project file (called <tt>cayenne.xml</tt>) and zero or more DataNode (<tt>*.driver.xml</tt>) and DataMap (<tt>*.map.xml</tt>) XML files. Currently CayenneModeler supports a single project per running Modeler instance, however multiple instances of Modeler can be started to edit multiple projects at the same time.</p>
-<h5><a name="GeneralNavigation-DataDomain%3A%21icondom.gif%21"></a>DataDomain: <img src="icon-dom.gif" align="absmiddle" border="0" /> </h5>
+<h5><a name="GeneralNavigation-DataDomain%3A%21icondom.gif%21"></a>DataDomain: <span class="image-wrap" style=""><img src="icon-dom.gif?version=1&modificationDate=1152907631000" style="border: 0px solid black" /></span> </h5>
<p>Each DataDomain is an abstraction of a logical data source, possibly spreading multiple physical databases. cayenne.xml file lists DataDomains present in the project. Most projects will contain only a single domain. DataDomain button creates a new DataDomain in the currently open project. </p>
-<h5><a name="GeneralNavigation-DataNode%3A%21iconnode.gif%21"></a>DataNode: <img src="icon-node.gif" align="absmiddle" border="0" /></h5>
+<h5><a name="GeneralNavigation-DataNode%3A%21iconnode.gif%21"></a>DataNode: <span class="image-wrap" style=""><img src="icon-node.gif?version=1&modificationDate=1152907655000" style="border: 0px solid black" /></span></h5>
<p>DataNode is an object that corresponds to a single physical data source, normally a database. Currently there are two types of DataNodes: </p>
@@ -82,23 +82,23 @@
<p>DataNode references zero or more DataMaps defined under DataDomain. </p>
-<h5><a name="GeneralNavigation-DataMap%3A%21icondatamap.gif%21"></a>DataMap: <img src="icon-datamap.gif" align="absmiddle" border="0" /></h5>
+<h5><a name="GeneralNavigation-DataMap%3A%21icondatamap.gif%21"></a>DataMap: <span class="image-wrap" style=""><img src="icon-datamap.gif?version=1&modificationDate=1152907631000" style="border: 0px solid black" /></span></h5>
<p>DataMap is a collection of Object/Relational mapping information linking Java object layer with the relational database. DataMaps are created within DataDomains and can be later linked to DataNodes. </p>
-<h5><a name="GeneralNavigation-Entities%3A%21icondbentity.gif%21%21iconobjentity.gif%21"></a>Entities: <img src="icon-dbentity.gif" align="absmiddle" border="0" /> <img src="icon-objentity.gif" align="absmiddle" border="0" /></h5>
+<h5><a name="GeneralNavigation-Entities%3A%21icondbentity.gif%21%21iconobjentity.gif%21"></a>Entities: <span class="image-wrap" style=""><img src="icon-dbentity.gif?version=1&modificationDate=1152907573000" style="border: 0px solid black" /></span> <span class="image-wrap" style=""><img src="icon-objentity.gif?version=1&modificationDate=1152907631000" style="border: 0px solid black" /></span></h5>
<p>There are two types of entities in Cayenne DataMaps: ObjEntities, reflecting the structure of the object layer, and DbEntities that describe database tables and views. In other words, ObjEntity is a descriptor of a persistent Java class, and DbEntity is a descriptor of a database table or view. Each ObjEntity is based on a DbEntity, but there can be DbEntities that do not have a corresponding ObjEntity.</p>
-<h5><a name="GeneralNavigation-Embeddables%3A%21iconembeddable.gif%21"></a>Embeddables: <img src="icon-embeddable.gif" align="absmiddle" border="0" /></h5>
+<h5><a name="GeneralNavigation-Embeddables%3A%21iconembeddable.gif%21"></a>Embeddables: <span class="image-wrap" style=""><img src="icon-embeddable.gif?version=1&modificationDate=1261941297000" style="border: 0px solid black" /></span></h5>
<p>Embeddables are the special kind of mapping objects that allow to map parts of a DB table as a separate object, allowing to use composition within entities.</p>
-<h5><a name="GeneralNavigation-Procedures%3A%21iconstoredprocedure.gif%21"></a>Procedures: <img src="icon-stored-procedure.gif" align="absmiddle" border="0" /></h5>
+<h5><a name="GeneralNavigation-Procedures%3A%21iconstoredprocedure.gif%21"></a>Procedures: <span class="image-wrap" style=""><img src="icon-stored-procedure.gif?version=1&modificationDate=1152907573000" style="border: 0px solid black" /></span></h5>
<p>Procedure is a descriptor 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-Query%3A%21iconquery.gif%21"></a>Query: <img src="icon-query.gif" align="absmiddle" border="0" /></h5>
+<h5><a name="GeneralNavigation-Query%3A%21iconquery.gif%21"></a>Query: <span class="image-wrap" style=""><img src="icon-query.gif?version=1&modificationDate=1152907631000" style="border: 0px solid black" /></span></h5>
<p>Cayenne allows to store queries in the DataMap. There are 4 types of Cayenne queries that can be created in the Modeler - object select query, raw SQL query, procedure query and EJBQL query.</p></div>
</div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Migrate Changes between Model and Database/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Migrate%20Changes%20between%20Model%20and%20Database/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Migrate Changes between Model and Database/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Migrate Changes between Model and Database/index.html Tue Jul 27 14:27:06 2010
@@ -52,31 +52,31 @@
<p>Open the model in the modeler and select the DataMap.</p>
-<p><img src="merge-select-datamap.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="merge-select-datamap.png?version=1&modificationDate=1219763429000" style="border: 0px solid black" /></span></p>
<p>Select Tools->Migrate Database Schema.</p>
-<p><img src="merge-menu.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="merge-menu.png?version=1&modificationDate=1219763418000" style="border: 0px solid black" /></span></p>
<p>Enter or select data source information.</p>
-<p><img src="merge-db-connect.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="merge-db-connect.png?version=1&modificationDate=1219763398000" style="border: 0px solid black" /></span></p>
<p>All detected changes will be listed as separate tokens.</p>
-<p><img src="merge-detected-changes.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="merge-detected-changes.png?version=1&modificationDate=1219763409000" style="border: 0px solid black" /></span></p>
<p>Select tokens and their direction. "To Model" mean that the change is to be made from the database to the model. "To DB" mean that opposite.</p>
-<p><img src="merge-select-tokens.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="merge-select-tokens.png?version=1&modificationDate=1219763443000" style="border: 0px solid black" /></span></p>
<p>It is also possible to see the generated SQL for the selected "To DB" tokens.</p>
-<p><img src="merge-generated-sql.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="merge-generated-sql.png?version=1&modificationDate=1219763710000" style="border: 0px solid black" /></span></p>
<p>At last, press Migrate to execute the selected operations. Problems will be reported in a dialog. Operations that succeeded will be removed from the list.</p>
-<p><img src="merge-complete.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="merge-complete.png?version=1&modificationDate=1219763780000" style="border: 0px solid black" /></span></p>
</div>
</div>
<div class="clearer">.</div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/CayenneModeler%20Flattened%20Relationships/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html Tue Jul 27 14:27:06 2010
@@ -35,7 +35,6 @@
<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Embeddables/index.html">Modeling Embeddables</a></li>
@@ -66,7 +65,7 @@
<p>To map an ObjRelationship to a chain of DbRelationships, select ObjRelationship table row and click "Edit Relationship" button in the bottom right. "ObjRelationship Inspector" dialog will appear. The dialog contains a DbRelationship navigator, allowing to map regular as well as flattened relationships:</p>
-<p><img src="modeler-flattenedrelationship.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-flattenedrelationship.png?version=1&modificationDate=1261944405000" style="border: 0px solid black" /></span></p>
<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>Join Table Tip</b><br />If you flatten across a join table and this join table was mapped to an ObjEntity (and a correspoding Java class), such ObjEntity can be deleted, as it is no longer needed. Underlying DbEntity must be preserved.</td></tr></table></div>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Delete%20Rules/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html Tue Jul 27 14:27:06 2010
@@ -35,7 +35,6 @@
<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Embeddables/index.html">Modeling Embeddables</a></li>
@@ -77,7 +76,7 @@
</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>Cayenne Delete Rules vs. DB Delete Rules</b><br /><p>Some databases allow to define delete rules logically similar to the rules described above. Cayenne rules differ from DB rules in that they deal with object graph instead of relational schema. Some changes to the object graph will result in database operations (e.g. resetting FK to NULL as a result of Nullify rule), some others will not (e.g. removing a deleted DataObject from the to-many array as a result of another Nullify rule). </p></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>Cayenne Delete Rules vs. DB Delete Rules</b><br />Some databases allow to define delete rules logically similar to the rules described above. Cayenne rules differ from DB rules in that they deal with object graph instead of relational schema. Some changes to the object graph will result in database operations (e.g. resetting FK to NULL as a result of Nullify rule), some others will not (e.g. removing a deleted DataObject from the to-many array as a result of another Nullify rule).</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>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Many-to-Many%20Relationships/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html Tue Jul 27 14:27:06 2010
@@ -35,7 +35,6 @@
<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Embeddables/index.html">Modeling Embeddables</a></li>
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Embeddables/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Modeling%20Embeddables/index.html?rev=979722&r1=979721&r2=979722&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Embeddables/index.html (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Embeddables/index.html Tue Jul 27 14:27:06 2010
@@ -35,7 +35,6 @@
<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/index.html">Modeling Object Layer</a><ul>
-<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html">Inheritance overview</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html">Modeling ObjEntities</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html">Modeling Inheritance</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Embeddables/index.html">Modeling Embeddables</a><ul>
@@ -63,17 +62,17 @@
<p>A new Embeddable is created by clicking on the "Create Embeddable" button on the toolbar (or selecting an appropriate item from the menu). The only required field is a fully qualified class name:</p>
-<p><img src="modeler-newembeddable.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-newembeddable.png?version=1&modificationDate=1261947605000" style="border: 0px solid black" /></span></p>
<p>An embeddable can have one or more attributes. Each attribute requires at least the name and the java type specified. Quite often you would also specify the DbAttribute name. Although Embeddable is not connected to a DbEntity just yet, this will save some typing during embedding it to ObjEntities (provided the DB column names for the Embeddable are the same across ObjEntities):</p>
-<p><img src="modeler-eattributes.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-eattributes.png?version=1&modificationDate=1261947605000" style="border: 0px solid black" /></span></p>
<h3><a name="ModelingEmbeddables-EmbeddinganEmbeddable"></a>Embedding an Embeddable</h3>
<p>A process of embedding an Embeddable is rather simple - just select the embeddable type for a given ObjAttribute "java Type". CayenneModeler would automatically include all Embeddable classes it knows about in the Java types dropdown. If the underlying DbEntity has the same column names as the original Embeddable, that's all you need to do. If not, you can override the default column names by clicking on the attribute inspector button ("I") and changing DbAttribute mappings for this particular embedding:</p>
-<p><img src="modeler-embeddedinspector.png" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-embeddedinspector.png?version=1&modificationDate=1261947605000" style="border: 0px solid black" /></span></p>