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

Modified: websites/staging/cayenne/trunk/content/doc12/persistent-object-lifecycle.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/persistent-object-lifecycle.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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.objectstyle.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>
@@ -26,8 +38,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"));

Modified: websites/staging/cayenne/trunk/content/doc12/preferences-panel.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/preferences-panel.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/preferences-panel.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>CayenneModeler relies on a number of user-specific preferences to operate in a user-friendly manner. Some preferences are determined automatically behind the scenes (such as preferred window size or last visited directory), some can be configured by users via &quot;Preferences Panel&quot; described in this chapter.</P>
@@ -29,8 +41,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/doc12/prefetching.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/prefetching.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/prefetching.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="Prefetching-IntroductiontoPrefetching"></A>Introduction to Prefetching</H3>
@@ -135,8 +147,11 @@ context.performQuery(query);
 
 
        <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/doc12/primary-key-generation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/primary-key-generation.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/primary-key-generation.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 the type of persistent objects and the database design, primary key values can be handled in a few different ways. A decision to use one or another technique will affect how the mapping is done. Here is a summary of possible scenarios. Each one is described below in details.</P>
@@ -84,8 +96,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/doc12/qualifier-expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/qualifier-expressions.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/qualifier-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">
        	
 
 <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>This chapter is dedicated to the use of expressions as qualifiers. A detailed discussion on expressions in general is provided at <A href="expressions.html" title="Expressions">Expressions</A>.</TD></TR></TABLE></DIV>
@@ -33,8 +45,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/doc12/queries-stored-in-datamap.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/queries-stored-in-datamap.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/queries-stored-in-datamap.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 facilitate reuse of queries users can assign symbolic names to them and store such named queries in a DataMap. Normally this is done by <A href="modeling-queries.html" title="Modeling Queries">creating a query in CayenneModeler</A>. Storing queries in a DataMap reduces the amount of code and speeds up query creation process.</P>
@@ -44,8 +56,11 @@ SelectQuery query = prototype.queryWithP
 </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/doc12/queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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>Queries are Cayenne abstraction for communicating with an external data storage. Queries are Java objects that are generally independent from the SQL dialect used by the target database. Cayenne includes a number of standard queries in the <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/package-summary.html" class="external-link" rel="nofollow">org.objectstyle.cayenne.query</A> package. Many of them are only used internally. Here we describe the queries that can be useful in the application.</P>
@@ -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/doc12/querychain.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/querychain.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/querychain.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>QueryChain</TT>, as the name implies, is a Query that is itself a collection of other queries. It simplifies an execution of multiple queries in a single batch. E.g.:</P>
@@ -27,8 +39,11 @@ context.performNonSelectingQuery(query);
 </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/doc12/quick-start.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/quick-start.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/quick-start.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 provides a step-by-step tutorial on writing a full database application with Cayenne. When you are done with it, you should have an understanding of the basics of object relational mapping with CayenneModeler and how to use Cayenne in standalone (command line or otherwise) and web applications. The tutorial uses the Eclipse IDE (since it is free and very common) and Derby database (since it supports embedded mode and thus requires zero setup), however it can be easily applied to any other database and/or IDE's.</P>
@@ -56,8 +68,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/doc12/relationshipquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/relationshipquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/relationshipquery.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>RelationshipQuery</TT> is used by Cayenne internally to fetch object(s) related to a single given object via a mapped ObjRelationship. In some cases the query can be used directly in the application, e.g. if we want to refresh related objects.</P>
@@ -23,8 +35,11 @@ List paintings = context.performQuery(qu
 </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/doc12/relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/relationships.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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">
        	
 
 <P>Relationships are special <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/DataObject.html" class="external-link" rel="nofollow">DataObject</A> properties that reference other &quot;related&quot; objects. Semantically there are two types of relationships - to-one pointing to just a single DataObjects (e.g. Painting.toArtist), and to-many pointing to a collection of DataObjects of the same base type (e.g. Artist.paintingArray).</P>
@@ -58,8 +70,11 @@ artist.addToPaintingArray(newPainting);
 <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>While to-many relationships in Cayenne are represented by Lists, they are really ordered Sets, as they are not allowed to contain the same object more than once.</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/doc12/remote-object-persistence-client-deployment.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-client-deployment.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-client-deployment.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>Any J2SE or J2EE application can act as a CWS Client, so its structure and packaging depends on the type of application. Here is a few general hints related to Cayenne:</P>
@@ -57,8 +69,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/doc12/remote-object-persistence-coding-client.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-coding-client.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-coding-client.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="RemoteObjectPersistenceCodingClient-ConnectingtotheService"></A>Connecting to the Service</H3>
@@ -79,8 +91,11 @@ ObjectContext context = <SPAN class="cod
 </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/doc12/remote-object-persistence-coding-server.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-coding-server.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-coding-server.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>
 In the simplest case, there is no custom code on the server. The server would only contain Cayenne mapping files, persistent classes and web.xml descriptor <A href="remote-object-persistence-cws-deployment.html" title="Remote Object Persistence CWS Deployment">specifying deployment parameters</A> of the service. Customization is done via subclassing <TT>org.objectstyle.cayenne.remote.hessian.service.HessianServlet</TT>, and adding business logic to the server-side persistent objects (e.g. in the validation methods).</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/doc12/remote-object-persistence-comparison.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-comparison.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-comparison.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>TBD...</P>
@@ -23,8 +35,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/doc12/remote-object-persistence-cws-deployment.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-cws-deployment.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-cws-deployment.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="RemoteObjectPersistenceCWSDeployment-CWSDeploymentwithHessian"></A>CWS Deployment with Hessian</H2>
@@ -122,8 +134,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/doc12/remote-object-persistence-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-features.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-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">
        	
 
 <H3><A name="RemoteObjectPersistenceFeatures-FeaturesofRemoteObjectPersistenceTechnology"></A>Features of Remote Object Persistence Technology</H3>
@@ -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/doc12/remote-object-persistence-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-guide.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-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="RemoteObjectPersistenceGuide-RemoteObjectPersistenceGuide"></A>Remote Object Persistence Guide</H2>
 <OL>
 	<LI><A href="remote-object-persistence-introduction.html" title="Remote Object Persistence Introduction">Introduction</A></LI>
@@ -33,8 +45,11 @@
 <UL><LI><A href="remote-object-persistence-client-deployment.html" title="Remote Object Persistence Client Deployment">Remote Object Persistence Client Deployment</A></LI><LI><A href="remote-object-persistence-coding-client.html" title="Remote Object Persistence Coding Client">Remote Object Persistence Coding Client</A></LI><LI><A href="remote-object-persistence-coding-server.html" title="Remote Object Persistence Coding Server">Remote Object Persistence Coding Server</A></LI><LI><A href="remote-object-persistence-comparison.html" title="Remote Object Persistence Comparison">Remote Object Persistence Comparison</A></LI><LI><A href="remote-object-persistence-cws-deployment.html" title="Remote Object Persistence CWS Deployment">Remote Object Persistence CWS Deployment</A></LI><LI><A href="remote-object-persistence-features.html" title="Remote Object Persistence Features">Remote Object Persistence Features</A></LI><LI><A href="remote-object-persistence-installation.html" title=
 "Remote Object Persistence Installation">Remote Object Persistence Installation</A></LI><LI><A href="remote-object-persistence-introduction.html" title="Remote Object Persistence Introduction">Remote Object Persistence Introduction</A></LI><LI><A href="remote-object-persistence-limitations.html" title="Remote Object Persistence Limitations">Remote Object Persistence Limitations</A></LI><LI><A href="remote-object-persistence-quick-start.html" title="Remote Object Persistence Quick Start">Remote Object Persistence Quick Start</A><UL><LI><A href="remote-object-persistence-tutorial-authentication.html" title="Remote Object Persistence Tutorial Authentication">Remote Object Persistence Tutorial Authentication</A></LI><LI><A href="remote-object-persistence-tutorial-client-code.html" title="Remote Object Persistence Tutorial Client Code">Remote Object Persistence Tutorial Client Code</A></LI><LI><A href="remote-object-persistence-tutorial-client-project.html" title="Remote Object P
 ersistence Tutorial Client Project">Remote Object Persistence Tutorial Client Project</A></LI><LI><A href="remote-object-persistence-tutorial-setup.html" title="Remote Object Persistence Tutorial Setup">Remote Object Persistence Tutorial Setup</A></LI><LI><A href="remote-object-persistence-tutorial-webservice.html" title="Remote Object Persistence Tutorial WebService">Remote Object Persistence Tutorial WebService</A></LI></UL></LI><LI><A href="remote-object-persistence-security.html" title="Remote Object Persistence Security">Remote Object Persistence Security</A></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/doc12/remote-object-persistence-installation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-installation.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-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="RemoteObjectPersistenceInstallation-InstallationandSystemRequirements"></A>Installation and System Requirements</H3>
@@ -35,8 +47,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/doc12/remote-object-persistence-introduction.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-introduction.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-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>&quot;Remote Object Persistence&quot; is a low-overhead web services-based technology that provides lightweight object persistence and query functionality to 'remote' applications. In other words it provides familiar Cayenne API to applications that do not have direct access to the database. Instead such applications would access <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAY&title=Cayenne%20Web%20Service" class="createlink">Cayenne Web Service (CWS)</A>. A single abstract data model (expressed as Cayenne XML DataMap) is used on the server and on the client, while execution logic can be partitioned between the tiers.</P>
@@ -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/doc12/remote-object-persistence-limitations.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-limitations.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-limitations.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 can be viewed as a Remote Object Persistence TODO. The following things are pending improvement:</P>
@@ -29,8 +41,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/doc12/remote-object-persistence-quick-start.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-quick-start.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-quick-start.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 tutorial is an extension of a <A href="quick-start.html" title="Quick Start">Quick Start</A> Cayenne tutorial, showing 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 Swing or SWT GUI application. We are showing the command line example to avoid dealing with UI details and concentrate on Cayenne API.</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/doc12/remote-object-persistence-security.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-security.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-security.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="RemoteObjectPersistenceSecurity-SecuringCayenneWebServiceAccess"></A>Securing Cayenne Web Service Access</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/doc12/remote-object-persistence-tutorial-authentication.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-tutorial-authentication.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-tutorial-authentication.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>You probably don't want everybody in the world to connect to your service and access (and update!) arbitrary data. The first step in securing Cayenne service is implementing client authentication. The easiest way to do it is to delegate the authentication task to the web container that is running the service. HessianConnection used in the <A href="remote-object-persistence-tutorial-client-code.html" title="Remote Object Persistence Tutorial Client Code">previous chapter</A> supports such authentication on the client side.</P>
@@ -159,8 +171,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/doc12/remote-object-persistence-tutorial-client-code.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-tutorial-client-code.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-tutorial-client-code.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="RemoteObjectPersistenceTutorialClientCode-StartingCommandLineClient"></A>Starting Command Line Client</H3>
@@ -151,8 +163,11 @@ INFO: === Message 7: flush-cascade-sync 
 
 
        <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/doc12/remote-object-persistence-tutorial-client-project.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-tutorial-client-project.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-tutorial-client-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">
        	
 
 <H3><A name="RemoteObjectPersistenceTutorialClientProject-CreateaClientProject"></A>Create a Client Project</H3>
@@ -70,8 +82,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/doc12/remote-object-persistence-tutorial-setup.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-tutorial-setup.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-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 starting point of this tutorial is a web application that was created in the <A href="quick-start.html" title="Quick Start">Quick Start</A> tutorial. If you went through the Quick Start tutorial already ignore these instructions and proceed to the next chapter. If you skipped it and want to start with Remote Object Persistence right away, below is a brief overview of the setup prerequisites. </P>
@@ -30,8 +42,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/doc12/remote-object-persistence-tutorial-webservice.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/remote-object-persistence-tutorial-webservice.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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">
        	
 
 <H3><A name="RemoteObjectPersistenceTutorialWebService-DeployingaWebService"></A>Deploying a Web Service</H3>
@@ -101,8 +113,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/doc12/reverse-engineer-database.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/reverse-engineer-database.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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>
@@ -32,8 +44,11 @@
 <P><SPAN class="image-wrap" style=""><IMG src="reverse-engineer-database.data/reengineer-schema.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/doc12/running-cayennemodeler.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/running-cayennemodeler.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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>
@@ -60,8 +72,11 @@ java -jar cayenne-modeler.jar</PRE>
 </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/doc12/running-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/running-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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>
@@ -82,8 +94,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/doc12/runtime-components.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/runtime-components.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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">
        	
 
 <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>
@@ -44,8 +56,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/doc12/scripting-sqltemplate.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/scripting-sqltemplate.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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>
@@ -200,8 +212,11 @@ SQLTemplate select = <SPAN class="code-k
 <P>TO BE DONE</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/doc12/selecting-objects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/selecting-objects.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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 addtion to returning data, such procedures can perform any other database operations.</P>
@@ -47,8 +59,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/doc12/selectquery-customization.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/selectquery-customization.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SelectQuery.html" class="external-link" rel="nofollow">SelectQueries</A> allow to fine tune the behavior of the fetch using the following API:</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/doc12/selectquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/selectquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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 <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SelectQuery.html" class="external-link" rel="nofollow">SelectQuery</A>. 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>
@@ -82,8 +94,11 @@ DataContext ctxt; <SPAN class="code-comm
 <P>There is a special case when a query is run using <TT>DataContext.performIteratedQuery()</TT>. This is discussed in &quot;Performance Tuning&quot; chapter.</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/doc12/setting-datamap-defaults.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/setting-datamap-defaults.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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>
@@ -44,8 +56,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/doc12/sqltemplate-query.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/sqltemplate-query.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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 DataObjects. For such cases Cayenne provides a powerful mechanism for running both selecting and non-selecting SQL using scriptable SQLTemplate query. This chapter describes how simple SQLTemplates can be created and executed with DataContext to select or update the database data. Subsequent chapters show how to build SQL dynamically, bind parameters and describe result sets using SQLTemplate scripting features.</P>
 
@@ -79,8 +91,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/doc12/standalone-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/standalone-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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>
@@ -51,8 +63,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/doc12/stored-procedures-and-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/stored-procedures-and-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/stored-procedures-and-transactions.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>
 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/doc12/stored-procedures.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/stored-procedures.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/stored-procedures.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>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 <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/ProcedureQuery.html" class="external-link" rel="nofollow">ProcedureQuery</A>, as described in the following chapters.</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/doc12/swing-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/swing-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/swing-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">
        	
 
 <P>Those who have experience of Swing GUI development knows how much time it takes to work out all the minutest details of formatting, in-place input validation, handling the interactive data modification, enforcing naming, order, and formatting consistensy, etc. Whenever the domain or requirements change (e.g. new attributes are added to an ObjEntity, formats or captions of data are modified, or relationships change their meaning) developers are faced with the necessity to go through the number of Swing data models, panels, various helpers fishing out the bits of code to be corrected.</P>
@@ -24,8 +36,11 @@
 <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><B>Validation</B><BR>The validation rules mentioned in the Use Cases are meant to be &quot;lightweght&quot;, i.e. it is generally agreed the validation related code to enforce the business rules should be located in the domain area but, still, there are various checks one could prefer to perform right in the presentation layer like inclusion in a predefined range of values, correct input format, sometimes, even preliminary credit card number validity check with the well known Luhn algorithm, the other kinds of sanity checks. Presently the validation is on the list of the features to be added.</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/doc12/system-requirements.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/system-requirements.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/system-requirements.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">
        <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases. We are working on JPA support">
 <META name="robots" content="index,follow">
@@ -79,8 +91,11 @@
             <LI><A href="http://cwiki.apache.org/CAY/">Wiki</A></LI>
 			<LI><A href="http://cayenne.apache.org/code-reposi
        <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/doc12/to-dep-pk-checkbox.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/to-dep-pk-checkbox.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/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>
@@ -26,8 +38,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"));