cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r773768 [2/2] - in /cayenne/main/trunk/docs/doc/src/main/resources: ./ doc/Documentation/ doc/Documentation/Cayenne Guide/Ant Tasks/ doc/Documentation/Cayenne Guide/Ant Tasks/cdataport/ doc/Documentation/Cayenne Guide/Ant Tasks/cdbgen/ doc/...
Date Tue, 12 May 2009 02:41:05 GMT
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Lifecycle%20Callbacks/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Lifecycle Callbacks/index.html Tue May 12 02:41:03 2009
@@ -51,7 +51,7 @@
 </div>
 <div id="ConfluenceContent"><h2><a name="LifecycleCallbacks-LifecycleCallbacks"></a>Lifecycle Callbacks</h2>
 
-<p>Users can register callback methods that will be invoked during the lifecycle of persistent objects. Callback mechanism matches closely the one defined in the <a href="../../../Documentation/JPA Guide/index.html" title="JPA Guide">JPA Specification</a> (except that it works with JDK 1.4 and allows preconfigured listeners). There are seven lifecycle callbacks described below (PrePersist, PostPersist, PreUpdate, PostUpdate, PreRemove, PostRemove, PostLoad). There are two types of invocations for each one of them: <b>callback on a persistent object</b> itself or a <b>callback on  an arbitrary listener object</b>.</p>
+<p>Users can register callback methods that will be invoked during the lifecycle of persistent objects. Callback mechanism matches closely the one defined in the <a href="http://cwiki.apache.org/confluence/confluence/display/CAYJPA/JPA+Guide" title="JPA Guide">JPA Specification</a> (except that it works with JDK 1.4 and allows preconfigured listeners). There are seven lifecycle callbacks described below (PrePersist, PostPersist, PreUpdate, PostUpdate, PreRemove, PostRemove, PostLoad). There are two types of invocations for each one of them: <b>callback on a persistent object</b> itself or a <b>callback on  an arbitrary listener object</b>.</p>
 
 <table cellpadding='5' width='85%' cellspacing='8px' class='noteMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b class="strong">Callbacks feature supercedes the following 1.2/2.0 features:</b><br />
 <ul>
@@ -105,7 +105,7 @@
 <h2><a name="LifecycleCallbacks-TypesofCallbacks"></a>Types of Callbacks</h2>
 
 
-<p>Valid callback types are defined as int constants in the <tt>LifecycleListener</tt> interface.</p>
+<p>Valid callback types are defined as Java enumerated constants in the <tt>org.apache.cayenne.map.LifecycleEvent</tt> enumeration.</p>
 
 <table class='confluenceTable'><tbody>
 <tr>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Maven2%20Plugins/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/index.html Tue May 12 02:41:03 2009
@@ -46,6 +46,7 @@
 <li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/index.html">Maven2 Plugins</a><ul>
 <li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html">maven2-cgen</a></li>
 <li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html">maven2-cdbgen</a></li>
+<li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html">maven2-cdbimport</a></li>
 <li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html">maven2-modeler</a></li>
 </ul>
 </li>
@@ -54,7 +55,7 @@
 </div>
 <div id="ConfluenceContent"><h2><a name="Maven2Plugins-Maven2Plugins"></a>Maven2 Plugins</h2>
 
-<p>Cayenne ships two plugins that provide Maven 2 frontend to a number of useful operations in Cayenne. </p>
+<p>Cayenne ships three plugins that provide Maven 2 frontend to a number of useful operations in Cayenne. </p>
 
 <h3><a name="Maven2Plugins-mavencayenneplugin"></a>maven-cayenne-plugin</h3>
 
@@ -77,6 +78,7 @@
 <ul>
 	<li><b><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html" title="maven2-cgen">cayenne:cgen</a></b> - Java class generator</li>
 	<li><b><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html" title="maven2-cdbgen">cayenne:cdbgen</a></b> - Database schema generator</li>
+	<li><b><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html" title="maven2-cdbimport">cayenne:cdbimport</a></b> - Database schema importer</li>
 </ul>
 
 
@@ -114,6 +116,7 @@
 <ol>
 	<li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html" title="maven2-cgen">maven2&#45;cgen</a></li>
 	<li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html" title="maven2-cdbgen">maven2&#45;cdbgen</a></li>
+	<li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html" title="maven2-cdbimport">maven2&#45;cdbimport</a></li>
 	<li><a href="../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html" title="maven2-modeler">maven2&#45;modeler</a></li>
 </ol>
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Maven2%20Plugins/maven2-cdbgen/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html Tue May 12 02:41:03 2009
@@ -48,6 +48,7 @@
 <li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html">maven2-cdbgen</a><ul>
 </ul>
 </li>
+<li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html">maven2-cdbimport</a></li>
 <li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html">maven2-modeler</a></li>
 </ul>
 </li>

Added: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Maven2%20Plugins/maven2-cdbimport/index.html?rev=773768&view=auto
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html (added)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html Tue May 12 02:41:03 2009
@@ -0,0 +1,195 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+<html>
+  <head>
+    <title>Apache Cayenne Documentation - maven2-cdbimport</title>
+    <style type="text/css">@import "../../../../style.css";</style>
+  </head>
+<body>
+  <div class="header">
+    <div style="float: left;"><a href="http://cayenne.apache.org/"><img src="../../../../images/logo.gif" align="absmiddle" border="0"></a></div>
+    <span class="logoSpaceLink"><a href="../../../../index.html">Cayenne User Documentation</a></span><br />
+    <span class="pagetitle">maven2-cdbimport</span>
+  </div>
+<div id="cayenne_toc">
+<ul>
+<li><a href="../../../../Documentation/Cayenne Guide/Introduction/index.html">Introduction</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Installation/index.html">Installation</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Quick Start/index.html">Quick Start</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Design/index.html">Design</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/DataContext/index.html">DataContext</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Queries/index.html">Queries</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/DataObjects/index.html">DataObjects</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Stored Procedures/index.html">Stored Procedures</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Expressions/index.html">Expressions</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Lifecycle Callbacks/index.html">Lifecycle Callbacks</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Performance Tuning/index.html">Performance Tuning</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Caching and Fresh Data/index.html">Caching and Fresh Data</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Deployment/index.html">Deployment</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Ant Tasks/index.html">Ant Tasks</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/index.html">Maven2 Plugins</a><ul>
+<li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html">maven2-cgen</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html">maven2-cdbgen</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html">maven2-cdbimport</a><ul>
+</ul>
+</li>
+<li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html">maven2-modeler</a></li>
+</ul>
+</li>
+<li><a href="../../../../Documentation/Cayenne Guide/Customization/index.html">Customization</a></li>
+</ul>
+</div>
+<div id="ConfluenceContent"><p><tt>cdbimport</tt> is a Maven 2 mojo that that uses Cayenne to generate a DataMap based on an existing database schema.  By default, it is bound to the <tt>generate-sources</tt> phase.  This allows you to generate your DataMap prior to building your project, which may be necessary if you are also using the <a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html" title="maven2-cgen">cgen</a> task.</p>
+
+<h3><a name="maven2-cdbimport-Parameters%28asXMLelements%29"></a>Parameters (as XML elements)</h3>
+
+<table class='confluenceTable'><tbody>
+<tr>
+<th class='confluenceTh'> Attribute </th>
+<th class='confluenceTh'> Description </th>
+<th class='confluenceTh'> Required </th>
+</tr>
+<tr>
+<td class='confluenceTd'> map </td>
+<td class='confluenceTd'> DataMap XML file to use as a schema descriptor. </td>
+<td class='confluenceTd'> Yes </td>
+</tr>
+<tr>
+<td class='confluenceTd'> overwriteExisting </td>
+<td class='confluenceTd'> Indicates whether existing DB and object entities should be overwritten.  This is an all-or-nothing setting.  If you need finer granularity, please  use the Cayenne Modeler.  Default is <tt>true</tt>. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+<tr>
+<td class='confluenceTd'> schemaName </td>
+<td class='confluenceTd'> Database schema to use for importing. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+<tr>
+<td class='confluenceTd'> tablePattern </td>
+<td class='confluenceTd'> Pattern to match tables against for import.  Default is to match all tables. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+<tr>
+<td class='confluenceTd'> importProcedures </td>
+<td class='confluenceTd'> Indicates whether stored procedures should be imported.  Default is <tt>false</tt>. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+<tr>
+<td class='confluenceTd'> procedurePattern </td>
+<td class='confluenceTd'> Pattern to match stored procedures against for import.  Default is to match all stored procedures.  This value is only meaningful if <tt>importProcedures</tt> is <tt>true</tt>. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+<tr>
+<td class='confluenceTd'> meaningfulPk </td>
+<td class='confluenceTd'> Indicates whether primary keys should be mapped as attributes of the object entity.  Default is <tt>false</tt>. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+<tr>
+<td class='confluenceTd'> namingStrategy </td>
+<td class='confluenceTd'> The naming strategy used for mapping database names to object entity names.  Default is <tt>org.apache.cayenne.map.naming.SmartNamingStrategy</tt>. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+<tr>
+<td class='confluenceTd'> adapter </td>
+<td class='confluenceTd'> Java class name implementing org.apache.cayenne.dba.DbAdapter. While this attribute is optional (a generic JdbcAdapter is used if not set), it is highly recommended to specify correct target adapter. </td>
+<td class='confluenceTd'> No (but strongly recommended) </td>
+</tr>
+<tr>
+<td class='confluenceTd'> driver </td>
+<td class='confluenceTd'> A class of JDBC driver to use for the target database. </td>
+<td class='confluenceTd'> Yes </td>
+</tr>
+<tr>
+<td class='confluenceTd'> url </td>
+<td class='confluenceTd'> JDBC connection URL of a target database. </td>
+<td class='confluenceTd'> Yes </td>
+</tr>
+<tr>
+<td class='confluenceTd'> username </td>
+<td class='confluenceTd'> Database user name. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+<tr>
+<td class='confluenceTd'> password </td>
+<td class='confluenceTd'> Database user password. </td>
+<td class='confluenceTd'> No </td>
+</tr>
+</tbody></table>
+
+
+<h3><a name="maven2-cdbimport-Examples"></a>Examples</h3>
+
+<p>Load the Maven 2 plugin and configure the <tt>cdbimport</tt> mojo:</p>
+<div class="code"><div class="codeContent">
+<pre class="code-xml"><span class="code-tag">&lt;build&gt;</span>
+    <span class="code-tag">&lt;plugins&gt;</span>
+        <span class="code-tag">&lt;plugin&gt;</span>
+            <span class="code-tag">&lt;groupId&gt;</span>org.apache.cayenne.plugins<span class="code-tag">&lt;/groupId&gt;</span>
+      	    <span class="code-tag">&lt;artifactId&gt;</span>maven-cayenne-plugin<span class="code-tag">&lt;/artifactId&gt;</span>
+      	    <span class="code-tag">&lt;executions&gt;</span>
+                <span class="code-tag">&lt;execution&gt;</span>
+      		    <span class="code-tag">&lt;id&gt;</span>cdbimport<span class="code-tag">&lt;/id&gt;</span>
+      		    <span class="code-tag">&lt;configuration&gt;</span>
+      			<span class="code-tag"><span class="code-comment">&lt;!-- Configuration items go in here.  See table, above. --&gt;</span></span>
+      		    <span class="code-tag">&lt;/configuration&gt;</span>
+      		    <span class="code-tag">&lt;goals&gt;</span>
+      			<span class="code-tag">&lt;goal&gt;</span>cdbimport<span class="code-tag">&lt;/goal&gt;</span>
+      		    <span class="code-tag">&lt;/goals&gt;</span>
+      		<span class="code-tag">&lt;/execution&gt;</span>
+      	    <span class="code-tag">&lt;/executions&gt;</span>
+        <span class="code-tag">&lt;/plugin&gt;</span>
+    <span class="code-tag">&lt;/plugins&gt;</span>
+<span class="code-tag">&lt;/build&gt;</span></pre>
+</div></div>
+<p>Here is an example of using <tt>cdbimport</tt> to create DB schema objects on a local HSQLDB database named "bookmarker" from a DataMap located in "main/resources/datamap.map.xml":</p>
+<div class="code"><div class="codeContent">
+<pre class="code-xml"><span class="code-tag">&lt;build&gt;</span>
+    <span class="code-tag">&lt;plugins&gt;</span>
+        <span class="code-tag">&lt;plugin&gt;</span>
+            <span class="code-tag">&lt;groupId&gt;</span>org.apache.cayenne.plugins<span class="code-tag">&lt;/groupId&gt;</span>
+      	    <span class="code-tag">&lt;artifactId&gt;</span>maven-cayenne-plugin<span class="code-tag">&lt;/artifactId&gt;</span>
+      	    <span class="code-tag">&lt;executions&gt;</span>
+                <span class="code-tag">&lt;execution&gt;</span>
+      		    <span class="code-tag">&lt;id&gt;</span>cdbimport<span class="code-tag">&lt;/id&gt;</span>
+      		    <span class="code-tag">&lt;configuration&gt;</span>
+      			<span class="code-tag">&lt;map&gt;</span>${project.build.sourceDirectory}/../resources/datamap.map.xml<span class="code-tag">&lt;/map&gt;</span>
+                        <span class="code-tag">&lt;adapter&gt;</span>org.apache.cayenne.dba.hsqldb.HSQLDBAdapter<span class="code-tag">&lt;/adapter&gt;</span>
+                        <span class="code-tag">&lt;driver&gt;</span>org.hsqldb.jdbcDriver<span class="code-tag">&lt;/driver&gt;</span>
+                        <span class="code-tag">&lt;url&gt;</span>jdbc:hsqldb:hsql://localhost/bookmarker<span class="code-tag">&lt;/url&gt;</span>
+                        <span class="code-tag">&lt;username&gt;</span>sa<span class="code-tag">&lt;/username&gt;</span>
+      		    <span class="code-tag">&lt;/configuration&gt;</span>
+      		    <span class="code-tag">&lt;goals&gt;</span>
+      			<span class="code-tag">&lt;goal&gt;</span>cdbimport<span class="code-tag">&lt;/goal&gt;</span>
+      		    <span class="code-tag">&lt;/goals&gt;</span>
+      		<span class="code-tag">&lt;/execution&gt;</span>
+      	    <span class="code-tag">&lt;/executions&gt;</span>
+        <span class="code-tag">&lt;/plugin&gt;</span>
+    <span class="code-tag">&lt;/plugins&gt;</span>
+<span class="code-tag">&lt;/build&gt;</span></pre>
+</div></div></div>
+</div>
+  <div class="clearer">.</div>
+  <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>
+
+  <div class="smalltext copyright">
+    Copyright &copy;2001-2008 Apache Software Foundation
+  </div>
+
+</body>
+</html>

Propchange: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Maven2%20Plugins/maven2-cgen/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html Tue May 12 02:41:03 2009
@@ -48,6 +48,7 @@
 </ul>
 </li>
 <li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html">maven2-cdbgen</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html">maven2-cdbimport</a></li>
 <li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html">maven2-modeler</a></li>
 </ul>
 </li>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Maven2%20Plugins/maven2-modeler/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html Tue May 12 02:41:03 2009
@@ -46,6 +46,7 @@
 <li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/index.html">Maven2 Plugins</a><ul>
 <li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cgen/index.html">maven2-cgen</a></li>
 <li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbgen/index.html">maven2-cdbgen</a></li>
+<li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-cdbimport/index.html">maven2-cdbimport</a></li>
 <li><a href="../../../../Documentation/Cayenne Guide/Maven2 Plugins/maven2-modeler/index.html">maven2-modeler</a><ul>
 </ul>
 </li>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/EJBQLQuery/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html Tue May 12 02:41:03 2009
@@ -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="../../../../Documentation/JPA Guide/index.html" 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="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>
 
 <h3><a name="EJBQLQuery-EJBQLSyntax"></a>EJBQL Syntax</h3>
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Queries/SQLTemplate%20Query/Advanced%20SQLTemplate/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Queries/SQLTemplate Query/Advanced SQLTemplate/index.html Tue May 12 02:41:03 2009
@@ -73,13 +73,13 @@
 
 <p>Queries like <tt>"SELECT * FROM..."</tt> and even <tt>"SELECT COLUMN1, COLUMN2, ... FROM ..."</tt> can sometimes result in Cayenne exceptions on attempts to convert fetched DataRows to objects. Essentially any query that is not using a <a href="../../../../../Documentation/Cayenne Guide/Queries/SQLTemplate Query/Scripting SQLTemplate/index.html" title="Scripting SQLTemplate">#result directive</a> to describe the result set is prone to this problem, as different databases may produce different capitalization of the <tt>java.sql.ResultSet</tt> columns. </p>
 
-<p>The most universal way to address this issue is to describe each column explicitly in the SQLTemplate via <tt>#result</tt> directive, as mentioned above: <tt>"SELECT #result('column1'), #result('column2'), .."</tt>. However this becomes unpractical for the tables with lots of columns. For such cases Cayenne provides a shortcut based on the fact that normally an ORM mapping follows some naming convention for the column names. Simply put, for case-insensitive databases developers normall use either <b>all lowercase</b> or <b>all uppercase</b> column names.</p>
+<p>The most universal way to address this issue is to describe each column explicitly in the SQLTemplate via <tt>#result</tt> directive, as mentioned above: <tt>"SELECT #result('column1'), #result('column2'), .."</tt>. However this becomes unpractical for the tables with lots of columns. For such cases Cayenne provides a shortcut based on the fact that normally an ORM mapping follows some naming convention for the column names. Simply put, for case-insensitive databases developers normally use either <b>all lowercase</b> or <b>all uppercase</b> column names.</p>
 
 <p>Here is the API to force Cayenne to follow the naming convention (also available as a dropdown in the Modeler). <em>Note that you shouldn't bother with this unless you are getting CayenneRuntimeExceptions when fetching with SQLTemplate.</em></p>
 
 <div class="code"><div class="codeContent">
 <pre class="code-java">SQLTemplate query = <span class="code-keyword">new</span> SQLTemplate(<span class="code-quote">"SELECT * FROM ARTIST"</span>);
-query.setColumnNamesCapitalization(SQLTemplate.LOWERCASE_COLUMN_NAMES);
+query.setColumnNamesCapitalization(CapsStrategy.LOWER);
 List objects = context.performQuery(query);</pre>
 </div></div>
 
@@ -87,7 +87,7 @@
 
 <div class="code"><div class="codeContent">
 <pre class="code-java">SQLTemplate query = <span class="code-keyword">new</span> SQLTemplate(<span class="code-quote">"SELECT * FROM ARTIST"</span>);
-query.setColumnNamesCapitalization(SQLTemplate.UPPERCASE_COLUMN_NAMES);
+query.setColumnNamesCapitalization(CapsStrategy.UPPER);
 List objects = context.performQuery(query);</pre>
 </div></div>
 

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=773768&r1=773767&r2=773768&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 Tue May 12 02:41:03 2009
@@ -53,8 +53,7 @@
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent">
-<h3><a name="ReverseEngineerDatabase-ReverseEngineerDatabase"></a>Reverse Engineer Database</h3>
+<div id="ConfluenceContent"><h3><a name="ReverseEngineerDatabase-ReverseEngineerDatabase"></a>Reverse Engineer Database</h3>
 
 
 <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 &gt; Reengineer Database Schema" from the menu. "Connect to Database" dialog will be presented.</p>
@@ -63,13 +62,21 @@
 
 <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.jpg" align="absmiddle" border="0" /></p>
+<p><img src="reengineer-connect.png" align="absmiddle" border="0" /></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>
 
-<p>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><b>Naming strategies.</b> Since Cayenne 3.0 you can obtain control over DbRelationship, ObjEntity, ObjAttribute and ObjRelationship names generation. This is achieved by implementing org.apache.cayenne.map.naming.NamingStrategy interface. Modeler itself is distrubuted with two default strategies.</p>
 
-<p><img src="reengineer-schema.jpg" align="absmiddle" border="0" /></p></div>
+<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 <span class="nobr"><a href="https://inflector.dev.java.net/" title="Visit page outside Confluence" rel="nofollow">Inflector<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</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-&gt;Preferences-&gt;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>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>

Added: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/reengineer-connect.png
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Reverse%20Engineer%20Database/reengineer-connect.png?rev=773768&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/reengineer-connect.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/reengineer-schema.png
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Reverse%20Engineer%20Database/reengineer-schema.png?rev=773768&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/reengineer-schema.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Database Support/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Database%20Support/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Database Support/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Database Support/index.html Tue May 12 02:41:03 2009
@@ -60,7 +60,6 @@
 
 
 <h3><a name="DatabaseSupport-Derby"></a>Derby</h3>
-<p><em>(since Cayenne 1.2)</em></p>
 
 <table class='confluenceTable'><tbody>
 <tr>
@@ -117,7 +116,6 @@
 </tbody></table>
 
 <h3><a name="DatabaseSupport-FrontBase"></a>FrontBase</h3>
-<p><em>(since Cayenne 1.2)</em></p>
 
 <table class='confluenceTable'><tbody>
 <tr>
@@ -184,7 +182,7 @@
 </tr>
 <tr>
 <td class='confluenceTd'>Sample URL</td>
-<td class='confluenceTd'>jjdbc:h2:mem:myTestMem;MVCC=TRUE</td>
+<td class='confluenceTd'>jdbc:h2:mem:myTestMem;MVCC=TRUE</td>
 </tr>
 </tbody></table>
 
@@ -316,11 +314,11 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <th class='confluenceTh'>&nbsp;</th>
-<th class='confluenceTh'>Microsoft Driver - SQL Server 2005</th>
+<th class='confluenceTh'>Microsoft Driver - SQL Server</th>
 </tr>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.microsoft.com/sql/technologies/jdbc/default.mspx" title="Visit page outside Confluence" rel="nofollow">http://www.microsoft.com/sql/technologies/jdbc/default.mspx<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><span class="nobr"><a href="http://msdn.microsoft.com/en-us/data/aa937724.aspx" title="Visit page outside Confluence" rel="nofollow">http://msdn.microsoft.com/en-us/data/aa937724.aspx<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -335,10 +333,6 @@
 <th class='confluenceTh'>Microsoft Driver - SQL Server prior to 2005</th>
 </tr>
 <tr>
-<td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.microsoft.com/sql/default.asp" title="Visit page outside Confluence" rel="nofollow">http://www.microsoft.com/sql/default.asp<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
-</tr>
-<tr>
 <td class='confluenceTd'>Driver Name</td>
 <td class='confluenceTd'>com.microsoft.jdbc.sqlserver.SQLServerDriver</td>
 </tr>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.1 Features/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide%20to%201.1%20Features/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.1 Features/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.1 Features/index.html Tue May 12 02:41:03 2009
@@ -57,7 +57,7 @@
 
 <p>Cayenne now provides a way to share its object cache between DataContexts in the same JVM and across JVMs. The following chapters in the user guide describe this feature:</p>
 <ul>
-	<li><a href="../../../Documentation/Cayenne Guide/Caching and Fresh Data/Object Caching/index.html" title="Object Caching">Object Caching</a></li>
+	<li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYDOC12/Object+Caching" title="Object Caching">CAYDOC12:Object Caching</a></li>
 	<li><a href="../../../Documentation/Cayenne Guide/Queries/Caching Query Results/index.html" title="Caching Query Results">Caching Query Results</a></li>
 	<li><a href="../../../Documentation/Cayenne Guide/Performance Tuning/Caching Lookup Tables/index.html" title="Caching Lookup Tables">Caching Lookup Tables</a></li>
 </ul>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.2 Features/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide%20to%201.2%20Features/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.2 Features/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 1.2 Features/index.html Tue May 12 02:41:03 2009
@@ -141,7 +141,7 @@
 
 
 <ul>
-	<li><a href="../../../Documentation/Cayenne Guide/DataContext/Nested DataContexts/index.html" title="Nested DataContexts">DataContexts Nesting</a> that allows to perform partial in-memory commits/rollbacks.</li>
+	<li><a href="../../../Documentation/Cayenne Guide/DataContext/Nested Contexts/index.html" title="Nested Contexts">DataContexts Nesting</a> that allows to perform partial in-memory commits/rollbacks.</li>
 </ul>
 
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 3.0 Features/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide%20to%203.0%20Features/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 3.0 Features/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/Guide to 3.0 Features/index.html Tue May 12 02:41:03 2009
@@ -62,26 +62,8 @@
 
 
 <h2><a name="Guideto3.0Features-CayenneJPAProvider"></a>Cayenne JPA Provider</h2>
-<p><em>(status: preview)</em></p>
-
-<p>Cayenne 3.0 includes an in-progress partial implementation of a <span class="nobr"><a href="http://jcp.org/en/jsr/detail?id=220" title="Visit page outside Confluence" rel="nofollow">Java Persistence API specification<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> compliant persistence provider, with support for POJO and JPA annotations. Provider can be used in a standalone mode, as well as a part of a J2EE container.</p>
-
-<p>Currently implemented features:</p>
-
-<ul>
-	<li>Provider, EntityManagerFactory, EntityManager API bridge to the current Cayenne stack</li>
-	<li>Loading mapping from annotations</li>
-	<li>Loading mapping from XML</li>
-	<li>Class enhancement</li>
-	<li>Field-based access and property-based access</li>
-	<li>EJBQL</li>
-	<li>Entity callbacks</li>
-	<li>All types of relationships and simple properties</li>
-	<li>Embeddables</li>
-	<li>Single table inheritance</li>
-</ul>
-
 
+<p><em>Note that Cayenne JPA provider work has been frozen and it IS NOT included in 3.0. If you have further questions or would like to give a hand with the JPA work, please send a note to <span class="nobr"><a href="http://cayenne.apache.org/mailing-lists.html" title="Visit page outside Confluence" rel="nofollow">developer mailing list<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</em></p>
 
 <h2><a name="Guideto3.0Features-ObjectRelationalMapping"></a>Object Relational Mapping</h2>
 
@@ -118,8 +100,6 @@
 
 <h2><a name="Guideto3.0Features-CayennePersistenceAPI"></a>Cayenne Persistence API</h2>
 
-<p>Many of the improvements below were done to support the JPA provider, still Cayenne applications can take advantage from all of these things without using JPA.</p>
-
 <h3><a name="Guideto3.0Features-Java5Migration"></a>Java 5 Migration</h3>
 
 <p>Cayenne now requires Java 5 or newer to run. This allowed us to start using generics, enums and other Java 5 features.</p>
@@ -136,9 +116,8 @@
 <p>This protects your code from the evolution of the underlying implementation, allows you to customize context behavior by using interface wrappers. There are plans to update all Cayenne API to return ObjectContext everywhere DataContext might be returned.</p>
 
 <h3><a name="Guideto3.0Features-EJBQLQueries"></a>EJB QL Queries</h3>
-<p><em>(as of M3 there's no Modeler support)</em></p>
 
-<p>Never mind the "EJB" in the name. EJBQL queries are a powerful object query mechanism borrowed from the JPA specification and added to Cayenne API. <a href="../../../Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html" title="EJBQLQuery">EJBQLQuery</a> is a first-class citizen, just like SelectQuery.</p>
+<p>Never mind the "EJB" in the name. EJBQL queries are a powerful object query mechanism similar to the one supported by the JPA specification. <a href="../../../Documentation/Cayenne Guide/Queries/EJBQLQuery/index.html" title="EJBQLQuery">EJBQLQuery</a> is a first-class citizen, just like SelectQuery.</p>
 
 <h3><a name="Guideto3.0Features-SQLTemplateQueryImprovements"></a>SQLTemplate Query Improvements</h3>
 
@@ -150,7 +129,7 @@
 
 <h3><a name="Guideto3.0Features-EntityLifecycleCallbacks"></a>Entity Lifecycle Callbacks</h3>
 
-<p>Just like EJBQL, lifecycle callbacks is a JPA-inspired feature that allows to perform custom operations at certain points in the object lifecycle. For more details see <a href="../../../Documentation/Cayenne Guide/Lifecycle Callbacks/index.html" title="Lifecycle Callbacks">this page</a>.</p>
+<p>Cayenne lifecycle callbacks are similar to callbacks defined in the JPA specification. This is a feature that allows to perform custom operations at certain points in the object lifecycle. For more details see <a href="../../../Documentation/Cayenne Guide/Lifecycle Callbacks/index.html" title="Lifecycle Callbacks">this page</a>.</p>
 
 <h3><a name="Guideto3.0Features-GeneralQueryImprovements"></a>General Query Improvements</h3>
 
@@ -169,7 +148,6 @@
 	<li><a href="../../../Documentation/Cayenne Guide/Caching and Fresh Data/index.html" title="Caching and Fresh Data">pluggable query cache</a></li>
 	<li>a notion of Query cache groups</li>
 	<li>automated cache key management for standard queries</li>
-	<li><a href="../../../Documentation/Cayenne Guide/Caching and Fresh Data/RefreshQuery/index.html" title="RefreshQuery">RefreshQuery</a></li>
 </ul>
 
 
@@ -219,9 +197,11 @@
 
 <h2><a name="Guideto3.0Features-RemoteObjectPersistence"></a>Remote Object Persistence</h2>
 
-<h3><a name="Guideto3.0Features-ValidationcallbackssupportforROPObjectContext."></a>Validation callbacks support for ROP ObjectContext. </h3>
+<h3><a name="Guideto3.0Features-ValidationcallbackssupportforROPObjectContext"></a>Validation callbacks support for ROP ObjectContext</h3>
 <p>Now object validation works the same way on the ROP client as it did on the server.</p>
 
+<h3><a name="Guideto3.0Features-NestedcontextssupportforROPObjectContext"></a>Nested contexts support for ROP ObjectContext</h3>
+<p>Nested contexts can now be created for ROP contexts. Creation method is added to ObjectContext interface.</p>
 
 
 <h2><a name="Guideto3.0Features-CayenneModeler"></a>CayenneModeler</h2>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Overview/index.html Tue May 12 02:41:03 2009
@@ -48,19 +48,15 @@
 
 <h2><a name="Overview-FlavorsofCayenne"></a>Flavors of Cayenne</h2>
 
-<p>Cayenne framework provides three flavors of object persistence: Cayenne Persistence API, Remote Object Persistence (ROP) and Java Persistence API (JPA). All three are dealing with object persistence, and are based on the same underlying Cayenne stack. <b>If you are in doubt which one to choose, go with "Cayenne Persistence API" - this is a universal choice appropriate for most Java applications.</b> But what are the differences between the three?</p>
-<ul>
-	<li><b><a href="../../Documentation/Cayenne Guide/index.html" title="Cayenne Guide"><b>Cayenne Persistence API</b></a></b> is a general purpose object-relational API and XML mapping format. CayenneModeler GUI tool is used to create the mapping. When we say "Cayenne" throughout the documentation, we usually mean Cayenne Persistence API flavor, unless JPA or ROP is explicitly mentioned.</li>
-</ul>
-
+<p>Cayenne framework provides two flavors of object persistence: Cayenne Persistence API and Remote Object Persistence (ROP). Both are dealing with object persistence, and are based on the same underlying Cayenne stack:</p>
 
 <ul>
-	<li><b><a href="../../Documentation/Remote Object Persistence Guide/index.html" title="Remote Object Persistence Guide"><b>Remote Object Persistence (ROP)</b></a></b> is <b>not a standalone persistence API</b>. Rather this is a technology that enables the use of Cayenne Persistence API on remote client applications. This architecture is demonstrated <a href="../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html" title="Remote Object Persistence Introduction">here</a>. Often (but not always) ROP clients are SWT or Swing applications that can not (or should not) access the database directly, and/or benefit from separation of the server and client logic.</li>
+	<li><b><a href="../../Documentation/Cayenne Guide/index.html" title="Cayenne Guide"><b>Cayenne Persistence API</b></a></b> is a general purpose object-relational API and XML mapping format. CayenneModeler GUI tool is used to create the mapping. When we say "Cayenne" throughout the documentation, we usually mean Cayenne Persistence API flavor, unless ROP is explicitly mentioned.</li>
 </ul>
 
 
 <ul>
-	<li><b><a href="../../Documentation/JPA Guide/index.html" title="JPA Guide"><b>Java Persistence API (JPA)</b></a></b> <font color="red">(alpha, new in 3.0)</font> is an emerging Java standard for object relational mapping (it is a part of EJB3). JPA mapping is commonly done via annotations directly on Java classes. The advantage of JPA is standardized mapping and persistence API, that in theory allows to switch provider vendors. The disadvantage is that the underlying provider implementation is completely hidden from the application, making it less flexible. <em>As of the early 3.0 milestones, implementation of the JPA provider in Cayenne is not complete.</em></li>
+	<li><b><a href="../../Documentation/Remote Object Persistence Guide/index.html" title="Remote Object Persistence Guide"><b>Remote Object Persistence (ROP)</b></a></b> is <b>not a standalone persistence API</b>. Rather this is a technology that enables the use of Cayenne Persistence API on remote client applications. This architecture is demonstrated <a href="../../Documentation/Remote Object Persistence Guide/Remote Object Persistence Introduction/index.html" title="Remote Object Persistence Introduction">here</a>. Often (but not always) ROP clients are SWT or Swing applications that can not (or should not) access the database directly, and/or benefit from separation of the server and client logic.</li>
 </ul>
 
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Installation/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Installation/index.html Tue May 12 02:41:03 2009
@@ -51,7 +51,7 @@
 
 <h3><a name="RemoteObjectPersistenceInstallation-ServerJarFiles"></a>Server Jar Files</h3>
 
-<p>Cayenne web service is no different from a regular Cayenne application, so it requires <b><tt>cayenne-server.jar</tt></b> and all standard dependencies. One additional required third party library is <b><tt>hessian.jar</tt></b>, version 3.1.5, which is included in "lib/third-party" or can be downloaded from <span class="nobr"><a href="http://www.caucho.com/hessian/" title="Visit page outside Confluence" rel="nofollow">http://www.caucho.com/hessian/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</p>
+<p>Cayenne web service is no different from a regular Cayenne application, so it requires <b><tt>cayenne-server.jar</tt></b> and all standard dependencies. One additional required third party library is <b><tt>hessian.jar</tt></b>, version 3.1.6, which is included in "lib/third-party" or can be downloaded from <span class="nobr"><a href="http://www.caucho.com/hessian/" title="Visit page outside Confluence" rel="nofollow">http://www.caucho.com/hessian/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</p>
 
 <h3><a name="RemoteObjectPersistenceInstallation-ClientJarFiles"></a>Client Jar Files</h3>
 
@@ -60,9 +60,11 @@
 <ul>
 	<li><span class="nobr"><a href="http://jakarta.apache.org/commons/logging/" title="Visit page outside Confluence" rel="nofollow">Apache Commons Logging<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 1.1.</li>
 	<li><span class="nobr"><a href="http://jakarta.apache.org/commons/collections" title="Visit page outside Confluence" rel="nofollow">Apache Commons Collections<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 3.1.</li>
-	<li><span class="nobr"><a href="http://www.caucho.com/hessian/" title="Visit page outside Confluence" rel="nofollow">Hessian Library<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 3.1.5.</li>
+	<li><span class="nobr"><a href="http://www.caucho.com/hessian/" title="Visit page outside Confluence" rel="nofollow">Hessian Library<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, version 3.1.6.</li>
 </ul>
-</div>
+
+
+<p>Note that there can be issues with running different versions of Hessian on the client and server since the Hessian protocols sometimes change between even minor releases. We recommend you keep them matched or look at the Hessian source to decide whether you might have compatibility issues.</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/trunk/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20Limitations/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Remote Object Persistence Guide/Remote Object Persistence Limitations/index.html Tue May 12 02:41:03 2009
@@ -45,8 +45,7 @@
 </li>
 </ul>
 </div>
-<div id="ConfluenceContent">
-<p>This page can be viewed as a Remote Object Persistence TODO. The following things are pending improvement:</p>
+<div id="ConfluenceContent"><p>This page can be viewed as a Remote Object Persistence TODO. The following things are pending improvement:</p>
 
 <ul>
 	<li>Client classes have to be available to the server JVM.</li>
@@ -56,7 +55,6 @@
 	<li>No role-based security.</li>
 	<li>No support for doing arbitrary server method calls.</li>
 	<li>No support for ResultIterator-like functionality.</li>
-	<li>No support for nested contexts in the remote tier.</li>
 </ul>
 </div>
 </div>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/index.html?rev=773768&r1=773767&r2=773768&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/index.html Tue May 12 02:41:03 2009
@@ -35,7 +35,6 @@
 	<li><a href="../Documentation/Overview/index.html" title="Overview">Overview</a>: Flavors of Cayenne; what's new in the latest version.</li>
 	<li><a href="../Documentation/Cayenne Guide/index.html" title="Cayenne Guide">Cayenne Guide</a>: Writing applications based on Cayenne persistence API. Includes "getting started" tutorials, main concepts, API details and deployment procedures.</li>
 	<li><a href="../Documentation/Remote Object Persistence Guide/index.html" title="Remote Object Persistence Guide">Remote Object Persistence Guide</a>: Writing distributed Cayenne client applications.</li>
-	<li><a href="../Documentation/JPA Guide/index.html" title="JPA Guide">JPA Guide</a>: <font color="red">(alpha, new in 3.0)</font> Writing applications based on EJB3 Java Persistence API (JPA) with Cayenne.</li>
 	<li><a href="../Documentation/Modeler Guide/index.html" title="Modeler Guide">Modeler Guide</a>: A guide to object-relational mapping (ORM) with CayenneModeler GUI tool.</li>
 </ul>
 



Mime
View raw message