You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2010/11/14 06:57:02 UTC
svn commit: r1034936 [1/2] - in
/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler
Guide: ./ Cayenne Project Structure/ Cayenne Project Structure/Cayenne
DataMaps/ Cayenne Project Structure/Cayenne Projects/ Common Modeling
Tasks...
Author: aadamchik
Date: Sun Nov 14 05:57:01 2010
New Revision: 1034936
URL: http://svn.apache.org/viewvc?rev=1034936&view=rev
Log:
syncing docs from wiki - part 2
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Object Validation/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Transactional Behavior/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Migrate Changes between Model and Database/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling ObjEntities/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Remote Persistence/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Queries/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Tips/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Converting an Existing Business Framework/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Java Interface to an Existing Database/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/New System/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/General Preferences/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/index.html
cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/index.html
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Cayenne%20Project%20Structure/Cayenne%20DataMaps/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne DataMaps/index.html Sun Nov 14 05:57:01 2010
@@ -51,13 +51,13 @@
<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>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Cayenne%20Project%20Structure/Cayenne%20Projects/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html Sun Nov 14 05:57:01 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>
@@ -75,7 +75,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Cayenne%20Project%20Structure/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/index.html Sun Nov 14 05:57:01 2010
@@ -63,7 +63,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Create%20DataNode/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html Sun Nov 14 05:57:01 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>
@@ -74,7 +74,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/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/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Create%20New%20Project/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create New Project/index.html Sun Nov 14 05:57:01 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>
@@ -71,7 +71,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Generate%20Database%20Schema/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Database Schema/index.html Sun Nov 14 05:57:01 2010
@@ -58,17 +58,17 @@
<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>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Generate%20Java%20Classes/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Java Classes/index.html Sun Nov 14 05:57:01 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,13 +76,13 @@
<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>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Generate%20Primary%20Key%20Support/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Generate Primary Key Support/index.html Sun Nov 14 05:57:01 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>
@@ -71,7 +71,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Reverse%20Engineer%20Database/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html Sun Nov 14 05:57:01 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,19 +70,19 @@
<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>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Setting%20DataMap%20Defaults/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html Sun Nov 14 05:57:01 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>
@@ -87,7 +87,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/index.html Sun Nov 14 05:57:01 2010
@@ -73,7 +73,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Configuring%20Deployment%20Settings/Configuring%20Caching%20Behavior/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html Sun Nov 14 05:57:01 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>
@@ -70,14 +70,13 @@
<h3><a name="ConfiguringCachingBehavior-CrossVMCacheSharingConfiguration"></a>Cross-VM Cache Sharing Configuration</h3>
-
<p>Configuration that allows to notify other applications about changes made by an application and to listen for such changes made by others. This type of configuration incurs the most overhead, because it will constantly send and receive synchronization messages, but it is also the most powerful configuration. Cayenne currently supports the use of JMS and JavaGroups frameworks for synchronization, and also allows users to create their own transport mechanism. </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>Cayenne distribution archive does not include JavaGroups or JMS libraries. Those must be downloaded and installed separately. However until deployment phase, Cayenne does not require those libraries to be installed. </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>Cayenne distribution does not include JavaGroups or JMS libraries. Those must be downloaded and installed separately. However until deployment phase, Cayenne does not require those libraries to be installed.</td></tr></table></div>
<p>To configure distributed cache sharing, check "Remote Change Notifications" checkbox, and click "Configure" button to select and configure the type of transport to use.</p>
-<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><p>Synchronization is only done between remote DataDomains with the same name. Note that for JavaGroups configuration, a combination of multicast address and port must be unique for each DataDomain name.</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>Synchronization is only done between remote DataDomains with the same name. Note that for JavaGroups configuration, a combination of multicast address and port must be unique for each DataDomain name.</td></tr></table></div>
<h3><a name="ConfiguringCachingBehavior-ChoosingJavaGroupsoverJMS"></a>Choosing JavaGroups over JMS</h3>
@@ -85,6 +84,63 @@
<p>The conclusion is that using JMS is probably most appropriate when deploying within J2EE containers that already support this service, while JavaGroups can be used in almost any environment.</p>
+<h3><a name="ConfiguringCachingBehavior-ExampleJMSChangeNotificationConfiguration"></a>Example JMS Change Notification Configuration</h3>
+
+<p>This example shows how the JMS change notification configuration looks for a Cayenne servlet running in the <a href="http://www.eclipse.org/jetty" class="external-link" rel="nofollow">Jetty</a> servlet container. The example uses the <a href="http://activemq.apache.org/" class="external-link" rel="nofollow">Apache ActiveMQ</a> messaging broker.</p>
+
+<p>It is assumed that the Jetty deployment has been configured to "look in" <tt>$JETTYHOME/lib/ext</tt>. Also assumed is that the Jetty deployment is configured to support JNDI. Both of these configurations can be achieved by editing the following line in the <tt>start.ini</tt> to have the <tt>ext</tt> and <tt>plus</tt> values;</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java">OPTIONS=Server,jmx,resources,websocket,ext,plus
+</pre>
+</div></div>
+
+<p>The use of ActiveMQ assumes that the necessary client ActiveMQ "driver jar files" from the ActiveMQ distribution have been installed into the <tt>$JETTYHOME/lib/ext</tt> directory in the Jetty deployment.</p>
+
+<p>In this example, the ficticious Cayenne "Data Domain Name" is called "foo". In the Cayenne modeller, the "Remote Change Notifications" is checked and the "Connection Factory Name" is set to <tt>jms/footopicconnectionfactory</tt>.</p>
+
+<p>The following would appear in the <tt>$JETTYHOME/etc/jetty.xml</tt> file;</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java"><New class=<span class="code-quote">"org.eclipse.jetty.plus.jndi.Resource"</span>>
+<Arg></Arg>
+<Arg>jms/footopicconnectionfactory</Arg>
+<Arg>
+ <New class=<span class="code-quote">"org.apache.activemq.ActiveMQConnectionFactory"</span>>
+ <Arg>tcp:<span class="code-comment">//msg01.foo.co.nz:61616</Arg>
+</span> </New>
+</Arg>
+</New>
+
+<New class=<span class="code-quote">"org.eclipse.jetty.plus.jndi.Resource"</span>>
+<Arg>org_apache_cayenne_access_DataRowStore_foo</Arg>
+<Arg>
+ <New class=<span class="code-quote">"org.apache.activemq.command.ActiveMQTopic"</span>>
+ <Arg>foochangenotificationtopic</Arg>
+ </New>
+</Arg>
+</New>
+</pre>
+</div></div>
+
+<p>That following would appear in the servlet's <tt>web.xml</tt> deployment descriptor file;</p>
+
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<pre class="code-java"><resource-ref>
+<res-ref-name>jms/footopicconnectionfactory</res-ref-name>
+<res-type>javax.jms.TopicConnectionFactory</res-type>
+<res-auth>Container</res-auth>
+</resource-ref>
+
+<resource-env-ref>
+<resource-env-ref-name>org_apache_cayenne_access_DataRowStore_foo</resource-env-ref-name>
+<resource-env-ref-type>javax.jms.Topic</resource-env-ref-type>
+</resource-env-ref>
+</pre>
+</div></div>
+
+<p>This configuration should enable change notification to function.</p>
+
<h2><a name="ConfiguringCachingBehavior-Moreaboutcaching"></a>More about caching</h2>
<p>Read more about <a href="../../../../Documentation/Cayenne Guide/Caching and Fresh Data/index.html" title="Caching and Fresh Data">caching options here. </a></p></div>
@@ -93,7 +149,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Object Validation/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Configuring%20Deployment%20Settings/Configuring%20Object%20Validation/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Object Validation/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Object Validation/index.html Sun Nov 14 05:57:01 2010
@@ -56,7 +56,7 @@ Each DataDomain can be configured to ena
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Transactional Behavior/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Configuring%20Deployment%20Settings/Configuring%20Transactional%20Behavior/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Transactional Behavior/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Transactional Behavior/index.html Sun Nov 14 05:57:01 2010
@@ -58,7 +58,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Configuring%20Deployment%20Settings/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/index.html Sun Nov 14 05:57:01 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="data-domain.jpg" align="absmiddle" border="0" /></p>
+<p><span class="image-wrap" style=""><img src="modeler-datadomain.png?version=1&modificationDate=1261942536000" style="border: 0px solid black" /></span></p>
<h3><a name="ConfiguringDeploymentSettings-Sections"></a>Sections</h3>
@@ -67,7 +67,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/Cayenne%20User%20Directory/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Cayenne User Directory/index.html Sun Nov 14 05:57:01 2010
@@ -56,7 +56,7 @@
<h3><a name="CayenneUserDirectory-CayenneUserDirectoryLocation"></a>Cayenne User Directory Location</h3>
-<p>Cayenne User Directory is a filesystem directory called ".cayenne" (notice the dot in front of the name, it makes it "hidden" on UNIX operating systems) that is a subdirectory of a user HOME directory. HOME directory is OS and machine dependent. For example on Windows this is something like "C:\Documents and Settings\username\". Cayenne User Directory is created automatically when CayenneModeler is started on a user machine for the first time.</p>
+<p>Cayenne User Directory is a filesystem directory called ".cayenne" (notice the dot in front of the name, it makes it "hidden" on UNIX operating systems) that is a subdirectory of a user HOME directory. HOME directory is OS and machine dependent. For example on Windows this is something like <tt>"C:\Documents and Settings\username\"</tt>. Cayenne User Directory is created automatically when CayenneModeler is started on a user machine for the first time.</p>
<h3><a name="CayenneUserDirectory-AccessingCayenneUserDirectoryProgrammatically"></a>Accessing Cayenne User Directory Programmatically</h3>
@@ -67,15 +67,13 @@
<p><tt>prefs</tt>: preferences database subdirectory.<br/>
<tt>modeler.preferences</tt>: this is an old modeler preferences file. It is still used by CayenneModeler, but will be completely replaced by the preferences database in the future releases.<br/>
-<tt>cayenne-log.properties</tt>: Log4J configuration file for the Modeler.<br/>
-<tt>modeler.log</tt>: CayenneModeler log file.<br/>
-<tt>modeler.classpath</tt>: (unused) an old CLASSPATH configuration file that is now migrated to the preferences database.</p></div>
+<tt>modeler.log</tt>: CayenneModeler log file.</p></div>
</div>
<div class="clearer">.</div>
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/General%20Navigation/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/General Navigation/index.html Sun Nov 14 05:57:01 2010
@@ -52,25 +52,25 @@
<div id="ConfluenceContent"><h3><a name="GeneralNavigation-GeneralNavigation"></a>General Navigation</h3>
-<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>
+<p>CayenneModeler supports executing commands via its main menu, a button toolbar and contextual menus that open on right-click. All of the toolbar buttons have corresponding items in the menu that perform the 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-Toolbars"></a>Toolbars</h4>
<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><span class="image-wrap" style=""><img src="modeler-toolbar.png?version=1&modificationDate=1261941412000" 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=2&modificationDate=1152907573000" style="border: 0px solid black" /></span> <span class="image-wrap" style=""><img src="icon-open.gif?version=2&modificationDate=1152907655000" style="border: 0px solid black" /></span> <span class="image-wrap" style=""><img src="icon-save.gif?version=2&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 cayenne.xml) and zero or more DataNode (<b>.driver.xml) and DataMap (</b>.map.xml) 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>
+<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=2&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=2&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,29 +82,31 @@
<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=2&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%21iconderiveddbentity.gif%21%21iconobjentity.gif%21"></a>Entities: <img src="icon-dbentity.gif" align="absmiddle" border="0" /> <img src="icon-derived-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=2&modificationDate=1152907573000" style="border: 0px solid black" /></span> <span class="image-wrap" style=""><img src="icon-objentity.gif?version=2&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>
+<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>
-<p>There is a special kind of DbEntity - DerivedDbEntity - that has limited capabilities of defining "virtual" database views. DerivedDbEntity is deprecated in version 3.0 and should be avoided. Try using <a href="../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html" title="Scripting SQLTemplate">Scripting SQLTemplate</a> instead.</p>
+<h5><a name="GeneralNavigation-Embeddables%3A%21iconembeddable.gif%21"></a>Embeddables: <span class="image-wrap" style=""><img src="icon-embeddable.gif?version=1&modificationDate=1261941412000" style="border: 0px solid black" /></span></h5>
-<h5><a name="GeneralNavigation-Procedures%3A%21iconstoredprocedure.gif%21"></a>Procedures: <img src="icon-stored-procedure.gif" align="absmiddle" border="0" /></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>
-<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-Procedures%3A%21iconstoredprocedure.gif%21"></a>Procedures: <span class="image-wrap" style=""><img src="icon-stored-procedure.gif?version=2&modificationDate=1152907573000" style="border: 0px solid black" /></span></h5>
-<h5><a name="GeneralNavigation-Query%3A%21iconquery.gif%21"></a>Query: <img src="icon-query.gif" align="absmiddle" border="0" /></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>
-<p>Cayenne allows to store queries in the DataMap. There are three types of Cayenne queries that can be created in the Modeler - object select query, raw SQL query, and procedure query.</p></div>
+<h5><a name="GeneralNavigation-Query%3A%21iconquery.gif%21"></a>Query: <span class="image-wrap" style=""><img src="icon-query.gif?version=2&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>
<div class="clearer">.</div>
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/Running%20CayenneModeler/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html Sun Nov 14 05:57:01 2010
@@ -71,7 +71,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/index.html Sun Nov 14 05:57:01 2010
@@ -78,7 +78,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/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/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Migrate%20Changes%20between%20Model%20and%20Database/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Migrate Changes between Model and Database/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Migrate Changes between Model and Database/index.html Sun Nov 14 05:57:01 2010
@@ -52,38 +52,38 @@
<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>
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Database%20Layer/To%20Dep%20PK%20Checkbox/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html Sun Nov 14 05:57:01 2010
@@ -34,6 +34,7 @@
<li><a href="../../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a><ul>
+<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/Password Encoding/index.html">Password Encoding</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html">To Dep PK Checkbox</a><ul>
</ul>
</li>
@@ -63,7 +64,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Database%20Layer/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Database Layer/index.html Sun Nov 14 05:57:01 2010
@@ -34,6 +34,7 @@
<li><a href="../../../Documentation/Modeler Guide/Cayenne Project Structure/index.html">Cayenne Project Structure</a></li>
<li><a href="../../../Documentation/Modeler Guide/Common Modeling Tasks/index.html">Common Modeling Tasks</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/index.html">Modeling Database Layer</a><ul>
+<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/Password Encoding/index.html">Password Encoding</a></li>
<li><a href="../../../Documentation/Modeler Guide/Modeling Database Layer/To Dep PK Checkbox/index.html">To Dep PK Checkbox</a></li>
</ul>
</li>
@@ -63,7 +64,7 @@
<div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/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/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/CayenneModeler%20Flattened%20Relationships/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html Sun Nov 14 05:57:01 2010
@@ -35,9 +35,9 @@
<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>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a><ul>
@@ -56,18 +56,19 @@
</div>
<div id="ConfluenceContent"><h3><a name="CayenneModelerFlattenedRelationships-FlattenedRelationships"></a>Flattened Relationships</h3>
-<p>ObjRelationships that map to more than a single DbRelationship are called "flattened".</p>
+<p>ObjRelationships that map to more than a single DbRelationship are called <tt>"flattened"</tt>.</p>
<p>The most common case for using flattened relationships is modeling many-to-many relationships with a join table. E.g. ARTIST DbEntity has to-many relationship to ARTIST_EXHIBIT; ARTIST_EXHIBIT in turn has a to-one relationship to EXHIBIT DbEntity. We can create a single ObjRelationship from Artist ObjEntity to Exhibit ObjEntity that spawns two DbRelationships. This will be a to-many relationship. Lets say it is called "exhibitArray". Generated class file for Artist would contain a getExhibitArray() method returning a list of Exhibits for a given artist instance. An obvious advantage of having a flattened relationship in this case is to avoid mapping a join table as an object, meaningless in the context of the object model.</p>
<p>Flattened relationships work across any combination of to-one and to-many DbRelationships. If all the relationships are to-one, then the resulting flattened relationship is also to-one. If there is at least one to-many, the result is to-many as well.</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>Read-Only Note</b><br /><p>Most of flattened relationships are treated as read-only by Cayenne. Only one (the most commonly used) type is read/write. It is many-to-many (n:m) flattened relationships with a single join table.</p></td></tr></table></div>
-<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.</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>Read-Only Note</b><br />Most of flattened relationships are treated as read-only by Cayenne. Only one (the most commonly used) type is read/write. It is many-to-many (n:m) flattened relationships with a single join table.</td></tr></table></div>
-<p><img src="objrelationship-path-selection.jpg" align="absmiddle" border="0" /></p>
+<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>The dialog contains a DbRelationship table. Clicking on each row in this table will show valid choices of DbRelationships. Once you add a "chain" component, another row automatically opens below, so you can build a chain of arbitrary length.</p>
-<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>Join Table Tip</b><br /><p>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.</p></td></tr></table></div>
+<p><span class="image-wrap" style=""><img src="modeler-flattenedrelationship.png?version=1&modificationDate=1261944346000" 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>
<p>Further information about flattened relationships can be <a href="../../../../Documentation/Cayenne Guide/DataObjects/Flattened Relationships/index.html" title="Flattened Relationships">found here</a>.</p></div>
</div>
@@ -75,7 +76,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Delete%20Rules/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html Sun Nov 14 05:57:01 2010
@@ -35,9 +35,9 @@
<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>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html">CayenneModeler Flattened Relationships</a></li>
@@ -54,8 +54,7 @@
<li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
</ul>
</div>
-<div id="ConfluenceContent">
-<h3><a name="DeleteRules-DeleteRules"></a>Delete Rules</h3>
+<div id="ConfluenceContent"><h3><a name="DeleteRules-DeleteRules"></a>Delete Rules</h3>
<p>One of the columns in the Modeler ObjRelationships panel is "Delete Rule". It tells Cayenne what to do with related objects when a <b>source object</b> of the relationship is deleted. Cayenne will use this delete rule to perform cleanup of other objects after a given object was deleted from the graph. </p>
@@ -67,22 +66,22 @@
<ul>
- <li><b>Cascade Rule:</b> When a <b>source object</b> is deleted, any of the <b>target object(s)</b> will be deleted too. This may cause the whole tree of objects to be deleted with one command. This rule should be used when target object(s) of relationship can not exist without the source object. Example: <tt>Department.employeeArray</tt> relationship may use "Cascade" rule.</li>
+ <li><b>Cascade Rule:</b> When a <b>source object</b> is deleted, any of the <b>target object(s)</b> will be deleted too. This may cause the whole tree of objects to be deleted with one command. This rule should be used when target object(s) of relationship can not exist without the source object. Example: <tt>Department.employees</tt> relationship may use "Cascade" rule.</li>
</ul>
<ul>
- <li><b>Deny Rule:</b> When a <b>source object</b> is being deleted, but it has at least one <b>target object</b> this rule would generate a runtime exception on delete attempt. This rule is usually a reflection of certain business rules in the application. Example: <tt>Department.employeeArray</tt> relationship may use "Deny" rule if there is an application requirement that explicitly states that non-empty departments can not be deleted.</li>
+ <li><b>Deny Rule:</b> When a <b>source object</b> is being deleted, but it has at least one <b>target object</b> this rule would generate a runtime exception on delete attempt. This rule is usually a reflection of certain business rules in the application. Example: <tt>Department.employees</tt> relationship may use "Deny" rule if there is an application requirement that explicitly states that non-empty departments can not be deleted.</li>
</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>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Many-to-Many%20Relationships/index.html?rev=1034936&r1=1034935&r2=1034936&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html Sun Nov 14 05:57:01 2010
@@ -35,9 +35,9 @@
<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>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html">Modeling Enumerations</a></li>
<li><a href="../../../../Documentation/Modeler Guide/Modeling Object Layer/Many-to-Many Relationships/index.html">Many-to-Many Relationships</a><ul>
</ul>
@@ -67,7 +67,7 @@
<div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
<div class="smalltext copyright">
- Copyright ©2001-2008 Apache Software Foundation
+ Copyright ©2001-2010 Apache Software Foundation
</div>
</body>