cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r829552 [5/6] - in /cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation: ./ Cayenne Guide/Ant Tasks/ Cayenne Guide/Ant Tasks/cdataport/ Cayenne Guide/Ant Tasks/cdbgen/ Cayenne Guide/Ant Tasks/cdbimport/ Cayenne Guide/Ant Tasks/...
Date Sun, 25 Oct 2009 12:06:25 GMT
Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20SelectQuery/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial SelectQuery/index.html Sun Oct 25 12:06:20 2009
@@ -71,12 +71,12 @@
 </ul>
 
 
-<div class="code"><div class="codeHeader"><b>Main.java</b></div><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Main.java</b></div><div class="codeContent panelContent">
 <pre class="code-java">SelectQuery select1 = <span class="code-keyword">new</span> SelectQuery(Painting.class);
 List paintings1 = context.performQuery(select1);</pre>
 </div></div>
 
-<div class="preformatted"><div class="preformattedContent">
+<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>INFO  QueryLogger: SELECT t0.NAME, t0.ARTIST_ID, t0.GALLERY_ID, t0.ID FROM PAINTING t0
 INFO  QueryLogger: === returned 2 rows. - took 20 ms.</pre>
 </div></div>
@@ -86,7 +86,7 @@
 </ul>
 
 
-<div class="code"><div class="codeHeader"><b>Main.java</b></div><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Main.java</b></div><div class="codeContent panelContent">
 <pre class="code-java">Expression qualifier2 = ExpressionFactory.likeIgnoreCaseExp(
                 Painting.NAME_PROPERTY,
                 <span class="code-quote">"gi%"</span>);
@@ -94,7 +94,7 @@
 List paintings2 = context.performQuery(select2);</pre>
 </div></div>
 
-<div class="preformatted"><div class="preformattedContent">
+<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>INFO  QueryLogger: SELECT t0.NAME, t0.ARTIST_ID, t0.GALLERY_ID, t0.ID FROM PAINTING t0 
                              WHERE UPPER(t0.NAME) LIKE UPPER(?) [bind: 'gi%']
 INFO  QueryLogger: === returned 1 row. - took 28 ms.</pre>
@@ -105,7 +105,7 @@
 </ul>
 
 
-<div class="code"><div class="codeHeader"><b>Main.java</b></div><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>Main.java</b></div><div class="codeContent panelContent">
 <pre class="code-java">Calendar c = <span class="code-keyword">new</span> GregorianCalendar();
 c.set(c.get(Calendar.YEAR) - 100, 0, 1, 0, 0, 0);
 
@@ -115,7 +115,7 @@
 List paintings3 = context.performQuery(select3);</pre>
 </div></div>
 
-<div class="preformatted"><div class="preformattedContent">
+<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>INFO  QueryLogger: SELECT t0.NAME, t0.ARTIST_ID, t0.GALLERY_ID, t0.ID FROM PAINTING t0, ARTIST t1 
                              WHERE t0.ARTIST_ID = t1.ID AND (t1.DATE_OF_BIRTH &lt; ?) [bind: '1906-01-01 00:00:00.3']
 INFO  QueryLogger: === returned 2 rows. - took 31 ms.</pre>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Setup/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20Setup/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Setup/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Setup/index.html Sun Oct 25 12:06:20 2009
@@ -67,15 +67,15 @@
 
 <h3><a name="TutorialSetup-DownloadCayenne"></a>Download Cayenne</h3>
 
-<p>Get <span class="nobr"><a href="http://cayenne.apache.org/download.html" title="Visit page outside Confluence" rel="nofollow">the latest Cayenne<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> distribution. If you are on Linux, select a cross-platform version (<tt>cayenne-XXX.tar.gz</tt>).  For Mac OS X select <tt>cayenne-XXX-macosx.dmg</tt> and for Windows - <tt>cayenne-XXX-win.zip</tt>. Unpack the distribution somewhere in the file system. </p>
+<p>Get <a href="http://cayenne.apache.org/download.html" rel="nofollow">the latest Cayenne</a> distribution. If you are on Linux, select a cross-platform version (<tt>cayenne-XXX.tar.gz</tt>).  For Mac OS X select <tt>cayenne-XXX-macosx.dmg</tt> and for Windows - <tt>cayenne-XXX-win.zip</tt>. Unpack the distribution somewhere in the file system. </p>
 
 <h3><a name="TutorialSetup-DownloadDerbyDatabase"></a>Download Derby Database</h3>
 
-<p>Get Derby database <span class="nobr"><a href="http://db.apache.org/derby/derby_downloads.html" title="Visit page outside Confluence" rel="nofollow">from here<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> and unpack it somewhere in the filesystem.</p>
+<p>Get Derby database <a href="http://db.apache.org/derby/derby_downloads.html" rel="nofollow">from here</a> and unpack it somewhere in the filesystem.</p>
 
 <h3><a name="TutorialSetup-DownloadEclipse"></a>Download Eclipse </h3>
 
-<p>Download Eclipse <span class="nobr"><a href="http://www.eclipse.org" title="Visit page outside Confluence" rel="nofollow">from here<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> and unpack it somewhere in the filesystem.</p>
+<p>Download Eclipse <a href="http://www.eclipse.org" rel="nofollow">from here</a> and unpack it somewhere in the filesystem.</p>
 
 <h3><a name="TutorialSetup-CreateaNewEclipseProject"></a>Create a New Eclipse Project</h3>
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Webapp/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/Tutorial%20Webapp/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Webapp/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/Tutorial Webapp/index.html Sun Oct 25 12:06:20 2009
@@ -74,10 +74,10 @@
 
 <p>For detailed discussion of web application deployment, check <a href="../../../../Documentation/Cayenne Guide/Deployment/Web Applications/index.html" title="Web Applications">this page</a>.</p>
 
-<p>To run the web application from Eclipse, we will use <span class="nobr"><a href="http://code.google.com/p/run-jetty-run/" title="Visit page outside Confluence" rel="nofollow">run-jetty-run plugin<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>. If you prefer another way to start web applications (e.g. via Eclipse WTP), it should work as well.</p>
+<p>To run the web application from Eclipse, we will use <a href="http://code.google.com/p/run-jetty-run/" rel="nofollow">run-jetty-run plugin</a>. If you prefer another way to start web applications (e.g. via Eclipse WTP), it should work as well.</p>
 
 <ul>
-	<li>Install <tt>run-jetty-run</tt> plugin via Eclipse "Software Updates" function, following <span class="nobr"><a href="http://code.google.com/p/run-jetty-run/wiki/GettingStarted" title="Visit page outside Confluence" rel="nofollow">instructions on run-jetty-run website<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</li>
+	<li>Install <tt>run-jetty-run</tt> plugin via Eclipse "Software Updates" function, following <a href="http://code.google.com/p/run-jetty-run/wiki/GettingStarted" rel="nofollow">instructions on run-jetty-run website</a>.</li>
 </ul>
 
 
@@ -91,7 +91,7 @@
 
 <p>The following is the contents of <tt>web.xml</tt>. All the DataContext magic described above is achieved by WebApplicationContextFilter.</p>
 
-<div class="code"><div class="codeHeader"><b>web.xml</b></div><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>web.xml</b></div><div class="codeContent panelContent">
 <pre class="code-java">&lt;?xml version=<span class="code-quote">"1.0"</span> encoding=<span class="code-quote">"utf-8"</span>?&gt;
  &lt;!DOCTYPE web-app
    PUBLIC <span class="code-quote">"-<span class="code-comment">//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"</span>
@@ -117,7 +117,7 @@
 </ul>
 
 
-<div class="code"><div class="codeHeader"><b>webapp/index.jsp</b></div><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>webapp/index.jsp</b></div><div class="codeContent panelContent">
 <pre class="code-java">&lt;%@ page language=<span class="code-quote">"java"</span> contentType=<span class="code-quote">"text/html"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"cayenne.tutorial.*"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.apache.cayenne.*"</span> %&gt;
@@ -162,7 +162,7 @@
 </ul>
 
 
-<div class="code"><div class="codeHeader"><b>webapp/detail.jsp</b></div><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeHeader panelHeader" style="border-bottom-width: 1px;"><b>webapp/detail.jsp</b></div><div class="codeContent panelContent">
 <pre class="code-java">&lt;%@ page language=<span class="code-quote">"java"</span> contentType=<span class="code-quote">"text/html"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"cayenne.tutorial.*"</span> %&gt;
 &lt;%@ page <span class="code-keyword">import</span>=<span class="code-quote">"org.apache.cayenne.*"</span> %&gt;
@@ -242,11 +242,11 @@
 <ul>
 	<li>Click "Apply" and "Run".</li>
 	<li>You will see some Cayenne logs, indicating that the filter was loaded and Cayenne is successfully runing in web app.</li>
-	<li>Now go to <span class="nobr"><a href="http://localhost:8080/" title="Visit page outside Confluence" rel="nofollow">http://localhost:8080/<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> URL. You should see "No artists found message" in the web browser and the following output in the Eclipse console:</li>
+	<li>Now go to <a href="http://localhost:8080/" rel="nofollow">http://localhost:8080/</a> URL. You should see "No artists found message" in the web browser and the following output in the Eclipse console:</li>
 </ul>
 
 
-<div class="preformatted"><div class="preformattedContent">
+<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>INFO  QueryLogger: --- will run 1 query.
 INFO  QueryLogger: Opening connection: jdbc:derby:/Users/andrus/Desktop/testdb;create=true
 	Login: null

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Quick%20Start/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Quick Start/index.html Sun Oct 25 12:06:20 2009
@@ -59,7 +59,7 @@
 <li><a href="../../../Documentation/Cayenne Guide/Customization/index.html">Customization</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><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>Tutorials for Cayenne version 3.0 are still work in progress. Please use the <span class="nobr"><a href="http://cayenne.apache.org/doc20/quick-start.html" title="Visit page outside Confluence" rel="nofollow">tutorials from Cayenne 2.0<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> until we bring 3.0 version in sync with the code</td></tr></table>
+<div id="ConfluenceContent"><div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>Tutorials for Cayenne version 3.0 are still work in progress. Please use the <a href="http://cayenne.apache.org/doc20/quick-start.html" rel="nofollow">tutorials from Cayenne 2.0</a> until we bring 3.0 version in sync with the code</td></tr></table></div>
 
 <h2><a name="QuickStart-QuickStart"></a>Quick Start</h2>
 <p>This chapter provides a step-by-step tutorial on writing a full database application with Cayenne. When you are done with it, you should have an understanding of the basics of object relational mapping with CayenneModeler and how to use Cayenne in standalone (command line or otherwise) and web applications. The tutorial uses the Eclipse IDE (since it is free and very common) and Derby database (since it supports embedded mode and thus requires zero setup), however it can be easily applied to any other database and/or IDE's.</p>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Executing a Stored Procedure/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Stored%20Procedures/Executing%20a%20Stored%20Procedure/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Executing a Stored Procedure/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Executing a Stored Procedure/index.html Sun Oct 25 12:06:20 2009
@@ -60,7 +60,7 @@
 <p>Previous chapter showed how to select a single set of data rows using a ProcedureQuery. In a more general case stored procedures can return multiple sets of data, either as ResultSets or via OUT parameters, execute update/delete/insert queries, etc. To collect the results of execution of such stored procedure, you need to run a query using context's <tt>"performGenericQuery"</tt> method and inspect returned QueryResponse.</p>
 
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">DataContext ctxt;
 
 <span class="code-comment">// <span class="code-quote">"my_procedure"</span> is a name of a stored procedure,
@@ -85,14 +85,15 @@
           <span class="code-object">int</span>[] updateCounts = result.currentUpdateCount();
           <span class="code-comment">// ...
 </span>     }
-}</pre>
+}
+</pre>
 </div></div>
 
 <h3><a name="ExecutingaStoredProcedure-UsingQueryResponsetoReadOUTParameters"></a>Using QueryResponse to Read OUT Parameters</h3>
 
 <p>Stored Procedure can return data back to the application as ResultSets or via OUT parameters. To simplify the processing of the query output, QueryResponse treats OUT parameters as if it was a separate ResultSet. If a stored procedure declares any OUT or INOUT parameters, QueryResponse will contain their returned values in the very first result list:</p>
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">DataContext ctxt;
 
 <span class="code-comment">// <span class="code-quote">"my_procedure"</span> is a name of a stored procedure,
@@ -111,7 +112,8 @@
 
 <span class="code-keyword">if</span>(outList.size() &gt;  0) {
     Map outParameterValues = (Map) outList.get(0);
-}</pre>
+}
+</pre>
 </div></div></div>
 </div>
   <div class="clearer">.</div>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Selecting Objects/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne%20Guide/Stored%20Procedures/Selecting%20Objects/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Selecting Objects/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Cayenne Guide/Stored Procedures/Selecting Objects/index.html Sun Oct 25 12:06:20 2009
@@ -58,7 +58,7 @@
 
 <p>Below is an example of creating a ProcedureQuery, initializing its parameters, and processing execution results.</p>
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java">DataContext ctxt;
 
 <span class="code-comment">// <span class="code-quote">"my_procedure"</span> is a name of a stored procedure,
@@ -77,7 +77,8 @@
 <span class="code-keyword">while</span>(it.hasNext()) {
   Artist artist = (Artist) it.next();
   ....
-}</pre>
+}
+</pre>
 </div></div></div>
 </div>
   <div class="clearer">.</div>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Cayenne%20Project%20Structure/Cayenne%20Projects/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Cayenne Project Structure/Cayenne Projects/index.html Sun Oct 25 12:06:20 2009
@@ -57,7 +57,7 @@
 <p>This structure is saved in the following set of files:</p>
 
 <ul class="alternate" type="square">
-	<li><b>cayenne.xml file</b>: This is a main project file in each application. It should always be called <tt>cayenne.xml</tt>. It configures the layout of the data sources used by the application, breaking it by domains and nodes. It also links to other parts of Cayenne project described below. Nodes represent physical datasources. For each database JDBC URL there should be a single node configured. Domains represent virtual datasources that are a combination of one or more physical datasources. In a simplest (and most common) case, there will be only one domain (virtual datasource) that has a single node (physical datasource). But Cayenne is flexible to allow grouping multiple nodes under domains thus hiding lots of underlying details and allowing applications to work with multiple databases as if it was a single one. XML structure of <tt>cayenne.xml</tt> is described in this <span class="nobr"><a href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE
 -2.0/cayenne/cayenne-java/src/cayenne/dtd/cayenne-project-1_1.dtd" title="Visit page outside Confluence" rel="nofollow">DTD file<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</li>
+	<li><b>cayenne.xml file</b>: This is a main project file in each application. It should always be called <tt>cayenne.xml</tt>. It configures the layout of the data sources used by the application, breaking it by domains and nodes. It also links to other parts of Cayenne project described below. Nodes represent physical datasources. For each database JDBC URL there should be a single node configured. Domains represent virtual datasources that are a combination of one or more physical datasources. In a simplest (and most common) case, there will be only one domain (virtual datasource) that has a single node (physical datasource). But Cayenne is flexible to allow grouping multiple nodes under domains thus hiding lots of underlying details and allowing applications to work with multiple databases as if it was a single one. XML structure of <tt>cayenne.xml</tt> is described in this <a href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenn
 e-java/src/cayenne/dtd/cayenne-project-1_1.dtd" rel="nofollow">DTD file</a>.</li>
 </ul>
 
 
@@ -67,7 +67,7 @@
 
 
 <ul class="alternate" type="square">
-	<li><b>DataSource file</b>: In a standalone Java application, Java code has no access to DataSource objects that are normally provided by deployment containers. Cayenne framework still needs a DataSource to connect to the database. Therefore Cayenne has a set of wrapper classes located in <tt>org.apache.cayenne.conn</tt> package, to create DataSource objects based on regular JDBC drivers. DataSource file provides needed information about database URL, JDBC driver, login, password and connection pooling parameters of a single DataSource. <em>Note: such configuration file can be present in development so that CayenneModeler tool could obtain a database connection, even if an application wouldn't use it in deployment and instead would use a DataSource provided by the container</em>. DTD for the DataSource file can be found <span class="nobr"><a href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/dtd/cayenne-driver-1
 _1.dtd" title="Visit page outside Confluence" rel="nofollow">here<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.</li>
+	<li><b>DataSource file</b>: In a standalone Java application, Java code has no access to DataSource objects that are normally provided by deployment containers. Cayenne framework still needs a DataSource to connect to the database. Therefore Cayenne has a set of wrapper classes located in <tt>org.apache.cayenne.conn</tt> package, to create DataSource objects based on regular JDBC drivers. DataSource file provides needed information about database URL, JDBC driver, login, password and connection pooling parameters of a single DataSource. <em>Note: such configuration file can be present in development so that CayenneModeler tool could obtain a database connection, even if an application wouldn't use it in deployment and instead would use a DataSource provided by the container</em>. DTD for the DataSource file can be found <a href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/dtd/cayenne-driver-1_1.dtd" rel="nofoll
 ow">here</a>.</li>
 </ul>
 </div>
 </div>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Create%20DataNode/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Create DataNode/index.html Sun Oct 25 12:06:20 2009
@@ -62,8 +62,7 @@
 
 <p><b>Configure DB Adapter.</b> As mentioned <a href="../../../../Documentation/Cayenne Guide/Design/Runtime Components/DbAdapter/index.html" title="DbAdapter">in Cayenne User Guide</a>, RDBMS engines sometimes require special handling outside of standard JDBC scope. Cayenne abstracts it via database-specific adapters. An adapter must be selected from a "DB adapter" dropdown, regardless what type of DataSource factory (see below) is used . Standard adapters distributed with Cayenne (including a generic JDBCAdapter) are listed in the dropdown. If you created your own adapter, type the full class name of a class that implements DbAdapter interface instead. </p>
 
-<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">Hint</b><br />
-<p>If entering custom DbAdapter results in Modeler showing a warning, it is likely a CLASSPATH issue. In this case you will need to setup the location of compiled custom adapter classes in "Tools &gt; Preferences &gt; ClassPath".</p></td></tr></table>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Hint</b><br /><p>If entering custom DbAdapter results in Modeler showing a warning, it is likely a CLASSPATH issue. In this case you will need to setup the location of compiled custom adapter classes in "Tools &gt; Preferences &gt; ClassPath".</p></td></tr></table></div>
 
 <p><b>Select Local DataSource.</b> This is an optional, though recommended step. A "Local DataSource" dropdown allows to create an association between a DataNode and a <a href="../../../../Documentation/Modeler Guide/Preferences Panel/Local DataSources/index.html" title="Local DataSources">previously configured DataSources</a>. Such association is transparently stored as one of the preferences and does not affect your project XML files. This is a good way to separate database connection info stored in a given Cayenne project (i.e. deployment information) from local preferred connection settings. Also it allows to connect using JNDI DataNodes.</p>
 

Modified: cayenne/main/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=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Reverse Engineer Database/index.html Sun Oct 25 12:06:20 2009
@@ -58,7 +58,7 @@
 
 <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>
 
-<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> Reverse-engineering behavior is sensitive to the current project tree selection. If you selected a DataDomain or a DataNode, a new DataMap will be created and all reengineered tables will be put in this DataMap. If you had an existing DataMap (or one of its entities) selected when you started reverse engineering, new tables will be merged into the existing DataMap.</td></tr></table>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td> Reverse-engineering behavior is sensitive to the current project tree selection. If you selected a DataDomain or a DataNode, a new DataMap will be created and all reengineered tables will be put in this DataMap. If you had an existing DataMap (or one of its entities) selected when you started reverse engineering, new tables will be merged into the existing DataMap.</td></tr></table></div>
 
 <p><b>Configure Database Connection.</b> "Connect to Database" dialog allows to specify alternative connection parameters. If a DataNode was selected when reverse engineering started, its connection information is shown by default. You can use suggested default connection, select one of the stored local DataSources from "Saved DataSources" dropdown (those can be edited on the spot by clicking "..." button), or type your own info. When desired connection is selected, click "Continue". Cayenne will attempt to connect to the database and if connection is successful, "Select Options" dialog is presented.</p>
 
@@ -70,7 +70,7 @@
 
 <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>org.apache.cayenne.modeler.util.SmartNamingStrategy uses FK column names for to-one relationship names (e.g. if FK column is called "ARTIST_ID" or "ARTISTID" the relationship's name will be just "artist"). To-many relationship names are pluralized forms of other-side entities names, e.g. "paintings". Pluralization is done in rules of English language using <a href="https://inflector.dev.java.net/" rel="nofollow">Inflector</a>.</p>
 
 <p>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>
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Common%20Modeling%20Tasks/Setting%20DataMap%20Defaults/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Common Modeling Tasks/Setting DataMap Defaults/index.html Sun Oct 25 12:06:20 2009
@@ -79,8 +79,7 @@
 <ul>
 	<li><b>Optimistic Locking.</b> Default optimistic locking policy for ObjEntities. Clicking "Update.." button next to the optimistic locking checkbox will reset the optimistic locking policy of all existing ObjEntities to match the default.</li>
 	<li><b>Client Entities.</b> Allows you to specify remote persistence client classes. Clicking "Update.." button next to Client Java Package field will reset the client java package of all existing Java classes in the DataMap.
-<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">Defaults are ignored in runtime</b><br />
-<p>Note that none of the defaults affect entities runtime behavior. For example if a DbEntity "ARTIST" has empty schema, and a DataMap defines a default schema to be "SCHEMA1", Cayenne will assume that ARTIST entity does not use schema.</p></td></tr></table></li>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Defaults are ignored in runtime</b><br /><p>Note that none of the defaults affect entities runtime behavior. For example if a DbEntity "ARTIST" has empty schema, and a DataMap defines a default schema to be "SCHEMA1", Cayenne will assume that ARTIST entity does not use schema.</p></td></tr></table></div></li>
 </ul>
 </div>
 </div>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Configuring%20Deployment%20Settings/Configuring%20Caching%20Behavior/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Configuring Deployment Settings/Configuring Caching Behavior/index.html Sun Oct 25 12:06:20 2009
@@ -73,13 +73,11 @@
 
 <p>Configuration that allows to notify other applications about changes made by an application and to listen for such changes made by others. This type of configuration incurs the most overhead, because it will constantly send and receive synchronization messages, but it is also the most powerful configuration. Cayenne currently supports the use of JMS and JavaGroups frameworks for synchronization, and also allows users to create their own transport mechanism. </p>
 
-<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>
-<p>Cayenne distribution archive does not include JavaGroups or JMS libraries. Those must be downloaded and installed separately. However until deployment phase, Cayenne does not require those libraries to be installed. </p></td></tr></table>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><p>Cayenne distribution archive does not include JavaGroups or JMS libraries. Those must be downloaded and installed separately. However until deployment phase, Cayenne does not require those libraries to be installed. </p></td></tr></table></div>
 
 <p>To configure distributed cache sharing, check "Remote Change Notifications" checkbox, and click "Configure" button to select and configure the type of transport to use.</p>
 
-<table cellpadding='5' width='85%' cellspacing='8px' class='tipMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td>
-<p>Synchronization is only done between remote DataDomains with the same name. Note that for JavaGroups configuration, a combination of multicast address and port must be unique for each DataDomain name.</p></td></tr></table>
+<div class='panelMacro'><table class='tipMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><p>Synchronization is only done between remote DataDomains with the same name. Note that for JavaGroups configuration, a combination of multicast address and port must be unique for each DataDomain name.</p></td></tr></table></div>
 
 <h3><a name="ConfiguringCachingBehavior-ChoosingJavaGroupsoverJMS"></a>Choosing JavaGroups over JMS</h3>
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Introduction%20to%20CayenneModeler/Running%20CayenneModeler/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Introduction to CayenneModeler/Running CayenneModeler/index.html Sun Oct 25 12:06:20 2009
@@ -63,7 +63,7 @@
 
 <p>CayenneModeler.jar is a runnable jar that can be executed with JDK 1.5 or newer:</p>
 
-<div class="preformatted"><div class="preformattedContent">
+<div class="preformatted panel" style="border-width: 1px;"><div class="preformattedContent panelContent">
 <pre>java -jar cayenne_distro_dir/bin/CayenneModeler.jar</pre>
 </div></div></div>
 </div>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/CayenneModeler%20Flattened%20Relationships/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/CayenneModeler Flattened Relationships/index.html Sun Oct 25 12:06:20 2009
@@ -61,15 +61,15 @@
 <p>The most common case for using flattened relationships is modeling many-to-many relationships with a join table. E.g. ARTIST DbEntity has to-many relationship to ARTIST_EXHIBIT; ARTIST_EXHIBIT in turn has a to-one relationship to EXHIBIT DbEntity. We can create a single ObjRelationship from Artist ObjEntity to Exhibit ObjEntity that spawns two DbRelationships. This will be a to-many relationship. Lets say it is called "exhibitArray". Generated class file for Artist would contain a getExhibitArray() method returning a list of Exhibits for a given artist instance. An obvious advantage of having a flattened relationship in this case is to avoid mapping a join table as an object, meaningless in the context of the object model.</p>
 
 <p>Flattened relationships work across any combination of to-one and to-many DbRelationships. If all the relationships are to-one, then the resulting flattened relationship is also to-one. If there is at least one to-many, the result is to-many as well.</p>
-<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">Read-Only Note</b><br />
-<p>Most of flattened relationships are treated as read-only by Cayenne. Only one (the most commonly used) type is read/write. It is many-to-many (n:m) flattened relationships with a single join table.</p></td></tr></table>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Read-Only Note</b><br /><p>Most of flattened relationships are treated as read-only by Cayenne. Only one (the most commonly used) type is read/write. It is many-to-many (n:m) flattened relationships with a single join table.</p></td></tr></table></div>
 <p>To map an ObjRelationship to a chain of DbRelationships, select ObjRelationship table row and click "Edit Relationship" button in the bottom right. "ObjRelationship Inspector" dialog will appear.</p>
 
 <p><img src="objrelationship-path-selection.jpg" align="absmiddle" border="0" /></p>
 
 <p>The dialog contains a DbRelationship table. Clicking on each row in this table will show valid choices of DbRelationships. Once you add a "chain" component, another row automatically opens below, so you can build a chain of arbitrary length.</p>
-<table cellpadding='5' width='85%' cellspacing='8px' class='tipMacro' border="0" align='center'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b class="strong">Join Table Tip</b><br />
-<p>If you flatten across a join table and this join table was mapped to an ObjEntity (and a correspoding Java class), such ObjEntity can be deleted, as it is no longer needed. Underlying DbEntity must be preserved.</p></td></tr></table></div>
+<div class='panelMacro'><table class='tipMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Join Table Tip</b><br /><p>If you flatten across a join table and this join table was mapped to an ObjEntity (and a correspoding Java class), such ObjEntity can be deleted, as it is no longer needed. Underlying DbEntity must be preserved.</p></td></tr></table></div>
+
+<p>Further information about flattened relationships can be <a href="../../../../Documentation/Cayenne Guide/DataObjects/Flattened Relationships/index.html" title="Flattened Relationships">found here</a>.</p></div>
 </div>
   <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/Modeler Guide/Modeling Object Layer/Delete Rules/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Delete%20Rules/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Delete Rules/index.html Sun Oct 25 12:06:20 2009
@@ -76,8 +76,7 @@
 </ul>
 
 
-<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">Cayenne Delete Rules vs. DB Delete Rules</b><br />
-<p>Some databases allow to define delete rules logically similar to the rules described above. Cayenne rules differ from DB rules in that they deal with object graph instead of relational schema. Some changes to the object graph will result in database operations (e.g. resetting FK to NULL as a result of Nullify rule), some others will not (e.g. removing a deleted DataObject from the to-many array as a result of another Nullify rule). </p></td></tr></table></div>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Cayenne Delete Rules vs. DB Delete Rules</b><br /><p>Some databases allow to define delete rules logically similar to the rules described above. Cayenne rules differ from DB rules in that they deal with object graph instead of relational schema. Some changes to the object graph will result in database operations (e.g. resetting FK to NULL as a result of Nullify rule), some others will not (e.g. removing a deleted DataObject from the to-many array as a result of another Nullify rule). </p></td></tr></table></div></div>
 </div>
   <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/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Inheritance%20overview/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Inheritance overview/index.html Sun Oct 25 12:06:20 2009
@@ -54,7 +54,7 @@
 <li><a href="../../../../Documentation/Modeler Guide/Modeling Tips/index.html">Modeling Tips</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><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>This page and the inheritance features in Cayenne are a work in progress. Features are described here which are not yet available in a release of Cayenne. They are subject to change before final release.</td></tr></table>
+<div id="ConfluenceContent"><div class='panelMacro'><table class='warningMacro'><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>This page and the inheritance features in Cayenne are a work in progress. Features are described here which are not yet available in a release of Cayenne. They are subject to change before final release.</td></tr></table></div>
 
 <h3><a name="Inheritanceoverview-Whyuseinheritance%3F"></a>Why use inheritance?</h3>
 
@@ -63,10 +63,11 @@
 
 <p><img src="inheritance-example.png" align="absmiddle" border="0" /></p>
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">abstract</span> class Person <span class="code-keyword">extends</span> PersistentObject {}
 <span class="code-keyword">public</span> class Teacher <span class="code-keyword">extends</span> Person {}
-<span class="code-keyword">public</span> class Student <span class="code-keyword">extends</span> Person {}</pre>
+<span class="code-keyword">public</span> class Student <span class="code-keyword">extends</span> Person {}
+</pre>
 </div></div>
 
 <p>Some possibilities are immediately obvious: you may wish to write a messaging system which sends emails to both Students and Teachers. Rather than deal with the two classes separately, now you can move the emailAddress attribute to the Person superclass. Your messaging framework can now work with Person, irrespective if they are students, tutors or any other subclasss of Person. Or perhaps you want to be able to link book loans to both Students and Teachers. You can do this by moving the relationship with book loans into the Person superclass.</p>
@@ -143,12 +144,13 @@
 
 <p>Sometimes you don't need inheritance but rather you want Cayenne to give you a simple way to define an interface for your classes. The regular Student and Teacher classes both need to implement emailAddress attributes so that you have a consistent way to access that attribute.</p>
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">interface</span> Address {
 	<span class="code-keyword">public</span> <span class="code-object">String</span> getEmailAddress();
 }
 <span class="code-keyword">public</span> class Teacher <span class="code-keyword">extends</span> PersistentObject <span class="code-keyword">implements</span> Address {}
-<span class="code-keyword">public</span> class Student <span class="code-keyword">extends</span> PersistentObject <span class="code-keyword">implements</span> Address {}</pre>
+<span class="code-keyword">public</span> class Student <span class="code-keyword">extends</span> PersistentObject <span class="code-keyword">implements</span> Address {}
+</pre>
 </div></div></div>
 </div>
   <div class="clearer">.</div>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Modeling%20Enumerations/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Enumerations/index.html Sun Oct 25 12:06:20 2009
@@ -56,7 +56,7 @@
 </div>
 <div id="ConfluenceContent"><h2><a name="ModelingEnumerations-MappingandModelingJavaEnumerations"></a>Mapping and Modeling Java Enumerations</h2>
 
-<p>Cayenne natively supports Java 1.5 <span class="nobr"><a href="http://java.sun.com/j2se/1.5.0/docs/guide/language/enums.html" title="Visit page outside Confluence" rel="nofollow">custom enumerations<sup><img class="rendericon" src="../../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>.  There are two levels of support.  The more flexible method is to implement the Cayenne ExtendedEnumeration interface and provide the database value for each enumeration.  The advantage of implementing this interface is it allows you to specify the exact database value represented by each enumeration and the enumerations are not order-fragile.  If you do not implement this interface, Cayenne will use a fallback approach and only use the enum's actual name (for a text column) or the ordinal position (for a numeric column, which is fragile).</p>
+<p>Cayenne natively supports Java 1.5 <a href="http://java.sun.com/j2se/1.5.0/docs/guide/language/enums.html" rel="nofollow">custom enumerations</a>.  There are two levels of support.  The more flexible method is to implement the Cayenne ExtendedEnumeration interface and provide the database value for each enumeration.  The advantage of implementing this interface is it allows you to specify the exact database value represented by each enumeration and the enumerations are not order-fragile.  If you do not implement this interface, Cayenne will use a fallback approach and only use the enum's actual name (for a text column) or the ordinal position (for a numeric column, which is fragile).</p>
 
 <p>Regardless of which incarnation you use, in Cayenne Modeler's ObjEntity editor, under the Attributes tab, give the full class name for your enumeration under the Java Type column.  This column is pre-filled with java.lang.String, etc., but you can provide your own Java type there:</p>
 
@@ -72,7 +72,7 @@
 
 <p>Here is an example mapping enumerations to integers:</p>
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.ExtendedEnumeration;
 
 <span class="code-keyword">public</span> <span class="code-keyword">enum</span> Color <span class="code-keyword">implements</span> ExtendedEnumeration {
@@ -96,7 +96,7 @@
 
 <p>An example mapping enumerations to strings:</p>
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.ExtendedEnumeration;
 
 <span class="code-keyword">public</span> <span class="code-keyword">enum</span> State <span class="code-keyword">implements</span> ExtendedEnumeration {
@@ -120,7 +120,7 @@
 
 <p>The final example illustrates how the database can store one value, but you might want to utilize a different internal value for calculations or some other purpose:</p>
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java"><span class="code-keyword">import</span> org.apache.cayenne.ExtendedEnumeration;
 
 <span class="code-keyword">public</span> <span class="code-keyword">enum</span> InterestTerm <span class="code-keyword">implements</span> ExtendedEnumeration
@@ -156,7 +156,7 @@
 
 <p>Cayenne's support for standard enumerations maps the enum's actual name (if a string column) or the ordinal position (if a numeric column).  Given the Color example declared this way:</p>
 
-<div class="code"><div class="codeContent">
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <pre class="code-java"><span class="code-keyword">public</span> <span class="code-keyword">enum</span> Color {
   RED, GREEN, BLUE;
 }</pre>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Modeling%20Object%20Layer/Modeling%20Inheritance/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Modeling Object Layer/Modeling Inheritance/index.html Sun Oct 25 12:06:20 2009
@@ -99,8 +99,7 @@
 </tr>
 </tbody></table>
 
-<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">Qualifiers Note</b><br />
-<p>Qualifiers are not inherited! When defining qualifiers for inheritance purposes keep in mind that the actual qualifier built by Cayenne will include the qualifier of a root entity and qualifiers of all its known subentities joined using "or" operator, as shown in the above example. </p></td></tr></table></div>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Qualifiers Note</b><br /><p>Qualifiers are not inherited! When defining qualifiers for inheritance purposes keep in mind that the actual qualifier built by Cayenne will include the qualifier of a root entity and qualifiers of all its known subentities joined using "or" operator, as shown in the above example. </p></td></tr></table></div></div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Converting an Existing Business Framework/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/ORM%20Case%20Study/Converting%20an%20Existing%20Business%20Framework/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Converting an Existing Business Framework/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/ORM Case Study/Converting an Existing Business Framework/index.html Sun Oct 25 12:06:20 2009
@@ -54,8 +54,7 @@
 
 <p>If there is an existing data layer (e.g. DAO) that needs to be converted to Cayenne, currently most of the mapping tasks will have to be done manually using the Modeler.</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">Note for EOF Users</b><br />
-<p>CayenneModeler provides import function for the EOModels. So most of the mapping conversions should be automatic.</p></td></tr></table>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Note for EOF Users</b><br /><p>CayenneModeler provides import function for the EOModels. So most of the mapping conversions should be automatic.</p></td></tr></table></div>
 
 <p>In any case there is a good chance of reusing business methods already defined in a persistence framework. And definitely any existing database can be used as is. One possible approach to conversion is to follow these steps:</p>
 

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler%20Guide/Preferences%20Panel/ClassPath/index.html?rev=829552&r1=829551&r2=829552&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/Documentation/Modeler Guide/Preferences Panel/ClassPath/index.html Sun Oct 25 12:06:20 2009
@@ -54,8 +54,7 @@
 
 <p>ClassPath Preferences panel allows users to add or remove locations of the external class libraries (JAR, ZIP, or class directories). These external libraries will be used by CayenneModeler to load JDBC drivers, custom DB adapters, or any other Java resources that are not a part of the Modeler distribution itself.</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">Modeler ClassNotFound Errors</b><br />
-<p>If you encounter any CLASSPATH-related errors during DB reverse engineering, DataSource configuration, etc., in most cases you simply need to go to Preferences ClassPath panel and add an entry pointing to a missing external library. </p></td></tr></table>
+<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="../../../../images/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Modeler ClassNotFound Errors</b><br /><p>If you encounter any CLASSPATH-related errors during DB reverse engineering, DataSource configuration, etc., in most cases you simply need to go to Preferences ClassPath panel and add an entry pointing to a missing external library. </p></td></tr></table></div>
 
 <p><img src="prefs-classpath.jpg" align="absmiddle" border="0" /></p></div>
 </div>

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=829552&r1=829551&r2=829552&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 Sun Oct 25 12:06:20 2009
@@ -46,7 +46,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.ibm.com/db2/" title="Visit page outside Confluence" rel="nofollow">http://www.ibm.com/db2/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.ibm.com/db2/" rel="nofollow">http://www.ibm.com/db2/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -64,7 +64,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://db.apache.org/derby/" title="Visit page outside Confluence" rel="nofollow">http://db.apache.org/derby/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://db.apache.org/derby/" rel="nofollow">http://db.apache.org/derby/</a></td>
 </tr>
 <tr>
 <th class='confluenceTh'>&nbsp;</th>
@@ -99,7 +99,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://firebird.sourceforge.net/" title="Visit page outside Confluence" rel="nofollow">http://firebird.sourceforge.net/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://firebird.sourceforge.net/" rel="nofollow">http://firebird.sourceforge.net/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -120,7 +120,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.frontbase.com/" title="Visit page outside Confluence" rel="nofollow">http://www.frontbase.com/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.frontbase.com/" rel="nofollow">http://www.frontbase.com/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -138,7 +138,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://hsqldb.sourceforge.net/" title="Visit page outside Confluence" rel="nofollow">http://hsqldb.sourceforge.net/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://hsqldb.sourceforge.net/" rel="nofollow">http://hsqldb.sourceforge.net/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -150,7 +150,7 @@
 </tr>
 <tr>
 <td class='confluenceTd'>Sample URL</td>
-<td class='confluenceTd'>jdbc:hsqldb:<span class="nobr"><a href="file:/path-to-hsql-db-files" title="Visit page outside Confluence" rel="nofollow">file:/path-to-hsql-db-files<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'>jdbc:hsqldb:<a href="file:/path-to-hsql-db-files" rel="nofollow">file:/path-to-hsql-db-files</a></td>
 </tr>
 <tr>
 <th class='confluenceTh'>&nbsp;</th>
@@ -170,7 +170,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.h2database.com/" title="Visit page outside Confluence" rel="nofollow">http://www.h2database.com/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.h2database.com/" rel="nofollow">http://www.h2database.com/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -193,7 +193,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://opensource.ca.com/projects/ingres/" title="Visit page outside Confluence" rel="nofollow">http://opensource.ca.com/projects/ingres/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.ingres.com/products/ingres-database.php" rel="nofollow">http://www.ingres.com/products/ingres-database.php</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -210,7 +210,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.mysql.com/" title="Visit page outside Confluence" rel="nofollow">http://www.mysql.com/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.mysql.com/" rel="nofollow">http://www.mysql.com/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -227,7 +227,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.openbase.com/" title="Visit page outside Confluence" rel="nofollow">http://www.openbase.com/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.openbase.com/" rel="nofollow">http://www.openbase.com/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -244,7 +244,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://oracle.com/" title="Visit page outside Confluence" rel="nofollow">http://oracle.com/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://oracle.com/" rel="nofollow">http://oracle.com/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -261,7 +261,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://oracle.com/" title="Visit page outside Confluence" rel="nofollow">http://oracle.com/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://oracle.com/" rel="nofollow">http://oracle.com/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -278,7 +278,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.postgresql.org/" title="Visit page outside Confluence" rel="nofollow">http://www.postgresql.org/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.postgresql.org/" rel="nofollow">http://www.postgresql.org/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -296,7 +296,7 @@
 <table class='confluenceTable'><tbody>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.sqlite.org/" title="Visit page outside Confluence" rel="nofollow">http://www.sqlite.org/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> <span class="nobr"><a href="http://www.zentus.com/sqlitejdbc/" title="Visit page outside Confluence" rel="nofollow">http://www.zentus.com/sqlitejdbc/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.sqlite.org/" rel="nofollow">http://www.sqlite.org/</a> <a href="http://www.zentus.com/sqlitejdbc/" rel="nofollow">http://www.zentus.com/sqlitejdbc/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -318,7 +318,7 @@
 </tr>
 <tr>
 <td class='confluenceTd'>Vendor Site</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>
+<td class='confluenceTd'><a href="http://msdn.microsoft.com/en-us/data/aa937724.aspx" rel="nofollow">http://msdn.microsoft.com/en-us/data/aa937724.aspx</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -346,7 +346,7 @@
 </tr>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://jtds.sourceforge.net/" title="Visit page outside Confluence" rel="nofollow">http://jtds.sourceforge.net/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://jtds.sourceforge.net/" rel="nofollow">http://jtds.sourceforge.net/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -367,7 +367,7 @@
 </tr>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://www.sybase.com/" title="Visit page outside Confluence" rel="nofollow">http://www.sybase.com/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://www.sybase.com/" rel="nofollow">http://www.sybase.com/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>
@@ -383,7 +383,7 @@
 </tr>
 <tr>
 <td class='confluenceTd'>Vendor Site</td>
-<td class='confluenceTd'><span class="nobr"><a href="http://jtds.sourceforge.net/" title="Visit page outside Confluence" rel="nofollow">http://jtds.sourceforge.net/<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span></td>
+<td class='confluenceTd'><a href="http://jtds.sourceforge.net/" rel="nofollow">http://jtds.sourceforge.net/</a></td>
 </tr>
 <tr>
 <td class='confluenceTd'>Driver Name</td>

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=829552&r1=829551&r2=829552&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 Sun Oct 25 12:06:20 2009
@@ -44,20 +44,20 @@
 
 <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=2" 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=2" 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=2" 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=2" 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><a href="cayenne-project-1_1.dtd?version=2">cayenne-project-1_1.dtd</a></li>
+	<li><a href="cayenne-data-map-1_2.dtd?version=2">cayenne-data-map-1_2.dtd</a></li>
+	<li><a href="cayenne-data-view-1_1.dtd?version=2">cayenne-data-view-1_1.dtd</a></li>
+	<li><a href="cayenne-driver-1_1.dtd?version=2">cayenne-driver-1_1.dtd</a></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>
+<div class='panelMacro'><table class='warningMacro'><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>Upgrade Warning</b><br />Saving projects with CayenneModeler v.1.1 will render them uneditable with CayenneModeler v.1.0.</td></tr></table></div>
 
 <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>
-	<li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYDOC12/Object+Caching" title="Object Caching">CAYDOC12:Object Caching</a></li>
+	<li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYDOC12/Object+Caching" title="Object Caching">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>
@@ -77,11 +77,11 @@
 
 <h3><a name="Guideto1.1Features-DataViewsandDVModeler"></a>Data Views and DVModeler</h3>
 
-<p><a href="http://cwiki.apache.org/confluence/confluence/display/CAYDV/Index" title="Index">CAYDV:Index</a> 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>
+<p><a href="http://cwiki.apache.org/confluence/confluence/display/CAYDV/Index" title="Index">Index</a> 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>
 
-<p>Cayenne now includes a generic <a href="../../../Documentation/Cayenne Guide/Design/Runtime Components/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>
+<p>Cayenne now includes a generic <a href="../../../Documentation/Cayenne Guide/Design/Runtime Components/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>
 
@@ -136,7 +136,7 @@
 
 <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>
-	<li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYDOC/Design#Design-CayenneTransactions" title="Cayenne Transactions on Design">Understanding Transactions</a></li>
+	<li><a href="http://cwiki.apache.org/confluence/confluence/display/CAYDOC/Design#Design-CayenneTransactions">Understanding Transactions</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=829552&r1=829551&r2=829552&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 Sun Oct 25 12:06:20 2009
@@ -123,7 +123,7 @@
 	<li>New adapter for Ingres</li>
 	<li>MySQL adapter is improved to support referential integrity constraints for InnoDB tables.</li>
 	<li>Adapter Auto Detection. Users no longer need to specify DbAdapter in the Modeler. All standard adapters are "guessed" by Cayenne in runtime using database metadata. Only custom adapters need to be set explicitly, using the new "Adapter" tab in the DataNode Editor panel. This simplifies configuration, makes deployment more transparent, and allows Cayenne to dynamically tweak adapter settings depending on the underlying database version and runtime parameters.</li>
-	<li><span class="nobr"><a href="http://objectstyle.org/cayenne/userguide/access-stack/extended-types.html" title="Visit page outside Confluence" rel="nofollow">Extended type mechanism<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span> now allows mapping a persistent property as an interface. This can be achieved via ExtendedTypeFactory API. A custom <tt>ExtendedTypeFactory</tt> is registered in a manner similar to ExtendedType with adapter's <tt>ExtendedTypeMap</tt>: <tt>extendedTypeMap.addFactory(myFactory)</tt>. Cayenne already takes advantage of this API by providing a factory that handles an arbitrary JDK 1.5 Enum via reflection.</li>
+	<li><a href="http://objectstyle.org/cayenne/userguide/access-stack/extended-types.html" rel="nofollow">Extended type mechanism</a> now allows mapping a persistent property as an interface. This can be achieved via ExtendedTypeFactory API. A custom <tt>ExtendedTypeFactory</tt> is registered in a manner similar to ExtendedType with adapter's <tt>ExtendedTypeMap</tt>: <tt>extendedTypeMap.addFactory(myFactory)</tt>. Cayenne already takes advantage of this API by providing a factory that handles an arbitrary JDK 1.5 Enum via reflection.</li>
 </ul>
 
 



Mime
View raw message