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 [13/14] - in /websites/staging/cayenne/trunk/content: ./ doc12/ doc12/grammar/ doc20/ doc30/

Modified: websites/staging/cayenne/trunk/content/doc30/remote-object-persistence-tutorial-setup.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/remote-object-persistence-tutorial-setup.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/remote-object-persistence-tutorial-setup.html Wed Oct 31 19:57:39 2012
@@ -11,11 +11,26 @@
 <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">
        
        <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/doc30/remote-object-persistence-tutorial-webservice.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/remote-object-persistence-tutorial-webservice.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/remote-object-persistence-tutorial-webservice.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="RemoteObjectPersistenceTutorialWebService-SettingupDependencies"></A>Setting up Dependencies</H2>
 
 <P>Now lets get back to the <TT>&quot;tutorial&quot;</TT> project that contains a web application and set up dependencies. The only extra one that we don't have yet is <TT>resin-hessian.jar</TT>, just like the client, so let's add it (and the caucho repo declaration) to the <TT>pom.xml</TT>.</P>
@@ -128,8 +140,11 @@ INFO: finished configuration loading in 
 <HR>
 
        <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/doc30/remote-object-persistence-tutorial.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/remote-object-persistence-tutorial.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/remote-object-persistence-tutorial.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="RemoteObjectPersistenceTutorial-RemoteObjectPersistenceQuickStart"></A>Remote Object Persistence Quick Start</H2>
 <P>This tutorial is an extension of the <A href="tutorial.html" title="Tutorial">Cayenne tutorial</A>, and shows how to deploy an existing mapping project as a Cayenne web service, and then write a command-line client to access the service. Note that in most real applications the client will be a GUI application (Swing, SWT, etc). We are showing the command-line example to avoid dealing with UI details and concentrate on Cayenne API. Just like the Cayenne tutorial, this one uses Maven, Eclipse and Derby. Full tutorial source code in a form of Eclipse project is distributed with Cayenne (see <TT>&quot;tutorials/tutorial-rop-server&quot;</TT> and <TT>&quot;tutorials/tutorial-rop-client&quot;</TT> folders).</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/doc30/reverse-engineer-database.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/reverse-engineer-database.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/reverse-engineer-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="ReverseEngineerDatabase-ReverseEngineerDatabase"></A>Reverse Engineer Database</H3>
 
 
@@ -38,8 +50,11 @@
 <P><SPAN class="image-wrap" style=""><IMG src="reverse-engineer-database.data/reengineer-schema.png" 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/doc30/running-cayennemodeler.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/running-cayennemodeler.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/running-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>Follow the instructions below appropriate for the type of OS and Cayenne distribution that you have:</P>
 
 <H3><A name="RunningCayenneModeler-MacOSX"></A>Mac OS X</H3>
@@ -31,8 +43,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/doc30/running-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/running-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/running-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>Cayenne Query API is discussed in the following chapters. This chapter concentrates on how to execute an existing query via a DataContext. Still we'd like to point to a few aspects of the query API here, as they are important for the query execution discussion:</P>
 
@@ -81,8 +93,11 @@ Runs a named non-selecting query stored 
 
 
        <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/doc30/runtime-components.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/runtime-components.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/runtime-components.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="RuntimeComponents-RuntimeComponents"></A>Runtime Components</H2>
 <P>Cayenne runtime framework is an intermediary between a Java application and a relational database. The picture below shows the main components of the framework:</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/doc30/scripting-sqltemplate.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/scripting-sqltemplate.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/scripting-sqltemplate.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>SQLTemplate's internal SQL string is a dynamic script that is processed at runtime to generate PreparedStatement SQL code. Dynamic nature of SQLTemplate makes possible a few important things - it allows to bind parameters on the fly; it provides a way to pass extra information to Cayenne that is not included in the SQL text; it supports including/excluding chunks of SQL depending on runtime parameters.</P>
 
 <P>Scripting of SQL strings is done using <A href="http://velocity.apache.org/" class="external-link" rel="nofollow">Apache Velocity</A>. Velocity was chosen primarily for its concise template language (no XML tags within SQL!) that doesn't conflict with the SQL syntax. When creating dynamic SQL template, all standard Velocity directives are available, including <TT>#set</TT>, <TT>#foreach</TT>, <TT>#if</TT>. However due to the nature of the SQL and the need to integrate it with Cayenne runtime, only a few Cayenne custom directives are normally used. These directives (<TT>#bind</TT>..., <TT>#result</TT>, <TT>#chain</TT>, <TT>#chunk</TT>) are described below.</P>
@@ -256,8 +268,11 @@ SQLTemplate select = <SPAN class="code-k
 
 
        <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/doc30/selecting-objects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/selecting-objects.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/selecting-objects.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>If a stored procedure is known to return at least one result set, procedure queries can be executed just like normal select queries. Of course in addition to returning data, such procedures can perform any other database operations.</P>
 
 <P>Below is an example of creating a ProcedureQuery, initializing its parameters, and processing execution results.</P>
@@ -41,8 +53,11 @@ query.addParam(<SPAN class="code-quote">
 </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/doc30/selectquery-customization.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/selectquery-customization.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/selectquery-customization.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="selectquery.html" title="SelectQuery">SelectQueries</A> allow to fine tune the behavior of the fetch using the following API:</P>
 <UL>
 	<LI>public void <B>setFetchLimit</B>(int fetchLimit)<BR>
@@ -30,8 +42,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/doc30/selectquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/selectquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/selectquery.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>The most commonly used query is SelectQuery. It is a descriptor that allows DataContext to fetch lists of DataObjects of the right type matching the specified criteria. SelectQuery together with the DataMap provides just enough information to the Cayenne runtime objects to build the right SQL SELECT statement and control various execution parameters.</P>
 
 <H3><A name="SelectQuery-SelectQueryParts"></A>SelectQuery Parts</H3>
@@ -93,8 +105,11 @@ DataContext ctxt; <SPAN class="code-comm
 
 
        <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/doc30/setting-datamap-defaults.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/setting-datamap-defaults.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/setting-datamap-defaults.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="SettingDataMapDefaults-SettingDataMapDefaults"></A>Setting DataMap Defaults</H3>
 
@@ -43,8 +55,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/doc30/sqltemplate-basics.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/sqltemplate-basics.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/sqltemplate-basics.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="SQLTemplateBasics-CreatingSQLTemplate"></A>Creating SQLTemplate</H3>
 
 <P>SQLTemplates can be built using CayenneModeler. Here we demonstrate how to do the same thing via API. SQLTemplate consists of root and dynamic template string. Dynamic behavior of the template is discussed in subsequent chapters, for now it is sufficient to know that the template string is simply a valid SQL statement in the target database SQL dialect.</P>
@@ -76,8 +88,11 @@ query.setTemplate(PostgresAdapter.class.
 </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/doc30/sqltemplate-query.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/sqltemplate-query.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/sqltemplate-query.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>Not all features of SQL can (or should) be mapped in the object model in terms of Persistent objects. For such cases Cayenne provides a powerful mechanism for running both selecting and non-selecting SQL using scriptable SQLTemplate query. The following chapters describe how SQLTemplates can be created and executed, showing how to build SQL dynamically, bind parameters and describe result sets with SQLTemplate scripting features.</P>
 
 <H3><A name="SQLTemplateQuery-Sections"></A>Sections</H3>
@@ -25,8 +37,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/doc30/sqltemplate-result-mapping.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/sqltemplate-result-mapping.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/sqltemplate-result-mapping.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 pertains to selecting SQLTemplates that fetch a single result set. By default the returned result is a List of DataRows or Persistent objects, depending on how the query was configured. However SQLTemplate is much more powerful and can be set up to fetch  lists of scalars, and lists of Object[] instances with an arbitrary mix of objects and scalars.</P>
 
 <H3><A name="SQLTemplateResultMapping-DefaultResults"></A>Default Results</H3>
@@ -91,8 +103,11 @@ query.setResult(resultDescriptor);
 
 
        <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/doc30/standalone-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/standalone-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/standalone-applications.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="StandaloneApplications-SharedConfigurationSingleton"></A>Shared Configuration Singleton</H3>
 
 <P>In a standalone Java application, DefaultConfiguration is used to locate and load configuration files. This approach does not require any additional setup. Shared configuration instance can simply be obtained by calling <TT>getSharedConfiguration()</TT>:</P>
@@ -52,8 +64,11 @@ DataContext.bindThreadDataContext(contex
 </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/doc30/stored-procedures-and-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/stored-procedures-and-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/stored-procedures-and-transactions.html Wed Oct 31 19:57:39 2012
@@ -11,13 +11,28 @@
 <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>
 There maybe a situations when stored procedures handle their own transactions and an application is configured to use Cayenne-managed transactions. This is obviously conflicting and undesirable behavior. In this case ProcedureQueries should be executed explicitly wrapped in an &quot;external&quot; Transaction. This is one of the few cases when a user should worry about transactions at all. Read more about manual transactions <A href="understanding-transactions.html" title="Understanding Transactions">here</A>.</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/doc30/stored-procedures.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/stored-procedures.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/stored-procedures.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="StoredProcedures-StoredProcedures"></A>Stored Procedures</H2>
 <P>In addition to mapping database tables and views as entities, Cayenne allows mapping and executing database stored procedures. Just like table structure is described by DbEntities, stored procedures are described by Procedure class. Stored procedures are created using CayenneModeler, and are executed using ProcedureQuery, as described in the following chapters.</P>
 
@@ -25,8 +37,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/doc30/to-dep-pk-checkbox.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/to-dep-pk-checkbox.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/to-dep-pk-checkbox.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="ToDepPKCheckbox-%22ToDepPK%22Checkbox"></A>&quot;To Dep PK&quot; Checkbox</H3>
 
@@ -25,8 +37,11 @@
 <P>Normally one side of the relationship is considered &quot;master&quot; and another one - &quot;dependent&quot;, meaning that &quot;dependent&quot; part can not exist without a corresponding &quot;master&quot; record, while &quot;master&quot; record can exist without any dependents. This fact is reflected in Cayenne mapping. DbEntity &quot;Relationships&quot; panel contains &quot;To Dep PK&quot; column. The checkboxes in this column are disabled, unless the relationship only consists of the PK attributes. If this is the case, you must select the relationship going in the direction from &quot;master&quot; to &quot;dependent&quot; and check the &quot;To Dep PK&quot; checkbox on this relationship. Otherwise Cayenne will not be able to handle such relationship properly.</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/doc30/turning-off-context-synchronization.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/turning-off-context-synchronization.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/turning-off-context-synchronization.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 big part of commit operation is updating peer DataContexts with the changes committed to the database. The conext synchronization operation has <TT>O(N)</TT> performance, where <TT>N</TT> is the number of peer DataContexts. In a web application <TT>N</TT> is often the number of concurrent sessions, which can be quite big. The throughout of high volume applications can be  improved by turning off peer synchronization. One possible way to do that is via a custom <A href="datacontextfactory.html" title="DataContextFactory">DataContextFactory</A>:</P>
 
@@ -34,8 +46,11 @@
 <P><EM>Further improvements in this area are tracked via <A href="http://issues.apache.org/cayenne/browse/CAY-554" class="external-link" rel="nofollow">CAY-554 Jira issue</A>.</EM></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/doc30/tutorial-dataobjects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-dataobjects.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-dataobjects.html Wed Oct 31 19:57:39 2012
@@ -11,11 +11,26 @@
 <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">
        
        <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/doc30/tutorial-delete.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-delete.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-delete.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 explains how to model relationship delete rules and how to delete individual objects as well as sets of objects. Also demonstrated the use of <TT>DataObjectUtils</TT> class to run a query.</P>
 
 <H3><A name="TutorialDelete-SettingUpDeleteRules"></A>Setting Up Delete Rules</H3>
@@ -75,8 +87,11 @@ INFO: +++ transaction committed.
 <HR>
 
        <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/doc30/tutorial-generate-database-and-java-classes.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-generate-database-and-java-classes.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-generate-database-and-java-classes.html Wed Oct 31 19:57:39 2012
@@ -11,11 +11,26 @@
 <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">
        
        <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/doc30/tutorial-java-classes.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-java-classes.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-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>Here we'll generate the Java classes from the model that was created in the previous section. CayenneModeler can be used to also generate the database schema, but since we specified &quot;CreateIfNoSchemaStrategy&quot; earlier when we created a DataNode, we'll skip the database schema step. Still be aware that you can do it if you need to via <TT>&quot;Tools &gt; Create Database Schema&quot;</TT>.</P>
 
 <H3><A name="TutorialJavaClasses-CreatingJavaClasses"></A>Creating Java Classes</H3>
@@ -61,8 +73,11 @@
 <HR>
 
        <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/doc30/tutorial-mapping-query.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-mapping-query.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-mapping-query.html Wed Oct 31 19:57:39 2012
@@ -11,11 +11,26 @@
 <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">
        
        <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/doc30/tutorial-object-relational-mapping.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-object-relational-mapping.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-object-relational-mapping.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>The goal of this section is to learn how to create a simple Object-Relational model with CayenneModeler. We will create a complete ORM model for the following database schema:</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="tutorial-object-relational-mapping.data/database-schema.jpg" style="border: 0px solid black"></SPAN></P>
@@ -80,8 +92,11 @@
 <HR>
 
        <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/doc30/tutorial-objectcontext.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-objectcontext.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-objectcontext.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 this section we'll write a simple main class to run our application, and get a brief introduction to Cayenne ObjectContext.</P>
 
 <H3><A name="TutorialObjectContext-CreatingtheMainClass"></A>Creating the Main Class</H3>
@@ -98,8 +110,11 @@ INFO: finished configuration loading in 
 <HR>
 
        <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/doc30/tutorial-persistent-objects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-persistent-objects.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-persistent-objects.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 this section we'll learn about persistent objects, how to customize them and how to create and save them in DB.</P>
 
 <H3><A name="TutorialPersistentObjects-InspectingandCustomizingPersistentObjects"></A>Inspecting and Customizing Persistent Objects</H3>
@@ -152,8 +164,11 @@ INFO: +++ transaction committed.
 <HR>
 
        <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/doc30/tutorial-selectquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-selectquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-selectquery.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 shows how to select objects from the database using SelectQuery. </P>
 
 <H3><A name="TutorialSelectQuery-IntroducingSelectQuery"></A>Introducing SelectQuery</H3>
@@ -79,8 +91,11 @@ INFO: === returned 2 rows. - took 19 ms.
 <HR>
 
        <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/doc30/tutorial-setup.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-setup.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-setup.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>The goal of this section of the tutorial is to install (or check that you already have installed) a minimally needed set of software to build a Cayenne application.</P>
 
 <H3><A name="TutorialSetup-InstallJava"></A>Install Java</H3>
@@ -33,8 +45,11 @@
 <HR>
 
        <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/doc30/tutorial-starting-project.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-starting-project.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-starting-project.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>The goal of this section is to create a new Java project in Eclipse containing a basic Cayenne mapping. It presents an introduction to CayenneModeler GUI tool, showing how to create the initial mapping objects: DataDomain, DataNode, DataMap.</P>
 
 <H3><A name="TutorialStartingProject-CreateanewProjectinEclipse"></A>Create a new Project in Eclipse</H3>
@@ -75,8 +87,11 @@
 <HR>
 
        <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/doc30/tutorial-webapp.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial-webapp.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial-webapp.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 shows how to work with Cayenne in a web application.</P>
 
 <H3><A name="TutorialWebapp-ConvertingTutorialtoaWebApplication"></A>Converting Tutorial to a Web Application</H3>
@@ -285,8 +297,11 @@ INFO: +++ transaction committed.</PRE>
 <P>You are done with the tutorial!</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/doc30/tutorial.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/tutorial.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/tutorial.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="Tutorial-Tutorial"></A>Tutorial</H2>
 
 <P>This is a step-by-step tutorial showing how to write a database application with Cayenne. When you are done with it, you should have an understanding of the basics of object-relational mapping using CayenneModeler and how to use the Cayenne framework in standalone (command-line or otherwise) and web applications. The tutorial uses Maven, Eclipse IDE and Derby database, however it can be easily recreated with another combination of a database, an IDE and a build system. Full tutorial source code in a form of Eclipse project is distributed with Cayenne (see <TT>&quot;tutorials/tutorial&quot;</TT> folder).</P>
@@ -42,8 +54,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/doc30/understanding-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/understanding-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/understanding-transactions.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 has its own simple transaction API centered around <TT>org.apache.cayenne.access.Transaction</TT> class. Its goal is to ensure consistency of the DataContext database operations. It works either as a standalone mechanism, or in conjunction with another transaction framework, such as JTA or Spring. To switch between the two modes of operation, use &quot;Container-Managed Transactions&quot; checkbox in the DataDomain editing panel in CayenneModeler:</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="understanding-transactions.data/transactions-types.png" style="border: 0px solid black"></SPAN></P>
@@ -151,8 +163,11 @@ Transaction tx = domain.createTransactio
 </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/doc30/upgrade.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/upgrade.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/upgrade.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="Upgrade-GeneralUpgradeRecommendations"></A>General Upgrade Recommendations</H3>
 
 <UL>
@@ -214,8 +226,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/doc30/using-jndi.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/using-jndi.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/using-jndi.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 can be setup to obtain a DataSource via JNDI, instead of using its own connection pool. To do that Cayenne DataNodes must be configured to use <TT>JNDIDataSourceFactory</TT>. This can be done in the modeler as shown on the pictures below.</P>
 
 <P>1. Select JNDIDataSourceFactory:<BR>
@@ -73,8 +85,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/doc30/using-orderings.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/using-orderings.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/using-orderings.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>To sort SelectQuery results, Orderings are used. Orderings use path expressions discussed in the previous section to identify the attributes that must be used in sorting.  Orderings also use a SortOrder to identify how the ordering should be performed.</P>
 
 <P>There are 4 SortOrder options:</P>
@@ -80,8 +92,11 @@ orderings.add(<SPAN class="code-keyword"
 </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/doc30/web-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/web-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/web-applications.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="WebApplications-PuttingCayenneFilesinWebApplicationCLASSPATH"></A>Putting Cayenne Files in Web Application CLASSPATH</H3>
 
 <P>When deploying an application in a web container it is possible to follow the procedure for the standalone applications, i.e. put all XML files in the application CLASSPATH (e.g. in &quot;mywebapp/WEB-INF/classes/&quot;, but DON'T put it in container shared locations!). Session DataContext can be obtained via ServletUtil:</P>
@@ -88,8 +100,11 @@ WEB-INF/lib/...</PRE>
 
 
        <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/documentation-guidelines.html
==============================================================================
--- websites/staging/cayenne/trunk/content/documentation-guidelines.html (original)
+++ websites/staging/cayenne/trunk/content/documentation-guidelines.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p><a name="DocumentationGuidelines-DocumentationGuidelines"></a></p>

Modified: websites/staging/cayenne/trunk/content/documentation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/documentation.html (original)
+++ websites/staging/cayenne/trunk/content/documentation.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p><a name="Documentation-Documentation"></a></p>

Modified: websites/staging/cayenne/trunk/content/download.html
==============================================================================
--- websites/staging/cayenne/trunk/content/download.html (original)
+++ websites/staging/cayenne/trunk/content/download.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p><a name="Download-Download"></a></p>

Modified: websites/staging/cayenne/trunk/content/eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/eclipse.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p><a name="Eclipse-UsingEclipsewithMavenizedCayenne"></a></p>

Modified: websites/staging/cayenne/trunk/content/getting-started.html
==============================================================================
--- websites/staging/cayenne/trunk/content/getting-started.html (original)
+++ websites/staging/cayenne/trunk/content/getting-started.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p><a name="Gettingstarted-Gettingstarted"></a></p>

Modified: websites/staging/cayenne/trunk/content/how-can-i-help.html
==============================================================================
--- websites/staging/cayenne/trunk/content/how-can-i-help.html (original)
+++ websites/staging/cayenne/trunk/content/how-can-i-help.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p><a name="HowcanIhelp?-HowCanIHelp?"></a></p>

Modified: websites/staging/cayenne/trunk/content/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/index.html (original)
+++ websites/staging/cayenne/trunk/content/index.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p><a name="Index-ObjectRelationalMapping,PersistenceandCachingforJava"></a></p>

Modified: websites/staging/cayenne/trunk/content/legacy-ant-build.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-build.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-build.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p>This procedure applies to versions 1.2 and 2.0 that are built with Ant. To

Modified: websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p>Prior to a release latest documentation is exported from Confluence via a

Modified: websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p>Cayenne provides a comprehensive suite of unit tests. To execute unit tests

Modified: websites/staging/cayenne/trunk/content/legacy-eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-eclipse.html Wed Oct 31 19:57:39 2012
@@ -20,6 +20,7 @@
 
 <div id="container">
 
+ 
 <div id="sidebar">
 <ul id="nav">
 	<li><a href="/about.html">About</a>
@@ -33,15 +34,6 @@
 	<li><a href="/documentation.html">Documentation</a>
 		<ul>
 			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
-			<li class="trigger"><a href="/doc/documentation.html">Development trunk</a>
-				<ul>
-					<li><a href="/doc/overview.html">Overview</a></li>
-					<li><a href="/doc/cayenne-guide.html">Cayenne Guide</a></li>
-					<li><a href="/doc/remote-object-persistence-guide.html">Remote Client Guide</a></li>
-					<li><a href="/doc/modeler-guide.html">Modeler Guide</a></li>
-					<li><a href="/doc/api/index.html">JavaDoc</a></li>
-				</ul>
-			</li>
 			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
 				<ul>
 					<li><a href="/doc30/overview.html">Overview</a></li>
@@ -83,6 +75,7 @@
 </ul>
 </div>
 
+
 <hr>
 <div id="content">
        <p><a name="LegacyEclipse-UsingEclipsewithAntCayenne"></a></p>