cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r414308 [1/2] - in /incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation: Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/ Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/ U...
Date Wed, 14 Jun 2006 16:13:41 GMT
Author: aadamchik
Date: Wed Jun 14 09:13:38 2006
New Revision: 414308

URL: http://svn.apache.org/viewvc?rev=414308&view=rev
Log:
updating docs from Wiki

Added:
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/Upgrade/
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/Upgrade/index.html   (with props)
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/index.html   (with props)
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/datasource.jpg   (with props)
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/driver-location.jpg   (with props)
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tapestry Tutorial/
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tapestry Tutorial/index.html   (with props)
Removed:
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/Upgrading From Earlier Versions/
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgements/
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Tapestry/
Modified:
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdataport/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdbgen/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdeploy/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cgen/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/JAR Files and Dependencies/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.1 features/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/License/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Cayenne Application/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Command-Line Tutorial/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/quickstart-schema.jpg
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/JSP-Struts Tutorial/index.html
    incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/index.html

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/Running%20CayenneModeler/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html Wed Jun 14 09:13:38 2006
@@ -31,20 +31,49 @@
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>CayenneModeler is a regular Java application and can be run on a JSDK1.4 compatible JVM. Main class is org.objectstyle.cayenne.modeler.Main. For convenience Cayenne distribution provides run scripts to start modeler on Windows and UNIX platforms. To take advantage of these scripts, user must set CAYENNE_HOME (optional) and JAVA_HOME environment variables as described in the installation section.</p>
+<div id="ConfluenceContent"><p>Follow the instructions below appropriate for the type of OS and Cayenne distribution that you have:</p>
 
-<p>To run CayenneModeler, simply doubleclick an appropriate script file. To run them from the command line, use the following commands.</p>
+<h3><a name="RunningCayenneModeler-MacOSX"></a>Mac OS X</h3>
+
+<p>CayenneModeler.app comes as a part of the Mac distribution and is located at the root of the disk image.</p>
+
+<h3><a name="RunningCayenneModeler-WindowsOS"></a>Windows OS</h3>
+
+<p>Windows distribution of Cayenne contains <tt>CayenneModeler.exe</tt> file in the <tt>bin</tt> directory. To start the Modeler doubleclick this file. Note that you still need a JDK version 1.4 or newer installed to be able to run the Modeler.</p>
+
+<h3><a name="RunningCayenneModeler-CrossPlatformModeler%28LinuxoranyotherOS%29"></a>Cross Platform Modeler (Linux or any other OS)</h3>
+
+<p>CayenneModeler is a regular Java application that can be run on JDK 1.4 or newer. It can be started in two different ways:</p>
+
+<p>1. By running <tt>cayenne-modeler.jar</tt>:</p>
+
+<div class="preformatted"><div class="preformattedContent">
+<pre>cd [cayenne_distro_dir]/lib/modeler
+java -jar cayenne-modeler.jar</pre>
+</div></div>
+
+<p>2. Or by executing a startup script. </p>
+
+<p>To use one of the scripts, first set the following environment variables:</p>
+
+<ul>
+	<li><tt>JAVA_HOME</tt> - should point to your JSDK 1.4 installation. It may already exist in the environment.</li>
+	<li><tt>CAYENNE_HOME</tt> (optional) - should point to the directory where your unpacked Cayenne (a directory named like <tt>cayenne&#45;[release-suffix]</tt>). If <tt>CAYENNE_HOME</tt> is undefined, scripts will still work in most environments, guessing the right distribution location.</li>
+</ul>
+
+
+<p>And then run the scripts:</p>
 
 <p>Windows:</p>
 
-<div class="panel"><div class="panelContent">
-<p>%CAYENNE_HOME%\bin\modeler.bat</p>
+<div class="preformatted"><div class="preformattedContent">
+<pre>%CAYENNE_HOME%\bin\modeler.bat</pre>
 </div></div>
 
 <p>UNIX:</p>
 
-<div class="panel"><div class="panelContent">
-<p>$CAYENNE_HOME/bin/modeler.sh</p>
+<div class="preformatted"><div class="preformattedContent">
+<pre>$CAYENNE_HOME/bin/modeler.sh</pre>
 </div></div></div>
 </div>
   <div class="clearer">.</div>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote%20Object%20Persistence%20Guide/Remote%20Object%20Persistence%20CWS%20Deployment/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/Remote Object Persistence Guide/Remote Object Persistence CWS Deployment/index.html Wed Jun 14 09:13:38 2006
@@ -54,15 +54,29 @@
 </pre>
 </div></div>
 
-<h3><a name="RemoteObjectPersistenceCWSDeployment-web.xmldeclarationofHessianServlet"></a>web.xml declaration of HessianServlet</h3>
+<h3><a name="RemoteObjectPersistenceCWSDeployment-ConfiguringDeploymentParametersinweb.xml"></a>Configuring Deployment Parameters in web.xml</h3>
 
-<div class="code"><div class="codeHeader"><b>web.xml</b></div><div class="codeContent">
-<pre class="code-java">&lt;servlet&gt;
+<p>Cayenne service configuration is done via <tt>web.xml</tt>:</p>
+
+<ul>
+	<li><em>(optional)</em> Configuring session timout other than the default (timeout value is in <b>minutes</b>):
+<div class="preformatted"><div class="preformattedContent">
+<pre>&lt;session-config&gt;
+   &lt;session-timeout&gt;10&lt;/session-timeout&gt;
+&lt;/session-config&gt;</pre>
+</div></div></li>
+</ul>
+
+
+<ul>
+	<li>Declaring a HessianServlet
+<div class="preformatted"><div class="preformattedContent">
+<pre>&lt;servlet&gt;
    &lt;servlet-name&gt;cayenne&lt;/servlet-name&gt;
    &lt;servlet-class&gt;org.objectstyle.cayenne.remote.hessian.service.HessianServlet&lt;/servlet-class&gt;
 		
 
-   &lt;!-- optional - XMPPBridge setup <span class="code-keyword">for</span> peer-to-peer notifications --&gt;
+   &lt;!-- optional - XMPPBridge setup for peer-to-peer notifications --&gt;
    &lt;!-- 
    &lt;init-param&gt;
       &lt;param-name&gt;cayenne.RemoteService.EventBridge.factory&lt;/param-name&gt;
@@ -87,12 +101,14 @@
   &lt;servlet-name&gt;cayenne&lt;/servlet-name&gt;
   &lt;url-pattern&gt;/cayenne&lt;/url-pattern&gt;
 &lt;/servlet-mapping&gt;</pre>
-</div></div>
+</div></div></li>
+</ul>
 
-<p>Hessian service can optionally use HTTP basic authentication:</p>
 
-<div class="code"><div class="codeContent">
-<pre class="code-java">&lt;security-constraint&gt;
+<ul>
+	<li><em>(Optional)</em> Configuring HTTP basic authentication:
+<div class="preformatted"><div class="preformattedContent">
+<pre>&lt;security-constraint&gt;
    &lt;web-resource-collection&gt;
       &lt;web-resource-name&gt;Cayenne Web Service&lt;/web-resource-name&gt;
       &lt;url-pattern&gt;/cayenne&lt;/url-pattern&gt;
@@ -111,7 +127,9 @@
    &lt;description&gt;All CWS client applications&lt;/description&gt;
    &lt;role-name&gt;remote-app&lt;/role-name&gt;
 &lt;/security-role&gt;</pre>
-</div></div></div>
+</div></div></li>
+</ul>
+</div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdataport/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/cdataport/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdataport/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdataport/index.html Wed Jun 14 09:13:38 2006
@@ -24,12 +24,12 @@
 <li><a href="../../../../Documentation/User Guide/Performance Tuning/index.html">Performance Tuning</a></li>
 <li><a href="../../../../Documentation/User Guide/Deployment/index.html">Deployment</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/index.html">Ant Tasks</a><ul>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdbgen/index.html">cdbgen</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdeploy/index.html">cdeploy</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdbgen/index.html">cdbgen</a></li>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdeploy/index.html">cdeploy</a></li>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Access Stack Internals/index.html">Access Stack Internals</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdbgen/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/cdbgen/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdbgen/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdbgen/index.html Wed Jun 14 09:13:38 2006
@@ -24,12 +24,12 @@
 <li><a href="../../../../Documentation/User Guide/Performance Tuning/index.html">Performance Tuning</a></li>
 <li><a href="../../../../Documentation/User Guide/Deployment/index.html">Deployment</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/index.html">Ant Tasks</a><ul>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/cdbgen/index.html">cdbgen</a><ul>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/cdeploy/index.html">cdeploy</a></li>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Access Stack Internals/index.html">Access Stack Internals</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdeploy/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/cdeploy/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdeploy/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cdeploy/index.html Wed Jun 14 09:13:38 2006
@@ -24,12 +24,12 @@
 <li><a href="../../../../Documentation/User Guide/Performance Tuning/index.html">Performance Tuning</a></li>
 <li><a href="../../../../Documentation/User Guide/Deployment/index.html">Deployment</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/index.html">Ant Tasks</a><ul>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/cdbgen/index.html">cdbgen</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/cdeploy/index.html">cdeploy</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Access Stack Internals/index.html">Access Stack Internals</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cgen/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/cgen/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cgen/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/cgen/index.html Wed Jun 14 09:13:38 2006
@@ -24,12 +24,12 @@
 <li><a href="../../../../Documentation/User Guide/Performance Tuning/index.html">Performance Tuning</a></li>
 <li><a href="../../../../Documentation/User Guide/Deployment/index.html">Deployment</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/index.html">Ant Tasks</a><ul>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a></li>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdbgen/index.html">cdbgen</a></li>
-<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdeploy/index.html">cdeploy</a></li>
 <li><a href="../../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a><ul>
 </ul>
 </li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdbgen/index.html">cdbgen</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdeploy/index.html">cdeploy</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Access Stack Internals/index.html">Access Stack Internals</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Ant%20Tasks/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Ant Tasks/index.html Wed Jun 14 09:13:38 2006
@@ -24,10 +24,10 @@
 <li><a href="../../../Documentation/User Guide/Performance Tuning/index.html">Performance Tuning</a></li>
 <li><a href="../../../Documentation/User Guide/Deployment/index.html">Deployment</a></li>
 <li><a href="../../../Documentation/User Guide/Ant Tasks/index.html">Ant Tasks</a><ul>
-<li><a href="../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a></li>
+<li><a href="../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a></li>
 <li><a href="../../../Documentation/User Guide/Ant Tasks/cdbgen/index.html">cdbgen</a></li>
 <li><a href="../../../Documentation/User Guide/Ant Tasks/cdeploy/index.html">cdeploy</a></li>
-<li><a href="../../../Documentation/User Guide/Ant Tasks/cgen/index.html">cgen</a></li>
+<li><a href="../../../Documentation/User Guide/Ant Tasks/cdataport/index.html">cdataport</a></li>
 </ul>
 </li>
 <li><a href="../../../Documentation/User Guide/Access Stack Internals/index.html">Access Stack Internals</a></li>
@@ -53,7 +53,9 @@
 <span class="code-tag">&lt;/typedef&gt;</span></pre>
 </div></div>
 
-<p>When using the Antlib construct, omit the <tt>&lt;taskdef&gt;</tt> elements shown in the examples of each task, as the antlib.xml file defines all of the Cayenne Ant tasks. </p></div>
+<p>When using the Antlib construct, omit the <tt>&lt;taskdef&gt;</tt> elements shown in the examples of each task, as the antlib.xml file defines all of the Cayenne Ant tasks. </p>
+
+</div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataContext/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataContext/index.html Wed Jun 14 09:13:38 2006
@@ -17,13 +17,13 @@
 <li><a href="../../../Documentation/User Guide/Design/index.html">Design</a></li>
 <li><a href="../../../Documentation/User Guide/Generating Classes/index.html">Generating Classes</a></li>
 <li><a href="../../../Documentation/User Guide/DataContext/index.html">DataContext</a><ul>
-<li><a href="../../../Documentation/User Guide/DataContext/Nested DataContexts/index.html">Nested DataContexts</a></li>
 <li><a href="../../../Documentation/User Guide/DataContext/Obtaining DataContext/index.html">Obtaining DataContext</a></li>
 <li><a href="../../../Documentation/User Guide/DataContext/Running Queries/index.html">Running Queries</a></li>
 <li><a href="../../../Documentation/User Guide/DataContext/DataObject State Management/index.html">DataObject State Management</a></li>
 <li><a href="../../../Documentation/User Guide/DataContext/Moving Objects Between Contexts/index.html">Moving Objects Between Contexts</a></li>
 <li><a href="../../../Documentation/User Guide/DataContext/DataContextDelegate/index.html">DataContextDelegate</a></li>
 <li><a href="../../../Documentation/User Guide/DataContext/DataContextFactory/index.html">DataContextFactory</a></li>
+<li><a href="../../../Documentation/User Guide/DataContext/Nested DataContexts/index.html">Nested DataContexts</a></li>
 </ul>
 </li>
 <li><a href="../../../Documentation/User Guide/Queries/index.html">Queries</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/DataObjects/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/DataObjects/index.html Wed Jun 14 09:13:38 2006
@@ -19,6 +19,7 @@
 <li><a href="../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
 <li><a href="../../../Documentation/User Guide/Queries/index.html">Queries</a></li>
 <li><a href="../../../Documentation/User Guide/DataObjects/index.html">DataObjects</a><ul>
+<li><a href="../../../Documentation/User Guide/DataObjects/Accessing PK and FK values/index.html">Accessing PK and FK values</a></li>
 <li><a href="../../../Documentation/User Guide/DataObjects/Relationships/index.html">Relationships</a></li>
 <li><a href="../../../Documentation/User Guide/DataObjects/Flattened Relationships/index.html">Flattened Relationships</a></li>
 <li><a href="../../../Documentation/User Guide/DataObjects/DataObjects Example/index.html">DataObjects Example</a></li>
@@ -27,7 +28,6 @@
 <li><a href="../../../Documentation/User Guide/DataObjects/Handling Inheritance/index.html">Handling Inheritance</a></li>
 <li><a href="../../../Documentation/User Guide/DataObjects/Deleting Objects/index.html">Deleting Objects</a></li>
 <li><a href="../../../Documentation/User Guide/DataObjects/Generic Persistent Class/index.html">Generic Persistent Class</a></li>
-<li><a href="../../../Documentation/User Guide/DataObjects/Accessing PK and FK values/index.html">Accessing PK and FK values</a></li>
 </ul>
 </li>
 <li><a href="../../../Documentation/User Guide/Stored Procedures/index.html">Stored Procedures</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/JAR Files and Dependencies/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Installation/JAR%20Files%20and%20Dependencies/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/JAR Files and Dependencies/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/JAR Files and Dependencies/index.html Wed Jun 14 09:13:38 2006
@@ -13,7 +13,7 @@
 <ul>
 <li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a></li>
 <li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a><ul>
-<li><a href="../../../../Documentation/User Guide/Installation/Upgrading From Earlier Versions/index.html">Upgrading From Earlier Versions</a></li>
+<li><a href="../../../../Documentation/User Guide/Installation/Upgrade/index.html">Upgrade</a></li>
 <li><a href="../../../../Documentation/User Guide/Installation/JAR Files and Dependencies/index.html">JAR Files and Dependencies</a><ul>
 </ul>
 </li>

Added: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/Upgrade/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Installation/Upgrade/index.html?rev=414308&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/Upgrade/index.html (added)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/Upgrade/index.html Wed Jun 14 09:13:38 2006
@@ -0,0 +1,149 @@
+<html>
+  <head>
+    <title>Cayenne Documentation - Upgrade</title>
+    <style type="text/css">@import "../../../../style.css";</style>
+  </head>
+<body>
+  <div class="header">
+    <div style="float: left;"><a href="http://objectstyle.org/cayenne/"><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">Upgrade</span>
+  </div>
+<div id="cayenne_toc">
+<ul>
+<li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a></li>
+<li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a><ul>
+<li><a href="../../../../Documentation/User Guide/Installation/Upgrade/index.html">Upgrade</a><ul>
+</ul>
+</li>
+<li><a href="../../../../Documentation/User Guide/Installation/JAR Files and Dependencies/index.html">JAR Files and Dependencies</a></li>
+</ul>
+</li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
+<li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a></li>
+<li><a href="../../../../Documentation/User Guide/Generating Classes/index.html">Generating Classes</a></li>
+<li><a href="../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
+<li><a href="../../../../Documentation/User Guide/Queries/index.html">Queries</a></li>
+<li><a href="../../../../Documentation/User Guide/DataObjects/index.html">DataObjects</a></li>
+<li><a href="../../../../Documentation/User Guide/Stored Procedures/index.html">Stored Procedures</a></li>
+<li><a href="../../../../Documentation/User Guide/Expressions/index.html">Expressions</a></li>
+<li><a href="../../../../Documentation/User Guide/Performance Tuning/index.html">Performance Tuning</a></li>
+<li><a href="../../../../Documentation/User Guide/Deployment/index.html">Deployment</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/index.html">Ant Tasks</a></li>
+<li><a href="../../../../Documentation/User Guide/Access Stack Internals/index.html">Access Stack Internals</a></li>
+<li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
+</ul>
+</div>
+<div id="ConfluenceContent"><h3><a name="Upgrade-GeneralUpgradeRecommendations"></a>General Upgrade Recommendations</h3>
+
+<ul>
+	<li>Consult <tt>UPGRADE.txt</tt> and <tt>RELEASE-NOTES.txt</tt> files in the release you just downloaded for the most up to date instructions.</li>
+</ul>
+
+
+<ul>
+	<li><em>(Optional)</em> Delete CayenneModeler preferences. This is not strictly required, but recommended (especially if you used intermediate milestones and Betas). To do that delete "$HOME/.cayenne/modeler.preferences" file and "$HOME/.cayenne/prefs" directory, where <tt>$HOME</tt> is a user home directory which is OS and machine specific.</li>
+</ul>
+
+
+<ul>
+	<li>Upgrade Cayenne Mapping Projects. Open your project with the version of the Modeler that came with the latest download. If an upgrade dialog pops up, select "yes" to do an upgrade. Also it is also a good idea to make some insignificant change to the model (so that a "Save" button is activated) and do a save.</li>
+</ul>
+
+
+<table cellpadding='5' width='85%' cellspacing='8px' class='warningMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>Upgrading project XML files can  make them unusable with earlier versions of Cayenne.</td></tr></table>
+
+<ul>
+	<li>Pay attention to CayenneModeler validation warnings.</li>
+</ul>
+
+
+<ul>
+	<li>Do a clean recomplie. Recompile all your code, to make sure that you are not using any old classes or methods. Pay attention to deprecation warnings. It is always a good idea to update your code to avoid deprecated API.</li>
+</ul>
+
+
+
+<h3><a name="Upgrade-Upgradingto1.2"></a>Upgrading to 1.2</h3>
+
+<p>This is the list of things that are different in 1.2 and may require attention when doing an upgrade:</p>
+
+<ul>
+	<li>Cayenne tools and runtime now REQUIRE at least JDK 1.4 (or higher). They won't work on JDK 1.3. If you are still on 1.3, upgrade your JDK if you can. If you can not, consider staying on  Cayenne 1.1.</li>
+</ul>
+
+
+<ul>
+	<li>1.2 no longer needs Jakarta BeanUtils.</li>
+</ul>
+
+
+<ul>
+	<li>1.2 no longer relies on ClassLoader provided by Configuration (this API is deprecated as a matter of fact). Current code uses Thread.currentThread().getContextClassLoader().</li>
+</ul>
+
+
+<ul>
+	<li>In 1.2 PostgreSQLAdapter uses DB sequences for primary key generation instead of AUTO_PK_TABLE. To port an existing application, you will need to create those sequences (e.g. using the Modeler) and assign correct current values to them  (e.g. taken from the old AUTO_PK_TABLE). After that AUTO_PK_TABLE can be dropped.</li>
+</ul>
+
+
+<ul>
+	<li>In 1.2 PostgreSQLAdapter's default "BLOB" mapping is changed from "bytea" to "oid". It is still possible to use bytea, but watch for the Modeler-generated schema scripts - they will contain "oid". The easiest way to migrate your mapping (if you don't want to change the DB) is to remap all bytea columns as LONGVARBINARY DbAttributes instead of BLOB.</li>
+</ul>
+
+
+<ul>
+	<li>For extra portability encoding of entity type in the ObjectId is now based on ObjEntity name,  not Java class as before. If you had ObjEntities with matching names but different class names in different DataMaps, you will need to ensure entity name uniqueness.</li>
+</ul>
+
+
+<ul>
+	<li>ObjectId methods "getObjClass" and "getObjectClass" are removed (it wasn't possible to deprecate them and still preserve meaningful functionality). Constructors that take Class as the first argument are deprecated and will only work if entity naming follows CayenneModeler default conventions of using unqualified class name as the entity name.</li>
+</ul>
+
+
+<ul>
+	<li>TempObjectId is deprecated and is no longer used by Cayenne internally. If you were referencing TempObjectId explicitly in your code (e.g. if(id instanceof TempObjectId) ... ), you will need to modify the code and use "isTemporary()" superclass method.</li>
+</ul>
+
+
+<ul>
+	<li>The meaning of SnapshotEvent "source" and "postedBy" attributes is reversed per CAY-395 for better efficiency. If you implemented custom listeners of SnapshotEvents, you may need to doublecheck their logic. From now on events use DataRowStore as source, and EventBridge or ObjectStore as postedBy, depending on whether this was a local or a remote event. I.e. the new structure is the opposite to what we used in 1.1.</li>
+</ul>
+
+
+<ul>
+	<li>Cayenne stack events are no longer sent via a shared "default" EventManager. If you were using EventManager.getDefaultManager() to communicate or receive Cayenne stack events, you'll have to switch to Configuration.getEventManager(). Otherwise default manager can be accessed as before.</li>
+</ul>
+
+
+<ul>
+	<li>Query.setLoggingLevel/getLoggingLevel methods are removed from the interface and AbstractQuery implementor. As multi-tier Cayenne doesn't use Log4J, it was no longer possible to keep these methods deprecated.</li>
+</ul>
+
+
+<ul>
+	<li>Thread-bound Transactions: QueryEngine.performQueries(Collection,OperationObserver resultConsumer,Transaction) is deprecated and no longer used internally to further decouple layers in the access stack. This DOES NOT AFFECT most users. Only if you (a) implemented custom transactions and (b) manually manage their commit/rollback, you will also have to bind and unbind such Transactions to the current thread manually, for Cayenne stack classes to pick them up.</li>
+</ul>
+
+
+<ul>
+	<li>To force refresh of cached query results, one of the two new cache policies should be used instead of "setRefreshingObjects(..)" ("setRefreshingObjects" should only be used for its original purpose - refreshing individual objects, not list contents). See <a href="../../../../Documentation/User Guide/Queries/Caching Query Results/index.html" title="Caching Query Results">Caching Query Results</a> for details.</li>
+</ul>
+
+
+<ul>
+	<li>ObjectStore no longer stores database snapshots of object. As a result a method "retainSnapshot(DataObject object)" is removed, as its meaningful deprecation is not possible.</li>
+</ul>
+</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-2006 ObjectStyle Group and content authors
+  </div>
+
+</body>
+</html>

Propchange: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/Upgrade/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Installation/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Installation/index.html Wed Jun 14 09:13:38 2006
@@ -13,7 +13,7 @@
 <ul>
 <li><a href="../../../Documentation/User Guide/Introduction/index.html">Introduction</a></li>
 <li><a href="../../../Documentation/User Guide/Installation/index.html">Installation</a><ul>
-<li><a href="../../../Documentation/User Guide/Installation/Upgrading From Earlier Versions/index.html">Upgrading From Earlier Versions</a></li>
+<li><a href="../../../Documentation/User Guide/Installation/Upgrade/index.html">Upgrade</a></li>
 <li><a href="../../../Documentation/User Guide/Installation/JAR Files and Dependencies/index.html">JAR Files and Dependencies</a></li>
 </ul>
 </li>
@@ -35,12 +35,12 @@
 <div id="ConfluenceContent"><h3><a name="Installation-SystemRequirements"></a>System Requirements</h3>
 
 <ul>
-	<li><b>JDK:</b> Cayenne, including GUI tools, is written in 100% Java, and runs on any Java-compatible platform. Required JDK version is 1.4 or higher. If your deployment environment uses JDK 1.3, you still can use Cayenne, just downgrade to version 1.1.x - the last  version compatible with JDK 1.3.</li>
+	<li><b>JDK:</b> Cayenne, including GUI tools, is written in 100% Java, and runs on any Java-compatible platform. Required JDK version is 1.4 or higher. If your deployment environment uses JDK 1.3, you can still use Cayenne, just downgrade to version 1.1.x - the last  version compatible with JDK 1.3.</li>
 </ul>
 
 
 <ul>
-	<li><b>JDBC Driver:</b> You will need a JDBC driver to access the database. Information about various drivers and database-specific configuration is available on the <span class="error">&#91;Database Support&#93;</span> page.</li>
+	<li><b>JDBC Driver:</b> You will need a JDBC driver to access the database. Information about various drivers and database-specific configuration is provided on the <span class="error">&#91;Database Support&#93;</span> page.</li>
 </ul>
 
 
@@ -52,25 +52,9 @@
 
 <h3><a name="Installation-ObtainingCayenne"></a>Obtaining Cayenne</h3>
 
-<p>Installation of Cayenne is simple - just download and unpack the distribution. Download page is located here: <span class="nobr"><a href="http://objectstyle.org/cayenne/download.html" title="Visit page outside Confluence" rel="nofollow">http://objectstyle.org/cayenne/download.html<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. </p>
-
-<p>To unpack the downloaded distribution file, on Windows use <span class="nobr"><a href="http://winzip.com/" title="Visit page outside Confluence" rel="nofollow">WinZip<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, on UNIX use GNU tar:</p>
-
-<div class="code"><div class="codeContent">
-<pre class="code-java"># tar xzf [filename].tar.gz</pre>
-</div></div>
-
-<p>In most environments this is all you need. Setting environment variables step discussed below is only required to use the tools from a cross-platform distribution that does not have native tool launchers. It is NOT needed on a deployment machine.</p>
-
-<h3><a name="Installation-SettingEnvironmentVariables"></a>Setting Environment Variables</h3>
-
-<p>To run CayenneModeler and other tools, you may need to set the following environment variables as discussed in the <a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">Running CayenneModeler</a> chapter of the Modeler Guide:</p>
-
-<ul>
-	<li><tt>JAVA_HOME</tt> - should point to your JSDK 1.4 installation. It may already exist in the environment.</li>
-	<li><tt>CAYENNE_HOME</tt> (optional) - should point to the directory created when your unpacked Cayenne distribution in the previous steps. (Directory named like cayenne&#45;[release-suffix]). If CAYENNE_HOME is undefined, scripts can still guess it as long as they are run from their own directory (cayenne-[release-suffix]/bin/)</li>
-</ul>
+<p>Installing Cayenne is simple - just download and unpack the distribution. Download page is located here: <span class="nobr"><a href="http://objectstyle.org/cayenne/download.html" title="Visit page outside Confluence" rel="nofollow">http://objectstyle.org/cayenne/download.html<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. Select a distribution matching your target platform (cross-platform version, as the name implies, works on any OS that has Java).</p>
 
+<p>Once you've done that, you can <a href="../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">start the Modeler</a> and use <tt>cayenne.jar</tt> file in your applications (see <a href="../../../Documentation/User Guide/Installation/JAR Files and Dependencies/index.html" title="JAR Files and Dependencies">JAR Files and Dependencies</a> for more information).</p>
 </div>
 </div>
   <div class="clearer">.</div>

Added: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/Acknowledgments/index.html?rev=414308&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/index.html (added)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/index.html Wed Jun 14 09:13:38 2006
@@ -0,0 +1,49 @@
+<html>
+  <head>
+    <title>Cayenne Documentation - Acknowledgments</title>
+    <style type="text/css">@import "../../../../style.css";</style>
+  </head>
+<body>
+  <div class="header">
+    <div style="float: left;"><a href="http://objectstyle.org/cayenne/"><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">Acknowledgments</span>
+  </div>
+<div id="cayenne_toc">
+<ul>
+<li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a><ul>
+<li><a href="../../../../Documentation/User Guide/Introduction/Acknowledgments/index.html">Acknowledgments</a><ul>
+</ul>
+</li>
+<li><a href="../../../../Documentation/User Guide/Introduction/License/index.html">License</a></li>
+<li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html">Guide to 1.1 Features</a></li>
+<li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html">Guide to 1.2 Features</a></li>
+</ul>
+</li>
+<li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a></li>
+<li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a></li>
+<li><a href="../../../../Documentation/User Guide/Generating Classes/index.html">Generating Classes</a></li>
+<li><a href="../../../../Documentation/User Guide/DataContext/index.html">DataContext</a></li>
+<li><a href="../../../../Documentation/User Guide/Queries/index.html">Queries</a></li>
+<li><a href="../../../../Documentation/User Guide/DataObjects/index.html">DataObjects</a></li>
+<li><a href="../../../../Documentation/User Guide/Stored Procedures/index.html">Stored Procedures</a></li>
+<li><a href="../../../../Documentation/User Guide/Expressions/index.html">Expressions</a></li>
+<li><a href="../../../../Documentation/User Guide/Performance Tuning/index.html">Performance Tuning</a></li>
+<li><a href="../../../../Documentation/User Guide/Deployment/index.html">Deployment</a></li>
+<li><a href="../../../../Documentation/User Guide/Ant Tasks/index.html">Ant Tasks</a></li>
+<li><a href="../../../../Documentation/User Guide/Access Stack Internals/index.html">Access Stack Internals</a></li>
+<li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
+</ul>
+</div>
+<div id="ConfluenceContent"><p>We would like to thank our dedicated team of <span class="nobr"><a href="http://objectstyle.org/cayenne/contributors.html" title="Visit page outside Confluence" rel="nofollow">contributors<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> - for making this project possible, early adopters - for taking all the pain to help us make a usable product, other users - for providing feedback, comments, patches and bug reports.</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 &copy;2001-2006 ObjectStyle Group and content authors
+  </div>
+
+</body>
+</html>

Propchange: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Acknowledgments/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.1 features/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/Guide%20to%201.1%20features/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.1 features/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.1 features/index.html Wed Jun 14 09:13:38 2006
@@ -1,22 +1,22 @@
 <html>
   <head>
-    <title>Cayenne Documentation - Guide to 1.1 features</title>
+    <title>Cayenne Documentation - Guide to 1.1 Features</title>
     <style type="text/css">@import "../../../../style.css";</style>
   </head>
 <body>
   <div class="header">
     <div style="float: left;"><a href="http://objectstyle.org/cayenne/"><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">Guide to 1.1 features</span>
+    <span class="pagetitle">Guide to 1.1 Features</span>
   </div>
 <div id="cayenne_toc">
 <ul>
 <li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a><ul>
-<li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.1 features/index.html">Guide to 1.1 features</a><ul>
+<li><a href="../../../../Documentation/User Guide/Introduction/Acknowledgments/index.html">Acknowledgments</a></li>
+<li><a href="../../../../Documentation/User Guide/Introduction/License/index.html">License</a></li>
+<li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html">Guide to 1.1 Features</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/User Guide/Introduction/Acknowledgements/index.html">Acknowledgements</a></li>
-<li><a href="../../../../Documentation/User Guide/Introduction/License/index.html">License</a></li>
 <li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html">Guide to 1.2 Features</a></li>
 </ul>
 </li>
@@ -38,20 +38,20 @@
 </div>
 <div id="ConfluenceContent"><p>Cayenne version 1.1 introduces a large number of new features and enhancements over 1.0. This chapter lists most of them, providing the links to more detailed information about each feature.</p>
 
-<h3><a name="Guideto1.1features-DTDAdditions."></a>DTD Additions.</h3>
+<h3><a name="Guideto1.1Features-DTDAdditions."></a>DTD Additions.</h3>
 
 <p>"cayenne.xml" and "*.map.xml" file formats were updated to support new features. 1.1 DTD files are located here:</p>
 <ul>
-	<li><span class="nobr"><a href="cayenne-project-1_1.dtd?version=1" title="cayenne-project-1_1.dtd attached to Guide to 1.1 features">cayenne-project-1_1.dtd<sup><img class="rendericon" src="../../../../images/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
-	<li><span class="nobr"><a href="cayenne-data-map-1_2.dtd?version=1" title="cayenne-data-map-1_2.dtd attached to Guide to 1.1 features">cayenne-data-map-1_2.dtd<sup><img class="rendericon" src="../../../../images/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
-	<li><span class="nobr"><a href="cayenne-data-view-1_1.dtd?version=1" title="cayenne-data-view-1_1.dtd attached to Guide to 1.1 features">cayenne-data-view-1_1.dtd<sup><img class="rendericon" src="../../../../images/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
-	<li><span class="nobr"><a href="cayenne-driver-1_1.dtd?version=1" title="cayenne-driver-1_1.dtd attached to Guide to 1.1 features">cayenne-driver-1_1.dtd<sup><img class="rendericon" src="../../../../images/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
+	<li><span class="nobr"><a href="cayenne-project-1_1.dtd?version=1" title="cayenne-project-1_1.dtd attached to Guide to 1.1 Features">cayenne-project-1_1.dtd<sup><img class="rendericon" src="../../../../images/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
+	<li><span class="nobr"><a href="cayenne-data-map-1_2.dtd?version=1" title="cayenne-data-map-1_2.dtd attached to Guide to 1.1 Features">cayenne-data-map-1_2.dtd<sup><img class="rendericon" src="../../../../images/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
+	<li><span class="nobr"><a href="cayenne-data-view-1_1.dtd?version=1" title="cayenne-data-view-1_1.dtd attached to Guide to 1.1 Features">cayenne-data-view-1_1.dtd<sup><img class="rendericon" src="../../../../images/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
+	<li><span class="nobr"><a href="cayenne-driver-1_1.dtd?version=1" title="cayenne-driver-1_1.dtd attached to Guide to 1.1 Features">cayenne-driver-1_1.dtd<sup><img class="rendericon" src="../../../../images/link_attachment_7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></li>
 </ul>
 
 
 <table cellpadding='5' width='85%' cellspacing='8px' class='warningMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b class="strong">Upgrade Warning</b><br />Saving projects with CayenneModeler v.1.1 will render them uneditable with CayenneModeler v.1.0.</td></tr></table>
 
-<h3><a name="Guideto1.1features-AdvancedLocalandDistributedCaching"></a>Advanced Local and Distributed Caching</h3>
+<h3><a name="Guideto1.1Features-AdvancedLocalandDistributedCaching"></a>Advanced Local and Distributed Caching</h3>
 
 <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>
@@ -62,27 +62,27 @@
 </ul>
 
 
-<h3><a name="Guideto1.1features-OptimisticLocking"></a>Optimistic Locking</h3>
+<h3><a name="Guideto1.1Features-OptimisticLocking"></a>Optimistic Locking</h3>
 
 <p>ObjAttributes and ObjRelationships can be marked to be used for "optimistic" locking. If an corresponding columns of the underlying database row are externally modified, an attempt to save an object results in OptimisticLockingException.</p>
 
-<h3><a name="Guideto1.1features-DataObjectUtilsaneasywaytomapobjectsbyPK"></a>DataObjectUtils - an easy way to map objects by PK</h3>
+<h3><a name="Guideto1.1Features-DataObjectUtilsaneasywaytomapobjectsbyPK"></a>DataObjectUtils - an easy way to map objects by PK</h3>
 
 <p><a href="../../../../Documentation/User Guide/DataObjects/DataObjectUtils/index.html" title="DataObjectUtils">DataObjectUtils</a> is an often requested feature for easy retrieval of an object primary key, or locating an object for a known key. It works in a generic way for any type of DataObjects, even if a PK is not a class property.</p>
 
-<h3><a name="Guideto1.1features-EntityInheritance"></a>Entity Inheritance</h3>
+<h3><a name="Guideto1.1Features-EntityInheritance"></a>Entity Inheritance</h3>
 
 <p>Cayenne now supports entity inheritance for entities rooted in the same DB table (single table inheritance).</p>
 
-<h3><a name="Guideto1.1features-DataViewsandDVModeler"></a>Data Views and DVModeler</h3>
+<h3><a name="Guideto1.1Features-DataViewsandDVModeler"></a>Data Views and DVModeler</h3>
 
 <p><span class="error">&#91;Data Views&#93;</span> is a completely new addition to Cayenne. This is a framework and a Swing modeler tool to quickly build Swing applications based on Cayenne.</p>
 
-<h3><a name="Guideto1.1features-GenericMultithreadedandDistributedEventsMechanism"></a>Generic Multithreaded and Distributed Events Mechanism</h3>
+<h3><a name="Guideto1.1Features-GenericMultithreadedandDistributedEventsMechanism"></a>Generic Multithreaded and Distributed Events Mechanism</h3>
 
 <p>Cayenne now includes a generic <a href="../../../../Documentation/User Guide/Design/Event Package/index.html" title="Event Package">event package</a> "org.objectstyle.cayenne.event" for registering listeners and sending events, both locally and remotely. It supports both blocking and non-blocking listeners and dispatches. Supported remote transports include JMS and JavaGroups.</p>
 
-<h3><a name="Guideto1.1features-DataObjectsValidation"></a>DataObjects Validation</h3>
+<h3><a name="Guideto1.1Features-DataObjectsValidation"></a>DataObjects Validation</h3>
 
 <p>DataContext now performs validation of DataObjects before committing them. There is a set of default validation checks being executed, based on the DataMap information. Developers can override DataObject validation methods to provide custom validation checks.</p>
 
@@ -90,7 +90,7 @@
 
 <p>Original implementation was submitted by Fabricio Voznika.</p>
 
-<h3><a name="Guideto1.1features-ExpressionAPIEnhancements"></a>Expression API Enhancements</h3>
+<h3><a name="Guideto1.1Features-ExpressionAPIEnhancements"></a>Expression API Enhancements</h3>
 
 <p>There is a new expression parser that allows creation of complex expressions from strings ("Expression.fromString(..)"). This greatly reduces the amount of code needed to build an expression.</p>
 
@@ -100,7 +100,7 @@
 </ul>
 
 
-<h3><a name="Guideto1.1features-SQLTemplateADynamicRawSQLQuery"></a>SQLTemplate - A Dynamic Raw SQL Query</h3>
+<h3><a name="Guideto1.1Features-SQLTemplateADynamicRawSQLQuery"></a>SQLTemplate - A Dynamic Raw SQL Query</h3>
 
 <p>SQLTemplate replaces SqlSelectQuery and SqlModifyQuery and is a scriptable parameterized raw SQL query. It supports DataObjects and other features declared in GenericSelectQuery interface.</p>
 <ul>
@@ -109,7 +109,7 @@
 </ul>
 
 
-<h3><a name="Guideto1.1features-DataContextAPIforRunningParameterizedNamedQueries"></a>DataContext API for Running Parameterized Named Queries</h3>
+<h3><a name="Guideto1.1Features-DataContextAPIforRunningParameterizedNamedQueries"></a>DataContext API for Running Parameterized Named Queries</h3>
 
 <p>DataContext now provides simple API to run SelectQuery, SQLTemplate and ProcedureQuery by name if such queries are mapped via CayenneModeler:</p>
 <ul>
@@ -117,23 +117,23 @@
 </ul>
 
 
-<h3><a name="Guideto1.1features-SupportforSharedMappingNamespace"></a>Support for Shared Mapping Namespace</h3>
+<h3><a name="Guideto1.1Features-SupportforSharedMappingNamespace"></a>Support for Shared Mapping Namespace</h3>
 
 <p>DataDomain now provides a shared mapping namespace. This means that all mapping objects can reference other mapping objects outside their DataMaps. For example two DbEntities can be located in different DataMaps and still have relationships to each other.</p>
 
 <p>Temporary limitation of the shared mapping namespace is that Queries stored in the DataMap can't have a "root" from a different DataMap.</p>
 
-<h3><a name="Guideto1.1features-SnapshotEvents"></a>SnapshotEvents</h3>
+<h3><a name="Guideto1.1Features-SnapshotEvents"></a>SnapshotEvents</h3>
 
 
-<h3><a name="Guideto1.1features-DataContextDelegate"></a>DataContextDelegate</h3>
+<h3><a name="Guideto1.1Features-DataContextDelegate"></a>DataContextDelegate</h3>
 
 
-<h3><a name="Guideto1.1features-EntityRestrictingQualifier"></a>Entity Restricting Qualifier</h3>
+<h3><a name="Guideto1.1Features-EntityRestrictingQualifier"></a>Entity Restricting Qualifier</h3>
 
 <p>ObjEntities now can hold a qualifier expression that is automatically appended to any query qualifiers, thus creating a global data filter for a given entity. This feature is used for inheritance mapping, however it has nothing to do with inheritance as such and can be used all by itself.</p>
 
-<h3><a name="Guideto1.1features-ExplicitTransactionAPIandContainerManagedTransactions"></a>Explicit Transaction API and Container Managed Transactions</h3>
+<h3><a name="Guideto1.1Features-ExplicitTransactionAPIandContainerManagedTransactions"></a>Explicit Transaction API and Container Managed Transactions</h3>
 
 <p>Cayenne now supports container-managed transactions. As a result it can be used inside EJBs out of the box. It also allows a high degree of transactions customization. The following user guide chapter explains Transactions design and behavior in details:</p>
 <ul>
@@ -141,7 +141,7 @@
 </ul>
 
 
-<h3><a name="Guideto1.1features-VariousPerformanceEnhancements"></a>Various Performance Enhancements</h3>
+<h3><a name="Guideto1.1Features-VariousPerformanceEnhancements"></a>Various Performance Enhancements</h3>
 
 <ul>
 	<li>Lazy Relationship Creation - when new objects are fetched, their relationships are not initialized immediately; a Fault singleton is used isntead as a placeholder. Of course in the past Cayenne also had "lazy" relationships, meaning that they didn't get resolved via a DB query until accessed. Current optimization goes further - it prevents a number of Java objects (such as empty Lists for to-many relationship, or "hollow" DataObjects for to-ones) from being created until absolutely necessary.</li>
@@ -149,7 +149,7 @@
 </ul>
 
 
-<h3><a name="Guideto1.1features-MoreDatabasesHaveCustomDbAdapters"></a>More Databases Have Custom DbAdapters</h3>
+<h3><a name="Guideto1.1Features-MoreDatabasesHaveCustomDbAdapters"></a>More Databases Have Custom DbAdapters</h3>
 
 <p>Cayenne features new database adapters:</p>
 <ul>
@@ -158,11 +158,11 @@
 </ul>
 
 
-<h3><a name="Guideto1.1features-SupportforToOneRelationshipsNotPointingtoaPK."></a>Support for To-One Relationships Not Pointing to a PK.</h3>
+<h3><a name="Guideto1.1Features-SupportforToOneRelationshipsNotPointingtoaPK."></a>Support for To-One Relationships Not Pointing to a PK.</h3>
 
 <p>Added support for one-to-one relationships between PK and non-PK columns of related tables. In the past this could only be modeled as one-to-many. CayenneModeler will create UNIQUE constraint for a non-PK columns during schema generation.</p>
 
-<h3><a name="Guideto1.1features-SupportforQueriesinDataMapDTD."></a>Support for Queries in DataMap DTD.</h3>
+<h3><a name="Guideto1.1Features-SupportforQueriesinDataMapDTD."></a>Support for Queries in DataMap DTD.</h3>
 
 <p>Queries are made first-class mapping objects. They can be modeled in CayenneModeler and stored in DataMaps. Application code can then reuse such queries.</p>
 <ul>
@@ -171,15 +171,14 @@
 </ul>
 
 
-<h3><a name="Guideto1.1features-NonrefreshingSelectQueries"></a>Non-refreshing Select Queries</h3>
+<h3><a name="Guideto1.1Features-NonrefreshingSelectQueries"></a>Non-refreshing Select Queries</h3>
 
 
-<h3><a name="Guideto1.1features-CayenneModelerEnhancements."></a>CayenneModeler Enhancements.</h3>
+<h3><a name="Guideto1.1Features-CayenneModelerEnhancements."></a>CayenneModeler Enhancements.</h3>
 
 <p>The following is an incomplete list of enhancements: new professional look and feel, preference engine, reenginnering of stored procedures, local DataSources, configurable locations of JDBC drivers, custom class generation templates, etc. A number of Modeler tasks and dialogs have been redesigned and improved to be more user-friendly and consistent.</p>
 
-<p>Also CayenneModeler supports mapping of all the new 1.1 framework features, such as DataMap queries, cache synchronization configuration, etc.</p>
-</div>
+<p>Also CayenneModeler supports mapping of all the new 1.1 framework features, such as DataMap queries, cache synchronization configuration, etc.</p></div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/Guide%20to%201.2%20Features/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html Wed Jun 14 09:13:38 2006
@@ -12,9 +12,9 @@
 <div id="cayenne_toc">
 <ul>
 <li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a><ul>
-<li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.1 features/index.html">Guide to 1.1 features</a></li>
-<li><a href="../../../../Documentation/User Guide/Introduction/Acknowledgements/index.html">Acknowledgements</a></li>
+<li><a href="../../../../Documentation/User Guide/Introduction/Acknowledgments/index.html">Acknowledgments</a></li>
 <li><a href="../../../../Documentation/User Guide/Introduction/License/index.html">License</a></li>
+<li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html">Guide to 1.1 Features</a></li>
 <li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html">Guide to 1.2 Features</a><ul>
 </ul>
 </li>
@@ -36,7 +36,7 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>This page shows what's new in 1.2 release. The roadmap (unfinished tasks) can be viewed <span class="error">&#91;here&#93;</span>.</p>
+<div id="ConfluenceContent"><p>This page describes new features and other changes introduced in 1.2 release.</p>
 
 <h2><a name="Guideto1.2Features-CoreFramework"></a>Core Framework </h2>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/License/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/License/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/License/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/License/index.html Wed Jun 14 09:13:38 2006
@@ -12,11 +12,11 @@
 <div id="cayenne_toc">
 <ul>
 <li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a><ul>
-<li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.1 features/index.html">Guide to 1.1 features</a></li>
-<li><a href="../../../../Documentation/User Guide/Introduction/Acknowledgements/index.html">Acknowledgements</a></li>
+<li><a href="../../../../Documentation/User Guide/Introduction/Acknowledgments/index.html">Acknowledgments</a></li>
 <li><a href="../../../../Documentation/User Guide/Introduction/License/index.html">License</a><ul>
 </ul>
 </li>
+<li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html">Guide to 1.1 Features</a></li>
 <li><a href="../../../../Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html">Guide to 1.2 Features</a></li>
 </ul>
 </li>
@@ -36,7 +36,7 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>This software is distributed and should be used on terms of BSD software license. In short, it is free of charge, and unrestricted for commercial use as well. Full license text can be found here:</p>
+<div id="ConfluenceContent"><p>This software is distributed and should be used on terms of Apache software license. In short, it is free of charge, and unrestricted for commercial use as well. Full license text can be found here:</p>
 
 <div class="preformatted"><div class="preformattedContent">
 <pre>The ObjectStyle Group Software License, version 1.1

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Introduction/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Introduction/index.html Wed Jun 14 09:13:38 2006
@@ -12,10 +12,10 @@
 <div id="cayenne_toc">
 <ul>
 <li><a href="../../../Documentation/User Guide/Introduction/index.html">Introduction</a><ul>
-<li><a href="../../../Documentation/User Guide/Introduction/Acknowledgements/index.html">Acknowledgements</a></li>
+<li><a href="../../../Documentation/User Guide/Introduction/Acknowledgments/index.html">Acknowledgments</a></li>
 <li><a href="../../../Documentation/User Guide/Introduction/License/index.html">License</a></li>
+<li><a href="../../../Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html">Guide to 1.1 Features</a></li>
 <li><a href="../../../Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html">Guide to 1.2 Features</a></li>
-<li><a href="../../../Documentation/User Guide/Introduction/Guide to 1.1 features/index.html">Guide to 1.1 features</a></li>
 </ul>
 </li>
 <li><a href="../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
@@ -34,19 +34,19 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>Cayenne is a powerful, full-featured OpenSource Object/Relational framework. Cayenne is written in Java and is intended for Java developers working with relational databases. Cayenne has been successfully deployed in production environments on high volume sites.</p>
+<div id="ConfluenceContent"><p>Cayenne is a mature, powerful, full-featured open source Object/Relational Mapping (ORM) framework. Cayenne is written in Java and is intended for Java developers working with relational databases. Cayenne has been successfully deployed in production environments on high volume sites.</p>
 
 <p>Cayenne allows to reduce the development time in any database project by creating an object-oriented abstraction of the database schema. Development teams using Cayenne will be able to concentrate on the core business requirements and the data model instead of the SQL details.</p>
 
-<p>Among other things Cayenne provides management of persistent Java objects mapped to relational databases, single method call queries and updates (including atomic updates of all modified objects), seamless integration of multiple databases into a single virtual data source. Cayenne is distributed with CayenneModeler - a complete GUI mapping tool that supports reverse-engineering of RDBMS schema, working with database mappings and generation of Java source code for the persistent objects.</p>
+<p>Cayenne features include management of persistent Java objects mapped to relational databases, single method call queries and updates (including atomic updates of all modified objects), seamless integration of multiple databases into a single virtual data source, remote object persistence, etc. Cayenne is distributed with CayenneModeler - a complete GUI mapping tool that supports reverse-engineering of RDBMS schema, editing database mappings and generation of Java source code for the persistent objects.</p>
 
-<p>Cayenne comes with a comprehensive set of HTML documentation and full source code, including source code for the GUI tools. Cayenne free support is provided via user mailing lists. Commerical support and consulting services are also available. </p>
+<p>Cayenne comes with a comprehensive set of HTML documentation and full source code, including source code for the GUI tools. Free support is provided via user mailing lists. Commerical support and consulting services are also available. </p>
 
 <h3><a name="Introduction-Sections"></a>Sections</h3>
 <ul>
-	<li><a href="../../../Documentation/User Guide/Introduction/Acknowledgements/index.html" title="Acknowledgements">Acknowledgements</a></li>
+	<li><a href="../../../Documentation/User Guide/Introduction/Acknowledgments/index.html" title="Acknowledgments">Acknowledgments</a></li>
 	<li><a href="../../../Documentation/User Guide/Introduction/License/index.html" title="License">License</a></li>
-	<li><a href="../../../Documentation/User Guide/Introduction/Guide to 1.1 features/index.html" title="Guide to 1.1 features">Guide to 1.1 Features</a></li>
+	<li><a href="../../../Documentation/User Guide/Introduction/Guide to 1.1 Features/index.html" title="Guide to 1.1 Features">Guide to 1.1 Features</a></li>
 	<li><a href="../../../Documentation/User Guide/Introduction/Guide to 1.2 Features/index.html" title="Guide to 1.2 Features">Guide to 1.2 Features</a></li>
 </ul>
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Cayenne Application/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Cayenne%20Application/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Cayenne Application/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Cayenne Application/index.html Wed Jun 14 09:13:38 2006
@@ -14,13 +14,13 @@
 <li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a></li>
 <li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a><ul>
-<li><a href="../../../../Documentation/User Guide/Quick Start/Cayenne Application/index.html">Cayenne Application</a><ul>
-</ul>
-</li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/Common Setup Steps/index.html">Common Setup Steps</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/Command-Line Tutorial/index.html">Command-Line Tutorial</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/JSP-Struts Tutorial/index.html">JSP-Struts Tutorial</a></li>
-<li><a href="../../../../Documentation/User Guide/Quick Start/Tapestry/index.html">Tapestry</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/Tapestry Tutorial/index.html">Tapestry Tutorial</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/Cayenne Application/index.html">Cayenne Application</a><ul>
+</ul>
+</li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a></li>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Command-Line Tutorial/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Command-Line%20Tutorial/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Command-Line Tutorial/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Command-Line Tutorial/index.html Wed Jun 14 09:13:38 2006
@@ -14,13 +14,13 @@
 <li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a></li>
 <li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a><ul>
-<li><a href="../../../../Documentation/User Guide/Quick Start/Cayenne Application/index.html">Cayenne Application</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/Common Setup Steps/index.html">Common Setup Steps</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/Command-Line Tutorial/index.html">Command-Line Tutorial</a><ul>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/JSP-Struts Tutorial/index.html">JSP-Struts Tutorial</a></li>
-<li><a href="../../../../Documentation/User Guide/Quick Start/Tapestry/index.html">Tapestry</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/Tapestry Tutorial/index.html">Tapestry Tutorial</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/Cayenne Application/index.html">Cayenne Application</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a></li>
@@ -47,7 +47,7 @@
 
 <h3><a name="Command-LineTutorial-PrepareTutorialDatabase"></a>Prepare Tutorial Database<a name="Command-LineTutorial-PrepareTutorialDatabase"></a></h3>
 
-<p>Run tutorialdb.sql script located in the project directory to create test tables. This script is tested on MySQL, but it should be easy to port to any other RDBMS.</p>
+<p>Run <tt>tutorialdb.sql</tt> script located in the project directory to create test tables. This script is tested on MySQL, but it should be easy to port to any other RDBMS.</p>
 
 <h3><a name="Command-LineTutorial-SetupDataNode"></a>Setup DataNode<a name="Command-LineTutorial-SetupDataNode"></a></h3>
 

Added: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/datasource.jpg
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Common%20Setup%20Steps/datasource.jpg?rev=414308&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/datasource.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/driver-location.jpg
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Common%20Setup%20Steps/driver-location.jpg?rev=414308&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/driver-location.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Common%20Setup%20Steps/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/index.html Wed Jun 14 09:13:38 2006
@@ -14,13 +14,13 @@
 <li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a></li>
 <li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a><ul>
-<li><a href="../../../../Documentation/User Guide/Quick Start/Cayenne Application/index.html">Cayenne Application</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/Common Setup Steps/index.html">Common Setup Steps</a><ul>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/Command-Line Tutorial/index.html">Command-Line Tutorial</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/JSP-Struts Tutorial/index.html">JSP-Struts Tutorial</a></li>
-<li><a href="../../../../Documentation/User Guide/Quick Start/Tapestry/index.html">Tapestry</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/Tapestry Tutorial/index.html">Tapestry Tutorial</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/Cayenne Application/index.html">Cayenne Application</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a></li>
@@ -37,28 +37,24 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>These setup steps are the same for all tutorials in this chapter:</p>
+<div id="ConfluenceContent"><p>Database schema used in all tutorials in this chapter is shown below:</p>
 
-<ol>
-	<li>Install Cayenne:<br/>
-Check <a href="../../../../Documentation/User Guide/Installation/index.html" title="Installation">Installation</a> and <span class="error">&#91;Unpacking&#93;</span> instructions. In particular, JDK 1.4 or newer must be installed.</li>
-	<li>Get access to a Relational Database:<br/>
-For instance this can be a shared database running somewhere on the server in your organization. If you don't have access to such database (or don't have permissions to create and drop tables in it), it will probably be simpler if you install a local database on the development machine. All the tutorial SQL scripts were written for MySQL, so installing MySQL should be the simplest option.</li>
-	<li>Install JDBC Driver:<br/>
-Install JDBC driver for the database used in step (2). Put the driver jars somewhere in the filesystem. You don't have to add them to CLASSPATH for the CayenneModeler to run, however you may need to do that to run your application.</li>
-	<li>Start CayenneModeler GUI Application, Configure Driver Settings:<br/>
-Follow <a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">these</a> instructions to start the Modeler.</li>
-	<li>Configure Driver Settings:<br/>
-In the Modeler go to "Tools &gt; Preferences &gt; ClassPath" and create an entry or entries for the JDBC driver JAR files installed in the step (3). Once these preferences are saved, they will be used by the Modeler, even after it is restarted.</li>
-	<li>Configure Preferred DataSources:<br/>
-Go to "Tools &gt; Preferences &gt; Local DataSources" and configure one or more named DataSources for any databases you might need to access now and in the future. A documentation for this operation can be found <a href="../../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html" title="Local DataSources">here</a>. This step is optional, however performing it now will speed up any database work that you will do when working on tutorials and with your own application.
-<table cellpadding='5' width='85%' cellspacing='8px' class='infoMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>Source code for the tutorials discussed in this chapter is bundled with Cayenne distribution. More advanced Cayenne examples are available as a separate download from the download page.</td></tr></table></li>
-</ol>
+<p><img src="quickstart-schema.jpg" align="absmiddle" border="0" /></p>
 
+<p>Before running the tutorials, you will need to go through these steps:</p>
 
-<p>Database schema used in all tutorials in this chapter is shown below:</p>
+<ol>
+	<li><b><a href="../../../../Documentation/User Guide/Installation/index.html" title="Installation">Install Cayenne</a></b>. This should be as simple as download and unpack.</li>
+	<li><b>Get access to a relational database</b>. You may want to install a local database to run the tutorials. All the tutorial SQL scripts were tested on MySQL, so installing MySQL should probably be the simplest option. But almost any database should work.</li>
+	<li><b>Install JDBC Driver</b> for the database you are planning to use. Put the driver jars somewhere in the filesystem. You don't have to add them to CLASSPATH for the CayenneModeler to run, however you may need to do that to run your application.</li>
+	<li><b><a href="../../../../Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html" title="Running CayenneModeler">Start CayenneModeler GUI Application</a></b></li>
+	<li><b>Configure Driver Location</b>. In the Modeler go to <tt>"Tools &gt; Preferences &gt; ClassPath &gt; Add Jar/Zip"</tt> and create an entry or entries for the JDBC driver JAR files installed above. Once these preferences are saved, they will be used by the Modeler, even after it is restarted.<br/>
+<img src="driver-location.jpg" align="absmiddle" border="0" /></li>
+	<li><b>Configure Preferred DataSources</b>. Go to <tt>"Tools &gt; Preferences &gt; Local DataSources &gt; New"</tt> and configure a named DataSource for the test database. This step is optional, however performing it now will simplify any database work that you will do when working on tutorials and with your own application.<br/>
+<img src="datasource.jpg" align="absmiddle" border="0" /></li>
+</ol>
 
-<p><img src="quickstart-schema.jpg" align="absmiddle" border="0" /></p></div>
+</div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/Common Setup Steps/quickstart-schema.jpg
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/Common%20Setup%20Steps/quickstart-schema.jpg?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/JSP-Struts Tutorial/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Quick%20Start/JSP-Struts%20Tutorial/index.html?rev=414308&r1=414307&r2=414308&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/JSP-Struts Tutorial/index.html (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Quick Start/JSP-Struts Tutorial/index.html Wed Jun 14 09:13:38 2006
@@ -14,13 +14,13 @@
 <li><a href="../../../../Documentation/User Guide/Introduction/index.html">Introduction</a></li>
 <li><a href="../../../../Documentation/User Guide/Installation/index.html">Installation</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/index.html">Quick Start</a><ul>
-<li><a href="../../../../Documentation/User Guide/Quick Start/Cayenne Application/index.html">Cayenne Application</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/Common Setup Steps/index.html">Common Setup Steps</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/Command-Line Tutorial/index.html">Command-Line Tutorial</a></li>
 <li><a href="../../../../Documentation/User Guide/Quick Start/JSP-Struts Tutorial/index.html">JSP-Struts Tutorial</a><ul>
 </ul>
 </li>
-<li><a href="../../../../Documentation/User Guide/Quick Start/Tapestry/index.html">Tapestry</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/Tapestry Tutorial/index.html">Tapestry Tutorial</a></li>
+<li><a href="../../../../Documentation/User Guide/Quick Start/Cayenne Application/index.html">Cayenne Application</a></li>
 </ul>
 </li>
 <li><a href="../../../../Documentation/User Guide/Design/index.html">Design</a></li>



Mime
View raw message