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/09 08:29:36 UTC

svn commit: r837766 [14/23] - in /websites/staging/cayenne/trunk/content: ./ docs/ docs/1.2/ docs/2.0/ docs/3.0/ docs/3.1/

Modified: websites/staging/cayenne/trunk/content/docs/2.0/sqltemplate-query.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/sqltemplate-query.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/sqltemplate-query.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 » 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/standalone-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/standalone-applications.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/standalone-applications.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/stored-procedures-and-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/stored-procedures-and-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/stored-procedures-and-transactions.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/stored-procedures.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/stored-procedures.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/stored-procedures.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/swing-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/swing-applications.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/swing-applications.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/to-dep-pk-checkbox.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/to-dep-pk-checkbox.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/to-dep-pk-checkbox.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/turning-off-context-synchronization.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/turning-off-context-synchronization.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/turning-off-context-synchronization.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-datacontext.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-datacontext.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-datacontext.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-dataobjects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-dataobjects.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-dataobjects.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-delete.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-delete.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-delete.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-generate-database-and-java-classes.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-generate-database-and-java-classes.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-generate-database-and-java-classes.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-mapping-query.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-mapping-query.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-mapping-query.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-object-relational-mapping.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-object-relational-mapping.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-object-relational-mapping.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-selectquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-selectquery.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-selectquery.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-setup.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-setup.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-setup.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-starting-mapping-project.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-starting-mapping-project.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-starting-mapping-project.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/tutorial-webapp.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/tutorial-webapp.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/tutorial-webapp.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/understanding-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/understanding-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/understanding-transactions.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/upgrade.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/upgrade.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/upgrade.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Upgrade
-
-	
+<!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; Upgrade</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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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="Upgrade-GeneralUpgradeRecommendations"></A>General Upgrade Recommendations</H3>
 
 <UL>
@@ -123,3 +170,12 @@ Title: 2.0 &raquo; Upgrade
 	<LI>ObjectStore no longer stores database snapshots of object. As a result a method &quot;retainSnapshot(DataObject object)&quot; is removed, as its meaningful deprecation is not possible.</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/docs/2.0/user-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/user-guide.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/user-guide.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; User Guide
+<!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; User Guide</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">
 
-	<H2><A name="UserGuide-UserGuide"></A>User Guide</H2>
+<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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="UserGuide-UserGuide"></A>User Guide</H2>
 
 <OL>
 	<LI><A href="introduction.html" title="Introduction">Introduction</A></LI>
@@ -23,3 +70,12 @@ Title: 2.0 &raquo; User Guide
 
 <H3><A name="UserGuide-Completealphabeticalguideindex"></A>Complete alphabetical guide index</H3>
 <UL><LI><A href="ant-tasks.html" title="Ant Tasks">Ant Tasks</A><UL><LI><A href="cdataport.html" title="cdataport">cdataport</A></LI><LI><A href="cdbgen.html" title="cdbgen">cdbgen</A></LI><LI><A href="cdeploy.html" title="cdeploy">cdeploy</A></LI><LI><A href="cgen.html" title="cgen">cgen</A></LI></UL></LI><LI><A href="customizing.html" title="Customizing">Customizing</A><UL><LI><A href="extended-types.html" title="Extended Types">Extended Types</A></LI></UL></LI><LI><A href="datacontext.html" title="DataContext">DataContext</A><UL><LI><A href="datacontextdelegate.html" title="DataContextDelegate">DataContextDelegate</A></LI><LI><A href="datacontextfactory.html" title="DataContextFactory">DataContextFactory</A></LI><LI><A href="dataobject-state-management.html" title="DataObject State Management">DataObject State Management</A></LI><LI><A href="moving-objects-between-contexts.html" title="Moving Objects Between Contexts">Moving Objects Between Contexts</A></LI><LI><A href="n
 ested-datacontexts.html" title="Nested DataContexts">Nested DataContexts</A></LI><LI><A href="obtaining-datacontext.html" title="Obtaining DataContext">Obtaining DataContext</A></LI><LI><A href="running-queries.html" title="Running Queries">Running Queries</A></LI></UL></LI><LI><A href="dataobjects.html" title="DataObjects">DataObjects</A><UL><LI><A href="accessing-pk-and-fk-values.html" title="Accessing PK and FK values">Accessing PK and FK values</A></LI><LI><A href="dataobjects-example.html" title="DataObjects Example">DataObjects Example</A></LI><LI><A href="dataobjectutils.html" title="DataObjectUtils">DataObjectUtils</A></LI><LI><A href="dataobject-validation.html" title="DataObject Validation">DataObject Validation</A></LI><LI><A href="deleting-objects.html" title="Deleting Objects">Deleting Objects</A></LI><LI><A href="flattened-relationships.html" title="Flattened Relationships">Flattened Relationships</A></LI><LI><A href="generic-persistent-class.html" title="Gener
 ic Persistent Class">Generic Persistent Class</A></LI><LI><A href="handling-inheritance.html" title="Handling Inheritance">Handling Inheritance</A></LI><LI><A href="relationships.html" title="Relationships">Relationships</A></LI></UL></LI><LI><A href="dataviews.html" title="DataViews">DataViews</A><UL><LI><A href="dataview-concepts.html" title="DataView Concepts">DataView Concepts</A></LI><LI><A href="dataviews-in-action.html" title="DataViews in Action">DataViews in Action</A></LI><LI><A href="dvmodeler-gui-tool.html" title="DVModeler GUI Tool">DVModeler GUI Tool</A></LI><LI><A href="swing-applications.html" title="Swing Applications">Swing Applications</A></LI></UL></LI><LI><A href="deployment.html" title="Deployment">Deployment</A><UL><LI><A href="configuring-logging.html" title="Configuring Logging">Configuring Logging</A></LI><LI><A href="customizing-configuration.html" title="Customizing Configuration">Customizing Configuration</A></LI><LI><A href="dbcpdatasourcefactor
 y.html" title="DBCPDataSourceFactory">DBCPDataSourceFactory</A></LI><LI><A href="deployment-with-ant.html" title="Deployment with Ant">Deployment with Ant</A></LI><LI><A href="standalone-applications.html" title="Standalone Applications">Standalone Applications</A></LI><LI><A href="using-jndi.html" title="Using JNDI">Using JNDI</A></LI><LI><A href="web-applications.html" title="Web Applications">Web Applications</A></LI></UL></LI><LI><A href="design.html" title="Design">Design</A><UL><LI><A href="cayenne-contract.html" title="Cayenne Contract">Cayenne Contract</A></LI><LI><A href="object-caching.html" title="Object Caching">Object Caching</A></LI><LI><A href="persistent-object-lifecycle.html" title="Persistent Object Lifecycle">Persistent Object Lifecycle</A></LI><LI><A href="primary-key-generation.html" title="Primary Key Generation">Primary Key Generation</A><UL><LI><A href="generated-columns.html" title="Generated Columns">Generated Columns</A></LI></UL></LI><LI><A href="
 runtime-components.html" title="Runtime Components">Runtime Components</A><UL><LI><A href="datachannel.html" title="DataChannel">DataChannel</A></LI><LI><A href="datanode.html" title="DataNode">DataNode</A></LI><LI><A href="datasource.html" title="DataSource">DataSource</A></LI><LI><A href="dbadapter.html" title="DbAdapter">DbAdapter</A></LI><LI><A href="entityresolver.html" title="EntityResolver">EntityResolver</A></LI><LI><A href="event-package.html" title="Event Package">Event Package</A></LI><LI><A href="objectcontext.html" title="ObjectContext">ObjectContext</A></LI></UL></LI><LI><A href="understanding-transactions.html" title="Understanding Transactions">Understanding Transactions</A></LI></UL></LI><LI><A href="expressions.html" title="Expressions">Expressions</A><UL><LI><A href="bnf-for-expressionparser.html" title="BNF for ExpressionParser">BNF for ExpressionParser</A></LI><LI><A href="building-expressions.html" title="Building Expressions">Building Expressions</A></
 LI><LI><A href="expression-factory-utilities.html" title="Expression Factory Utilities">Expression Factory Utilities</A></LI><LI><A href="in-memory-evaluation.html" title="In-Memory Evaluation">In-Memory Evaluation</A></LI><LI><A href="null-handling.html" title="NULL Handling">NULL Handling</A></LI><LI><A href="path-expressions.html" title="Path Expressions">Path Expressions</A></LI></UL></LI><LI><A href="installation.html" title="Installation">Installation</A><UL><LI><A href="jar-files-and-dependencies.html" title="JAR Files and Dependencies">JAR Files and Dependencies</A></LI><LI><A href="upgrade.html" title="Upgrade">Upgrade</A></LI></UL></LI><LI><A href="introduction.html" title="Introduction">Introduction</A><UL><LI><A href="acknowledgments.html" title="Acknowledgments">Acknowledgments</A></LI><LI><A href="guide-to-11-features.html" title="Guide to 1.1 Features">Guide to 1.1 Features</A></LI><LI><A href="guide-to-12-features.html" title="Guide to 1.2 Features">Guide to 
 1.2 Features</A></LI><LI><A href="license.html" title="License">License</A></LI></UL></LI><LI><A href="performance-tuning.html" title="Performance Tuning">Performance Tuning</A><UL><LI><A href="caching-lookup-tables.html" title="Caching Lookup Tables">Caching Lookup Tables</A></LI><LI><A href="data-rows.html" title="Data Rows">Data Rows</A></LI><LI><A href="iterating-through-data-rows.html" title="Iterating Through Data Rows">Iterating Through Data Rows</A></LI><LI><A href="paginated-queries.html" title="Paginated Queries">Paginated Queries</A></LI><LI><A href="prefetching.html" title="Prefetching">Prefetching</A></LI><LI><A href="turning-off-context-synchronization.html" title="Turning off Context Synchronization">Turning off Context Synchronization</A></LI></UL></LI><LI><A href="queries.html" title="Queries">Queries</A><UL><LI><A href="caching-query-results.html" title="Caching Query Results">Caching Query Results</A></LI><LI><A href="customizing-queries.html" title="Custo
 mizing Queries">Customizing Queries</A></LI><LI><A href="namedquery.html" title="NamedQuery">NamedQuery</A></LI><LI><A href="objectidquery.html" title="ObjectIdQuery">ObjectIdQuery</A></LI><LI><A href="parameterized-queries.html" title="Parameterized Queries">Parameterized Queries</A></LI><LI><A href="qualifier-expressions.html" title="Qualifier Expressions">Qualifier Expressions</A></LI><LI><A href="queries-stored-in-datamap.html" title="Queries Stored in DataMap">Queries Stored in DataMap</A></LI><LI><A href="querychain.html" title="QueryChain">QueryChain</A></LI><LI><A href="relationshipquery.html" title="RelationshipQuery">RelationshipQuery</A></LI><LI><A href="scripting-sqltemplate.html" title="Scripting SQLTemplate">Scripting SQLTemplate</A></LI><LI><A href="selectquery.html" title="SelectQuery">SelectQuery</A></LI><LI><A href="selectquery-customization.html" title="SelectQuery Customization">SelectQuery Customization</A></LI><LI><A href="sqltemplate-query.html" title=
 "SQLTemplate Query">SQLTemplate Query</A></LI><LI><A href="using-orderings.html" title="Using Orderings">Using Orderings</A></LI></UL></LI><LI><A href="quick-start.html" title="Quick Start">Quick Start</A><UL><LI><A href="tutorial-datacontext.html" title="Tutorial DataContext">Tutorial DataContext</A></LI><LI><A href="tutorial-dataobjects.html" title="Tutorial DataObjects">Tutorial DataObjects</A></LI><LI><A href="tutorial-delete.html" title="Tutorial Delete">Tutorial Delete</A></LI><LI><A href="tutorial-generate-database-and-java-classes.html" title="Tutorial Generate Database and Java Classes">Tutorial Generate Database and Java Classes</A></LI><LI><A href="tutorial-mapping-query.html" title="Tutorial Mapping Query">Tutorial Mapping Query</A></LI><LI><A href="tutorial-object-relational-mapping.html" title="Tutorial Object Relational Mapping">Tutorial Object Relational Mapping</A></LI><LI><A href="tutorial-selectquery.html" title="Tutorial SelectQuery">Tutorial SelectQuery<
 /A></LI><LI><A href="tutorial-setup.html" title="Tutorial Setup">Tutorial Setup</A></LI><LI><A href="tutorial-starting-mapping-project.html" title="Tutorial Starting Mapping Project">Tutorial Starting Mapping Project</A></LI><LI><A href="tutorial-webapp.html" title="Tutorial Webapp">Tutorial Webapp</A></LI></UL></LI><LI><A href="stored-procedures.html" title="Stored Procedures">Stored Procedures</A><UL><LI><A href="executing-a-stored-procedure.html" title="Executing a Stored Procedure">Executing a Stored Procedure</A></LI><LI><A href="selecting-objects.html" title="Selecting Objects">Selecting Objects</A></LI><LI><A href="stored-procedures-and-transactions.html" title="Stored Procedures and Transactions">Stored Procedures and Transactions</A></LI></UL></LI></UL>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/using-jndi.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/using-jndi.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/using-jndi.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Using JNDI
-
-	
+<!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; Using JNDI</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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Cayenne can be setup to obtain a DataSource via JNDI, instead of using its own connection pool. To do that Cayenne DataNodes must be configured to use <TT>JNDIDataSourceFactory</TT>. This can be done in the modeler as shown on the pictures below.</P>
 
@@ -94,3 +141,12 @@ Title: 2.0 &raquo; Using JNDI
    &lt;/ResourceParams&gt;
 &lt;/Context&gt;</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/docs/2.0/using-orderings.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/using-orderings.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/using-orderings.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Using Orderings
-
-	
+<!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; Using Orderings</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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>To sort SelectQuery results, orderings are used. Orderings use path expressions discussed in the previous section to identify the attributes that must be used in sorting. For example to order results by artist name, the following code can be used:</P>
 
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
@@ -45,3 +92,12 @@ orderings.add(<SPAN class="code-keyword"
 </SPAN>Ordering.orderList(list, orderings);
 </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>