You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by bu...@apache.org on 2012/10/31 20:57:55 UTC

svn commit: r836771 [7/14] - in /websites/staging/cayenne/trunk/content: ./ doc12/ doc12/grammar/ doc20/ doc30/

Modified: websites/staging/cayenne/trunk/content/doc20/general-preferences.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/general-preferences.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/general-preferences.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H3><A name="GeneralPreferences-GeneralPreferences"></A>General Preferences</H3>
@@ -19,8 +31,11 @@
 <P>&quot;General Preferences&quot; panel currently supports configuration of a single parameter - &quot;Preferences Save Interval&quot;. This parameter determines how often should the Modeler commit preference values that it collects automatically during normal operation (e.g. main window or panel sizes, etc.). Don't set this to a small value as this may sometimes degrade Modeler performance. </P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/generate-database-schema.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/generate-database-schema.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/generate-database-schema.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H3><A name="GenerateDatabaseSchema-GenerateDatabaseSchema"></A>Generate Database Schema</H3>
@@ -25,8 +37,11 @@
 <P><SPAN class="image-wrap" style=""><IMG src="generate-database-schema.data/generate-options-tables.jpg" style="border: 0px solid black"></SPAN></P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/generate-java-classes.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/generate-java-classes.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/generate-java-classes.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>First we'd like to mention an alternative way of generating classes from the model, that can save time in many situtations compared to using the GUI: <A href="cgen.html" title="cgen">cgen Ant task</A> would automatically refresh generated classes when needed during the build.</P>
@@ -39,8 +51,11 @@
 <P><SPAN class="image-wrap" style=""><IMG src="generate-java-classes.data/generator2.jpg" style="border: 0px solid black"></SPAN></P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/generate-primary-key-support.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/generate-primary-key-support.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/generate-primary-key-support.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H3><A name="GeneratePrimaryKeySupport-GeneratePrimaryKeySupport"></A>Generate Primary Key Support</H3>
@@ -29,8 +41,11 @@
 <P>You must uncheck all options except for &quot;Create Primary key Support&quot;, and then click &quot;Generate&quot;. If there were any database specific errors during generation they will be listed in a status window. Sometimes such errors can be simply ignored (e.g. when a there was an existing primary key support already configured in the DB).</P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/generated-columns.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/generated-columns.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/generated-columns.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H2><A name="GeneratedColumns-WhatIsa%22Generated%22Column"></A>What Is a &quot;Generated&quot; Column</H2>
@@ -63,8 +75,11 @@ adapter.setSupportsGeneratedKeys(<SPAN c
 <DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>MS SQLServer Note</B><BR>MS drivers prior to 2005 version do not support generated columns, while newer drivers and <A href="http://jtds.sourceforge.net/" class="external-link" rel="nofollow">jTDS</A> support it just fine. Cayenne can automatically detect the driver type and configure SQLServerAdapter, but only when AutoAdapter is used. To make sure auto-detection works, clear the &quot;Custom Adapter&quot; field for the corresponding DataNode in the Modeler.</TD></TR></TABLE></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/generic-persistent-class.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/generic-persistent-class.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/generic-persistent-class.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	<P><A href="http://cwiki.apache.org/CAY/generic-dataobjects-example.html" class="external-link" rel="nofollow">Download the example code</A></P>
 
 <H2><A name="GenericPersistentClass-WhatIs%22GenericPersistentClass%22"></A>What Is &quot;Generic Persistent Class&quot;</H2>
@@ -93,8 +105,11 @@ object.writeProperty(<SPAN class="code-q
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/guide-to-11-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/guide-to-11-features.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/guide-to-11-features.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <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>
 
@@ -154,8 +166,11 @@
 <P>Also CayenneModeler supports mapping of all the new 1.1 framework features, such as DataMap queries, cache synchronization configuration, etc.</P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/guide-to-12-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/guide-to-12-features.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/guide-to-12-features.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>This page describes new features and other changes introduced in 1.2 release.</P>
@@ -170,8 +182,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/handling-inheritance.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/handling-inheritance.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/handling-inheritance.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>&quot;Inheritance&quot; is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called &quot;single table inheritance&quot;). Such mapping is described in detail in the <A href="modeling-inheritance.html" title="Modeling Inheritance">Modeler Guide</A>. The idea of single table inheritance is that a &quot;class&quot; of a database row is determined from the values in one or more columns of the base table. These columns are called &quot;class designator columns&quot;.</P>
@@ -104,8 +116,11 @@ List employees = context.performQuery(qu
 <DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Use <TT>setResolvingInherited(false)</TT> with caution, and only if you never plan to work with subclasses. The downside of it is that the DataContext may end up with two objects pointing to the same database row, thus violating uniquing principle. With the above example, this may happen if at a later time user decides to fetch Managers directly, or if a Manager object is obtained via a relationship.</TD></TR></TABLE></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/in-memory-evaluation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/in-memory-evaluation.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/in-memory-evaluation.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>In additions to providing a database-independent WHERE clause for SQL queries, expressions support in-memory evaluation. An expressions can be evaluated with any type of objects that follow Java Beans method naming convention. Of course this includes DataObjects. The following API is used for expressions evaluation:</P>
@@ -69,8 +81,11 @@ List startWithA = exp.filterObjects(arti
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/index.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/index.html Wed Oct 31 19:57:39 2012
@@ -11,12 +11,27 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	<P><B><A href="documentation.html" title="Documentation">Apache Cayenne Documentation, development release - v2.0</A></B></P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/installation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/installation.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/installation.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	<H3><A name="Installation-SystemRequirements"></A>System Requirements</H3>
 
 <UL>
@@ -45,8 +57,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/introduction-to-cayennemodeler.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/introduction-to-cayennemodeler.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/introduction-to-cayennemodeler.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>Cayenne stores mapping and deployment information using a set of XML files with a predefined format. These files can be always edited by hand, but Cayenne goes beyond that. A standard distribution contains CayenneModeler - a Java Swing GUI application that serves as an Object/Relational modeling tool. It is much more than just a specialized XML editor. It provides a comprehensive set of O/R functions, including:</P>
 
@@ -41,8 +53,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/introduction.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/introduction.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/introduction.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <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>
 
@@ -32,8 +44,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/iterating-through-data-rows.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/iterating-through-data-rows.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/iterating-through-data-rows.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>There are cases when the result sets are so large that even when fetching data rows, application can run out of memory. For instance, a user may be creating a report that requires in-memory processing of hundreds of thousands of database rows. In such cases normal Cayenne behavior of reading the whole java.sql.ResultSet in the memory before returning it to the user may result in an application exhausing all memory and crashing.</P>
 
@@ -67,8 +79,11 @@ ResultIterator it = <SPAN class="code-ke
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/jar-files-and-dependencies.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/jar-files-and-dependencies.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/jar-files-and-dependencies.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>This sections explains where all the relevant jar files are located. It also lists Cayenne dependencies.</P>
@@ -66,8 +78,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/java-interface-to-an-existing-database.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/java-interface-to-an-existing-database.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/java-interface-to-an-existing-database.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H3><A name="JavaInterfacetoanExistingDatabase-JavaInterfacetoanExistingDatabase"></A>Java Interface to an Existing Database</H3>
@@ -28,8 +40,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/license.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/license.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/license.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>This software is distributed and should be used on terms of Apache 2.0 software license. In short, it is free of charge, and unrestricted for commercial use. Here is the full license text:</P>
 
@@ -221,8 +233,11 @@
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/local-datasources.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/local-datasources.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/local-datasources.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H3><A name="LocalDataSources-LocalDataSources"></A>Local DataSources</H3>
@@ -21,8 +33,11 @@
 <P><SPAN class="image-wrap" style=""><IMG src="local-datasources.data/prefs-datasource.jpg" style="border: 0px solid black"></SPAN></P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/many-to-many-relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/many-to-many-relationships.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/many-to-many-relationships.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H3><A name="Many-to-ManyRelationships-ManytoManyRelationships"></A>Many-to-Many Relationships</H3>
@@ -24,8 +36,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/modeler-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/modeler-guide.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/modeler-guide.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	<H2><A name="ModelerGuide-Modelerguide"></A>Modeler guide</H2>
 
 <OL>
@@ -33,8 +45,11 @@
 <UL><LI><A href="cayenne-project-structure.html" title="Cayenne Project Structure">Cayenne Project Structure</A><UL><LI><A href="cayenne-datamaps.html" title="Cayenne DataMaps">Cayenne DataMaps</A></LI><LI><A href="cayenne-projects.html" title="Cayenne Projects">Cayenne Projects</A></LI></UL></LI><LI><A href="common-modeling-tasks.html" title="Common Modeling Tasks">Common Modeling Tasks</A><UL><LI><A href="create-datanode.html" title="Create DataNode">Create DataNode</A></LI><LI><A href="create-new-project.html" title="Create New Project">Create New Project</A></LI><LI><A href="generate-database-schema.html" title="Generate Database Schema">Generate Database Schema</A></LI><LI><A href="generate-java-classes.html" title="Generate Java Classes">Generate Java Classes</A></LI><LI><A href="generate-primary-key-support.html" title="Generate Primary Key Support">Generate Primary Key Support</A></LI><LI><A href="reverse-engineer-database.html" title="Reverse Engineer Database">Reve
 rse Engineer Database</A></LI><LI><A href="setting-datamap-defaults.html" title="Setting DataMap Defaults">Setting DataMap Defaults</A></LI></UL></LI><LI><A href="configuring-deployment-settings.html" title="Configuring Deployment Settings">Configuring Deployment Settings</A><UL><LI><A href="configuring-caching-behavior.html" title="Configuring Caching Behavior">Configuring Caching Behavior</A></LI><LI><A href="configuring-object-validation.html" title="Configuring Object Validation">Configuring Object Validation</A></LI><LI><A href="configuring-transactional-behavior.html" title="Configuring Transactional Behavior">Configuring Transactional Behavior</A></LI></UL></LI><LI><A href="introduction-to-cayennemodeler.html" title="Introduction to CayenneModeler">Introduction to CayenneModeler</A><UL><LI><A href="cayennemodeler-and-eclipse.html" title="CayenneModeler and Eclipse">CayenneModeler and Eclipse</A></LI><LI><A href="cayenne-user-directory.html" title="Cayenne User Directo
 ry">Cayenne User Directory</A></LI><LI><A href="general-navigation.html" title="General Navigation">General Navigation</A></LI><LI><A href="running-cayennemodeler.html" title="Running CayenneModeler">Running CayenneModeler</A></LI></UL></LI><LI><A href="modeling-database-layer.html" title="Modeling Database Layer">Modeling Database Layer</A><UL><LI><A href="to-dep-pk-checkbox.html" title="To Dep PK Checkbox">To Dep PK Checkbox</A></LI></UL></LI><LI><A href="modeling-object-layer.html" title="Modeling Object Layer">Modeling Object Layer</A><UL><LI><A href="cayennemodeler-flattened-relationships.html" title="CayenneModeler Flattened Relationships">CayenneModeler Flattened Relationships</A></LI><LI><A href="delete-rules.html" title="Delete Rules">Delete Rules</A></LI><LI><A href="many-to-many-relationships.html" title="Many-to-Many Relationships">Many-to-Many Relationships</A></LI><LI><A href="modeling-inheritance.html" title="Modeling Inheritance">Modeling Inheritance</A></LI>
 <LI><A href="modeling-objentities.html" title="Modeling ObjEntities">Modeling ObjEntities</A></LI><LI><A href="modeling-remote-persistence.html" title="Modeling Remote Persistence">Modeling Remote Persistence</A></LI></UL></LI><LI><A href="modeling-queries.html" title="Modeling Queries">Modeling Queries</A></LI><LI><A href="modeling-tips.html" title="Modeling Tips">Modeling Tips</A></LI><LI><A href="orm-case-study.html" title="ORM Case Study">ORM Case Study</A><UL><LI><A href="converting-an-existing-business-framework.html" title="Converting an Existing Business Framework">Converting an Existing Business Framework</A></LI><LI><A href="java-interface-to-an-existing-database.html" title="Java Interface to an Existing Database">Java Interface to an Existing Database</A></LI><LI><A href="new-system.html" title="New System">New System</A></LI></UL></LI><LI><A href="preferences-panel.html" title="Preferences Panel">Preferences Panel</A><UL><LI><A href="classpath.html" title="Class
 Path">ClassPath</A></LI><LI><A href="general-preferences.html" title="General Preferences">General Preferences</A></LI><LI><A href="local-datasources.html" title="Local DataSources">Local DataSources</A></LI></UL></LI></UL>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/modeling-database-layer.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/modeling-database-layer.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/modeling-database-layer.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>This chapter describes modeling the RDBMS schema in Cayenne.</P>
 
@@ -26,8 +38,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/modeling-inheritance.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/modeling-inheritance.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/modeling-inheritance.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H3><A name="ModelingInheritance-ModelingInheritance"></A>Modeling Inheritance</H3>
@@ -64,8 +76,11 @@
 <DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Qualifiers Note</B><BR>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 &quot;or&quot; operator, as shown in the above example.</TD></TR></TABLE></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/modeling-object-layer.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/modeling-object-layer.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/modeling-object-layer.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>This chapter describes modeling persistent object layer in Cayenne.</P>
 
@@ -28,8 +40,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/modeling-objentities.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/modeling-objentities.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/modeling-objentities.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <H3><A name="ModelingObjEntities-ModelingObjEntities"></A>Modeling ObjEntities</H3>
 
@@ -33,8 +45,11 @@
 <P>ObjEntities can hold a qualifier expression that is automatically appended to all SelectQueries rooted in a given ObjEntity. Entity qualifier can be viewed as a global data filter for a given entity. One area where this feature is used is <A href="modeling-inheritance.html" title="Modeling Inheritance">inheritance mapping</A>, however by itself it has nothing to do with inheritance as such and can be used standalone. To set an entity qualifier, type a Cayenne expression into the &quot;Qualifier&quot; field of the ObjEntity editor panel.</P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/modeling-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/modeling-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/modeling-queries.html Wed Oct 31 19:57:39 2012
@@ -11,14 +11,29 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	<P><BR>
 <BR>
 TBD </P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/modeling-remote-persistence.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/modeling-remote-persistence.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/modeling-remote-persistence.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P><B>TODO</B></P>
@@ -32,8 +44,11 @@ See Also <A href="../doc/remote-object-p
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/modeling-tips.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/modeling-tips.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/modeling-tips.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>This section contains a few unorganized tips on Object/Relational modeling in Cayenne. Some of these tips may become obsolete in the future as the Modeler evolves, making many things more transparent to the user.</P>
@@ -28,8 +40,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/moving-objects-between-contexts.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/moving-objects-between-contexts.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/moving-objects-between-contexts.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>Each instance of a DataObject belongs to only one DataContext for the duration of the object lifecycle. Sometimes there maybe a need to transfer a list of objects from one DataContext to another. The goal of this operation is to be able to use such objects in relationships with objects of the target DataContext. Most common use for this feature is the following. An application may have a &quot;shared&quot; DataContext that is used to fetch &quot;static&quot; read only lookup data. To avoid fetching the same data over and over again for each session, objects from the shared DataContext can be transferred to a session DataContext by calling <TT>DataContext.localObject()</TT>:</P>
@@ -36,8 +48,11 @@ User user; <SPAN class="code-comment">//
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/namedquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/namedquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/namedquery.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P><TT>NamedQuery</TT> is a query that is a reference to another query stored in the DataMap. It can hold named parameters that will be passed to the named query on execution.</P>
@@ -28,8 +40,11 @@ List matchingUsers = context.performQuer
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/nested-datacontexts.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/nested-datacontexts.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/nested-datacontexts.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>One of the goals of the DataContext is to provide an isolated area where local object changes can be performed without affecting other similar areas or the underlying storage. At some point in time users would either commit changes to the underlying storage or undo them (roll them back). </P>
@@ -59,8 +71,11 @@ DataContext child = context.createChildD
 <P>All cascading operations (such as a select query or a cascading update) initiated by a nested DataContext will have to travel through the stack of parent contexts, incurring certain delay at each stack level. The delay is due to the fact that each DataContext has to update its own objects during most operations. So nesting should only be used when application specifics require to do so. Also nesting of more than a few levels should be avoided.</P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/new-system.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/new-system.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/new-system.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <H3><A name="NewSystem-NewSystem"></A>New System</H3>
@@ -28,8 +40,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/null-handling.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/null-handling.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/null-handling.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>Handling of Java nulls as operands is no different from normal values. Instead of using special conditional operators, like SQL does, EQUAL_TO and NOT_EQUAL_TO expressions can be used directly with null values. It is up to Cayenne to translate expressions with nulls to the valid SQL.</P>
@@ -26,8 +38,11 @@
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/object-caching.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/object-caching.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/object-caching.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>Cayenne implements an advanced caching mechanism that has a goal of improving application performance and ensuring data consistency both across Java applications and sessions within the same application. The following classes participate in the caching mechanism:</P>
@@ -80,8 +92,11 @@ domain.getEventManager().addListener(
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/objectcontext.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/objectcontext.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/objectcontext.html Wed Oct 31 19:57:39 2012
@@ -11,15 +11,30 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P><TT>org.apache.cayenne.ObjectContext</TT> is an interface that defines API for the application interaction with Cayenne. Two most notable implementors are <A href="datacontext.html" title="DataContext">DataContext</A>, used in most Cayenne applications, and <TT>CayenneContext</TT> used on the <A href="remote-object-persistence-coding-client.html" title="Remote Object Persistence Coding Client">remote client</A>. </P>
 
 <P>ObjectContext accesses the underlying persistence stack via a parent <A href="datachannel.html" title="DataChannel">DataChannel</A>. ObjectContexts that support multiple levels of nesting (such as DataContext) themselves implement a <TT>org.apache.cayenne.DataChannel</TT> interface.</P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/objectidquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/objectidquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/objectidquery.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P><EM>(DataObjectUtils API below is available since 1.2M10. SingleObjectQuery, a precursor of ObjectIdQuery, was available since 1.2M9. In 1.2M12 SingleObjectQuery was renamed to ObjectIdQuery)</EM></P>
@@ -73,8 +85,11 @@ Artist object = (Artist) DataObjectUtils
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/obtaining-datacontext.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/obtaining-datacontext.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/obtaining-datacontext.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>Depending on deployment environment and application needs, Cayenne can be configured in a few different ways to make DataContext instances available. This is discussed in detail in deployment chapter. In this chapter we assume a properly deployed application and will concentrate on how to obtain a DataContext for the database access. The following are the most common ways to achieve that:</P>
 
@@ -90,8 +102,11 @@ DataContext context = DataContext.create
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/orm-case-study.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/orm-case-study.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/orm-case-study.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>This chapter shows how ORM (Object Relational Modeling) approach should be chosen based on the project requirements and other factors. It contains links to technical aspects of modeling that are discussed elsewhere. A few scenarios are shown below that describe the most common cases that a development team may encounter on a typical O/R project. Lets assume an imaginary company called &quot;Some Company&quot; that sells services to consumers as its main business, but also sells consumer products, and works with business customers. There are a number of project teams working on a set of Object/Relational projects. </P>
 
@@ -38,8 +50,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/paginated-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/paginated-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/paginated-queries.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>Another common situation found in interactive applications is when it is needed to fetch a large number of rows, and at the same time only a small subset of objects is accessed directly. An example of such application would be a search page. User would like to see how many total results exist that match a certain criteria, but she will only look at a few pages of results out of possibly hundreds or thousands. It will be extremely inefficient to fetch all objects in the memory.</P>
 
@@ -57,8 +69,11 @@ q.setPageSize(50);
 <DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Combining data rows and paginated queries</B><BR>Cayenne supports combining both performance optimizations in the same query - fetching data rows (see previous chapters) and paginated queries. So if users work with tabular data and don't care much about real objects, combining the two approaches would improve speed and memory use even more.</TD></TR></TABLE></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/parameterized-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/parameterized-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/parameterized-queries.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>SelectQuery objects can be rather complex. They may contain long qualifiers and lots of tuning parameters. Parameterized Queries feature addresses reusability of complex queries. With this feature, for each group of queries that differ only in the values used in the qualifier, a developer may create a single shared &quot;prototype&quot; or &quot;template&quot; query, and use it later as a factory for other queries. All settings configured in the prototype object will be passed to the final queries. Qualifier of the prototype query may use named parameters that are substituted for real values when a final query is created from the prototype.</P>
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>&quot;Prototype&quot; queries are normally created in CayenneModeler and stored in the DataMap XML file. &quot;Queries Stored in DataMap&quot; chapter describes how to use such templates. This chapter shows how to create them on the spot using the API calls.</TD></TR></TABLE></DIV>
@@ -92,8 +104,11 @@ SelectQuery query2 = proto.queryWithPara
 </DIV></DIV>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/path-expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/path-expressions.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/path-expressions.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 
 <P>Before we start discussing how to build expressions, it is important to understand one group of expressions widely used in Cayenne: path expressions. There are two types of path expressions: object path used to navigate graphs of Java objects that follow Java Bean property naming conventions and database path used to navigate the database schema.</P>
@@ -47,8 +59,11 @@
 <P>As described in the following chapters a path expression is usually matched against some value (see for example <A href="expression-factory-utilities.html" title="Expression Factory Utilities">ExpressionFactory API</A> - the first argument to each method is a path, and a second - an Object value that is matched against the path). Such value type must be compatible with the type of the property pointed to by the path. E.g. toArtist.artistName can only be matched against a String, and toArtist - against instances of Artist. </P>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/performance-tuning.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/performance-tuning.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/performance-tuning.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>Most performance problems in database applications, including those using ORM, are related to the inefficient queries and/or large volumes of data in the database. Here is a few common issues that a typical application may run into:</P>
 
@@ -37,8 +49,11 @@
 
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

Modified: websites/staging/cayenne/trunk/content/doc20/persistent-object-lifecycle.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc20/persistent-object-lifecycle.html (original)
+++ websites/staging/cayenne/trunk/content/doc20/persistent-object-lifecycle.html Wed Oct 31 19:57:39 2012
@@ -11,7 +11,19 @@
 <script type="text/javascript" src="/js/scripts.js"></script>
 </head>
 <body>
+<div id="wrap"><div id="wrap-inner">
 
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+
+<hr>
+<div id="content">
        	
 <P>A lifecycle of a persistent object can be represented as a number of states and transitions between them. These states are formally defined as &quot;int&quot; constants in <TT>org.apache.cayenne.PersistenceState</TT> class. Transitions between states (see the diagram below) occur in response to the application interacting with either persistent objects or Cayenne context. Whenever a transition occurs, Cayenne automatically updates &quot;persistenceState&quot; property of all affected objects by calling <TT>setPersistenceState()</TT>.</P>
 
@@ -25,8 +37,11 @@
 <SPAN class="image-wrap" style=""><IMG src="persistent-object-lifecycle.data/fetched-persistent-object.png" style="border: 0px solid black"></SPAN></P></TD></TR></TBODY></TABLE>
 
        <hr>
-       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation.
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation
+</div>
+</div>
 
+</div></div>
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));