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/11/08 18:49:08 UTC

svn commit: r837683 [8/28] - in /websites/staging/cayenne/trunk/content: ./ doc/2.0/ doc/2.0/api/cayenne/org/apache/cayenne/remote/hessian/service/ doc/3.0/ doc/3.0/api/org/apache/cayenne/dba/db2/class-use/ doc/3.0/api/org/apache/cayenne/dba/derby/clas...

Modified: websites/staging/cayenne/trunk/content/doc/2.0/running-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/running-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/running-queries.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 » Running Queries
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Running Queries</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
 
@@ -68,3 +115,12 @@ Runs a named non-selecting query stored 
 Runs a named non-selecting query stored in the DataMap, using a map of named parameters.</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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/runtime-components.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/runtime-components.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/runtime-components.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Runtime Components
-
-	<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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Runtime Components</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
 
 <P><SPAN class="image-wrap" style=""><IMG src="runtime-components.data/cayenne-runtime.png" style="border: 0px solid black"></SPAN></P>
 
@@ -25,3 +72,12 @@ Title: 2.0 &raquo; Runtime Components
 	<LI><A href="datasource.html" title="DataSource"><TT>org.apache.cayenne.conn</TT></A> - DataSource package.</LI>
 </OL>
 
+
+       <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/scripting-sqltemplate.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/scripting-sqltemplate.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/scripting-sqltemplate.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Scripting SQLTemplate
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Scripting SQLTemplate</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
 
@@ -186,3 +233,12 @@ SQLTemplate select = <SPAN class="code-k
 <H3><A name="ScriptingSQLTemplate-BindingObjectIdValues."></A>Binding ObjectId Values.</H3>
 
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/selecting-objects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/selecting-objects.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/selecting-objects.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Selecting Objects
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Selecting Objects</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
 
@@ -33,3 +80,12 @@ query.addParam(<SPAN class="code-quote">
 }
 </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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/selectquery-customization.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/selectquery-customization.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/selectquery-customization.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; SelectQuery Customization
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; SelectQuery Customization</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
@@ -17,3 +64,12 @@ Title: 2.0 &raquo; SelectQuery Customiza
  If set to a value greater than zero, tells Cayenne that query should do a &quot;lazy&quot; fetch, breaking result into &quot;pages&quot;. <A href="performance-tuning.html" title="Performance Tuning">Performance Tuning</A> has a detailed discussion of paged queries.</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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/selectquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/selectquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/selectquery.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; SelectQuery
-
-	<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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; SelectQuery</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
 
@@ -68,3 +115,12 @@ DataContext ctxt; <SPAN class="code-comm
 </PRE>
 </DIV></DIV>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/setting-datamap-defaults.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/setting-datamap-defaults.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/setting-datamap-defaults.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Setting DataMap Defaults
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Setting DataMap Defaults</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <H3><A name="SettingDataMapDefaults-SettingDataMapDefaults"></A>Setting DataMap Defaults</H3>
 
@@ -30,3 +77,12 @@ Title: 2.0 &raquo; Setting DataMap Defau
 <DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Defaults are ignored in runtime</B><BR>Note that none of the defaults affect entities runtime behavior. For example if a DbEntity &quot;ARTIST&quot; has empty schema, and a DataMap defines a default schema to be &quot;SCHEMA1&quot;, Cayenne will assume that ARTIST entity does not use schema.</TD></TR></TABLE></DIV></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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/sqltemplate-query.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/sqltemplate-query.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/sqltemplate-query.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; SQLTemplate Query
-
-	<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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; SQLTemplate Query</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
 
 <H3><A name="SQLTemplateQuery-CreatingSQLTemplate"></A>Creating SQLTemplate</H3>
 
@@ -64,3 +111,12 @@ List artists = dataContext.performQuery(
 query.setTemplate(PostgresAdapter.class.getName(), pgTemplate);
 </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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/standalone-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/standalone-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/standalone-applications.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Standalone Applications
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Standalone Applications</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
@@ -36,3 +83,12 @@ DataContext context = DataContext.create
 DataContext.bindThreadDataContext(context);
 </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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/stored-procedures-and-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/stored-procedures-and-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/stored-procedures-and-transactions.html Thu Nov  8 17:48:56 2012
@@ -1,5 +1,61 @@
-Title: 2.0 &raquo; Stored Procedures and Transactions
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Stored Procedures and Transactions</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	<P><BR>
+<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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/stored-procedures.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/stored-procedures.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/stored-procedures.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Stored Procedures
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Stored Procedures</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	<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>
+<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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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 ProcedureQuery, as described in the following chapters.</P>
 
 <H3><A name="StoredProcedures-Sections"></A>Sections</H3>
 
@@ -10,3 +57,12 @@ Title: 2.0 &raquo; Stored Procedures
 	<LI><A href="stored-procedures-and-transactions.html" title="Stored Procedures and Transactions">Stored Procedures and Transactions</A></LI>
 </OL>
 
+
+       <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/swing-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/swing-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/swing-applications.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Swing Applications
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Swing Applications</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
 
@@ -10,3 +57,12 @@ Title: 2.0 &raquo; Swing Applications
 <SPAN class="image-wrap" style=""><IMG src="swing-applications.data/dataview-usecases.gif" style="border: 0px solid black"></SPAN></P>
 
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/to-dep-pk-checkbox.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/to-dep-pk-checkbox.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/to-dep-pk-checkbox.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; To Dep PK Checkbox
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; To Dep PK Checkbox</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <H3><A name="ToDepPKCheckbox-%22ToDepPK%22Checkbox"></A>&quot;To Dep PK&quot; Checkbox</H3>
 
@@ -12,3 +59,12 @@ Title: 2.0 &raquo; To Dep PK Checkbox
 
 
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/turning-off-context-synchronization.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/turning-off-context-synchronization.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/turning-off-context-synchronization.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Turning off Context Synchronization
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Turning off Context Synchronization</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
 
@@ -21,3 +68,12 @@ Title: 2.0 &raquo; Turning off Context S
 <DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Don't use this for idle applications</B><BR>Note that this optimization does not affect percieved user commit time, as synchronization is done in a separate thread. It only affects the overall throughput. So it only makes sense if your application already utilizes close to a 100% of CPU.</TD></TR></TABLE></DIV>
 
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-datacontext.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-datacontext.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-datacontext.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial DataContext
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial DataContext</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <UL>
 	<LI>In Eclipse create a new class called &quot;Main&quot; in the <TT>&quot;cayenne.tutorial&quot;</TT> package.</LI>
 	<LI>Create a standard &quot;main&quot; method to make it a runnable class:</LI>
@@ -55,3 +102,12 @@ Title: 2.0 &raquo; Tutorial DataContext
 <HR>
 <P><B>Next Step: <A href="tutorial-dataobjects.html" title="Tutorial DataObjects">Tutorial DataObjects</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-dataobjects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-dataobjects.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-dataobjects.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial DataObjects
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial DataObjects</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>Persistent classes in Cayenne implement a <A href="dataobjects.html" title="DataObjects">DataObject interface</A>. If you inspect any of classes <A href="tutorial-generate-database-and-java-classes.html" title="Tutorial Generate Database and Java Classes">generated earlier</A> in this tutorial (e.g. <TT>cayenne.tutorial.Artist</TT>), you'll see that it extends a class with the name that starts with underscore (<TT>cayenne.tutorial.auto._Artist</TT>), which in turn extends from <TT>org.apache.cayenne.CayenneDataObject</TT>. Splitting each persistent class into user-customizable subclass (Xyz) and a generated superclass (_Xyz) is a useful technique to avoid overwriting of the custom code when refreshing classes from the mapping model.</P>
 
 <P>Let's add a utility method to the Artist class that sets Artist date of birth, taking a string argument for the date:</P>
@@ -120,3 +167,12 @@ INFO  QueryLogger: +++ transaction commi
 <HR>
 <P><B>Next Step: <A href="tutorial-mapping-query.html" title="Tutorial Mapping Query">Tutorial Mapping Query</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-delete.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-delete.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-delete.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial Delete
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial Delete</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Before we discuss the API for object deletion, lets go back to CayenneModeler and set up some <A href="delete-rules.html" title="Delete Rules">delete rules</A>. Doing this is optional but will simplify correct handling of the objects related to deleted  objects.</P>
 
@@ -57,3 +104,12 @@ INFO  QueryLogger: +++ transaction commi
 <HR>
 <P><B>Next Step: <A href="tutorial-webapp.html" title="Tutorial Webapp">Tutorial Webapp</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-generate-database-and-java-classes.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-generate-database-and-java-classes.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-generate-database-and-java-classes.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial Generate Database and Java Classes
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial Generate Database and Java Classes</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>CayenneModeler can be used to generate both database schema and Java classes from the single XML model. Very often the database already exists and is maintained independently (e.g., by a DBA). In this case you won't have to go through the first part of this procedure.</P>
 
@@ -44,3 +91,12 @@ Title: 2.0 &raquo; Tutorial Generate Dat
 <HR>
 <P><B>Next Step: <A href="tutorial-datacontext.html" title="Tutorial DataContext">Tutorial DataContext</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-mapping-query.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-mapping-query.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-mapping-query.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial Mapping Query
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial Mapping Query</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Now that we've got a feel of how <A href="tutorial-datacontext.html" title="Tutorial DataContext">DataContext works</A> and how to <A href="tutorial-dataobjects.html" title="Tutorial DataObjects">create and save objects</A>, let's take a small diversion and implement a piece of code that will delete all data from the database every time the tutorial application is started. We'll learn how to map a raw SQL query with parameters using the modeler and then execute it in the code.</P>
 
@@ -67,3 +114,12 @@ INFO  QueryLogger: === updated 1 row.</P
 <HR>
 <P><B>Next Step: <A href="tutorial-selectquery.html" title="Tutorial SelectQuery">Tutorial SelectQuery</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-object-relational-mapping.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-object-relational-mapping.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-object-relational-mapping.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial Object Relational Mapping
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial Object Relational Mapping</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Lets go back to CayenneModeler where we have the newly created project open. Our goal is to map the following schema:</P>
 
@@ -61,3 +108,12 @@ Now you need to synchronize relationship
 <HR>
 <P><B>Next Step: <A href="tutorial-generate-database-and-java-classes.html" title="Tutorial Generate Database and Java Classes">Tutorial Generate Database and Java Classes</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-selectquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-selectquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-selectquery.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial SelectQuery
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial SelectQuery</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>It was shown before how to <A href="tutorial-dataobjects.html" title="Tutorial DataObjects">persist new objects</A>. Cayenne <A href="queries.html" title="Queries">queries</A> are used to access already saved objects. The primary query type used for selecting objects is <A href="selectquery.html" title="SelectQuery">SelectQuery</A>. It can be mapped in CayenneModeler similar to how the SQLTemplate <A href="tutorial-mapping-query.html" title="Tutorial Mapping Query">was mapped</A>, in this chapter however we'll show how to create it using Cayenne API.</P>
 
@@ -64,3 +111,12 @@ INFO  QueryLogger: === returned 2 rows. 
 <HR>
 <P><B>Next Step: <A href="tutorial-delete.html" title="Tutorial Delete">Tutorial Delete</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-setup.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-setup.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-setup.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial Setup
-
-	<H3><A name="TutorialSetup-InstallJava"></A>Install Java</H3>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial Setup</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H3><A name="TutorialSetup-InstallJava"></A>Install Java</H3>
 
 <P>Make sure you have Java installed (JDK 1.4 or 1.5).</P>
 
@@ -40,3 +87,12 @@ Title: 2.0 &raquo; Tutorial Setup
 <HR>
 <P><B>Next Step: <A href="tutorial-starting-mapping-project.html" title="Tutorial Starting Mapping Project">Tutorial Starting Mapping Project</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-starting-mapping-project.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-starting-mapping-project.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-starting-mapping-project.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial Starting Mapping Project
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial Starting Mapping Project</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <H3><A name="TutorialStartingMappingProject-StartCayenneModeler"></A>Start CayenneModeler</H3>
 
@@ -43,3 +90,12 @@ Title: 2.0 &raquo; Tutorial Starting Map
 <HR>
 <P><B>Next Step: <A href="tutorial-object-relational-mapping.html" title="Tutorial Object Relational Mapping">Tutorial Object Relational Mapping</A></B></P>
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/tutorial-webapp.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/tutorial-webapp.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/tutorial-webapp.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Tutorial Webapp
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Tutorial Webapp</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>Now we'll convert the tutorial that we created to a web application. The web part of it is done in JSP and is intentionally primitive from the UI perspective, to concentrate on Cayenne integration aspect. There may be some specifics depending on the web framework used (JSP, Struts, JSF, Click, WebWork, Tapestry, etc.), still the procedure outlined here is quite universal as it relies on the J2EE servlet specification.</P>
 
 <P>A typical Cayenne web application works like this:</P>
@@ -210,3 +257,12 @@ INFO  QueryLogger: +++ transaction commi
 <P><SPAN class="image-wrap" style=""><IMG src="tutorial-webapp.data/artists.jpg" style="border: 0px solid black"></SPAN></P>
 
 <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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/understanding-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/understanding-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/understanding-transactions.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Understanding Transactions
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Understanding Transactions</title>
+<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.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</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">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<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>
@@ -137,3 +184,12 @@ Transaction tx = domain.createTransactio
 }
 </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. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>