cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r837766 [11/23] - in /websites/staging/cayenne/trunk/content: ./ docs/ docs/1.2/ docs/2.0/ docs/3.0/ docs/3.1/
Date Fri, 09 Nov 2012 07:29:36 GMT
Modified: websites/staging/cayenne/trunk/content/docs/2.0/generated-columns.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/generated-columns.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/generated-columns.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 » Generated Columns
-
-	
+<!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; Generated Columns</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">
+       	
 
 <H2><A name="GeneratedColumns-WhatIsa%22Generated%22Column"></A>What Is a &quot;Generated&quot; Column</H2>
 
@@ -49,3 +96,12 @@ adapter.setSupportsGeneratedKeys(<SPAN c
 
 
 <DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>MS SQLServer Note</B><BR>MS drivers prior to 2005 version do not support generated columns, while newer drivers and <A href="http://jtds.sourceforge.net/" class="external-link" rel="nofollow">jTDS</A> support it just fine. Cayenne can automatically detect the driver type and configure SQLServerAdapter, but only when AutoAdapter is used. To make sure auto-detection works, clear the &quot;Custom Adapter&quot; field for the corresponding DataNode in the Modeler.</TD></TR></TABLE></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/generic-persistent-class.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/generic-persistent-class.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/generic-persistent-class.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Generic Persistent Class
-
-	<P><A href="http://cwiki.apache.org/CAY/generic-dataobjects-example.html" class="external-link" rel="nofollow">Download the example code</A></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; Generic Persistent Class</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 href="http://cwiki.apache.org/CAY/generic-dataobjects-example.html" class="external-link" rel="nofollow">Download the example code</A></P>
 
 <H2><A name="GenericPersistentClass-WhatIs%22GenericPersistentClass%22"></A>What Is &quot;Generic Persistent Class&quot;</H2>
 
@@ -79,3 +126,12 @@ DataObject object = ...;
 object.writeProperty(<SPAN class="code-quote">&quot;subject&quot;</SPAN>, <SPAN class="code-quote">&quot;Post On Topic&quot;</SPAN>);
 </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/guide-to-11-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/guide-to-11-features.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/guide-to-11-features.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Guide to 1.1 Features
-
-	
+<!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; Guide to 1.1 Features</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 version 1.1 introduces a large number of new features and enhancements over 1.0. This chapter lists most of them, providing the links to more detailed information about each feature.</P>
 
 <H3><A name="Guideto1.1Features-DTDAdditions."></A>DTD Additions.</H3>
@@ -140,3 +187,12 @@ Title: 2.0 &raquo; Guide to 1.1 Features
 <P>The following is an incomplete list of enhancements: new professional look and feel, preference engine, reenginnering of stored procedures, local DataSources, configurable locations of JDBC drivers, custom class generation templates, etc. A number of Modeler tasks and dialogs have been redesigned and improved to be more user-friendly and consistent.</P>
 
 <P>Also CayenneModeler supports mapping of all the new 1.1 framework features, such as DataMap queries, cache synchronization configuration, etc.</P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/guide-to-12-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/guide-to-12-features.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/guide-to-12-features.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Guide to 1.2 Features
-
-	
+<!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; Guide to 1.2 Features</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>This page describes new features and other changes introduced in 1.2 release.</P>
 
@@ -156,3 +203,12 @@ Title: 2.0 &raquo; Guide to 1.2 Features
 	<LI>Customizable Encoding Of Generated Files. Desired encoding for generated Java files can be specified in the Modeler in Preferences and as an &quot;encoding&quot; attribute of the cgen Ant task. This is helpful in cross-platform development situations.</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/handling-inheritance.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/handling-inheritance.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/handling-inheritance.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Handling Inheritance
+<!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; Handling Inheritance</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>&quot;Inheritance&quot; is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called &quot;single table inheritance&quot;). Such mapping is described in detail in the <A href="modeling-inheritance.html" title="Modeling Inheritance">Modeler Guide</A>. The idea of single table inheritance is that a &quot;class&quot; of a database row is determined from the values in one or more columns of the base table. These columns are called &quot;class designator columns&quot;.</P>
 
@@ -90,3 +137,12 @@ List employees = context.performQuery(qu
 <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>Whenever an object is obtained via a relationship, it is always fully resolved to the lowest possible subclass in an entity inheritance tree.</TD></TR></TABLE></DIV>
 
 <DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Use <TT>setResolvingInherited(false)</TT> with caution, and only if you never plan to work with subclasses. The downside of it is that the DataContext may end up with two objects pointing to the same database row, thus violating uniquing principle. With the above example, this may happen if at a later time user decides to fetch Managers directly, or if a Manager object is obtained via a relationship.</TD></TR></TABLE></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/in-memory-evaluation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/in-memory-evaluation.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/in-memory-evaluation.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; In-Memory Evaluation
-
-	
+<!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; In-Memory Evaluation</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>In additions to providing a database-independent WHERE clause for SQL queries, expressions support in-memory evaluation. An expressions can be evaluated with any type of objects that follow Java Beans method naming convention. Of course this includes DataObjects. The following API is used for expressions evaluation:</P>
 
@@ -55,3 +102,12 @@ NonPersistentUser nonPersistentBean;
 List startWithA = exp.filterObjects(artists);
 </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/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/index.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/index.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Documentation
+<!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; Documentation</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>Cayenne Documentation - v. 2.0 (STABLE)</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>Cayenne Documentation - v. 2.0 (STABLE)</H2>
 
 <UL>
 	<LI><A href="user-guide.html" title="User Guide">User Guide</A>:  General information on how to get started with Cayenne, main Cayenne concepts, API details and deployment procedures.</LI>
@@ -8,3 +55,12 @@ Title: 2.0 &raquo; Documentation
 	<LI><A href="remote-object-persistence-guide.html" title="Remote Object Persistence Guide">Remote Object Persistence Guide</A>: Writing distributed Java applications with Cayenne remote object persistence mechanism.</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/installation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/installation.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/installation.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Installation
-
-	<H3><A name="Installation-SystemRequirements"></A>System Requirements</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; Installation</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="Installation-SystemRequirements"></A>System Requirements</H3>
 
 <UL>
 	<LI><B>JDK:</B> Cayenne, including GUI tools, is written in 100% Java, and runs on any Java-compatible platform. Required JDK version is 1.4 or higher. If your deployment environment uses JDK 1.3, you can still use Cayenne, just downgrade to version 1.1.x - the last  version compatible with JDK 1.3.</LI>
@@ -31,3 +78,12 @@ Title: 2.0 &raquo; Installation
 	<LI><A href="jar-files-and-dependencies.html" title="JAR Files and Dependencies">JAR Files and Dependencies</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/introduction-to-cayennemodeler.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/introduction-to-cayennemodeler.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/introduction-to-cayennemodeler.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Introduction to CayenneModeler
-
-	
+<!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; Introduction to CayenneModeler</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 stores mapping and deployment information using a set of XML files with a predefined format. These files can be always edited by hand, but Cayenne goes beyond that. A standard distribution contains CayenneModeler - a Java Swing GUI application that serves as an Object/Relational modeling tool. It is much more than just a specialized XML editor. It provides a comprehensive set of O/R functions, including:</P>
 
 <UL>
@@ -27,3 +74,12 @@ Title: 2.0 &raquo; Introduction to Cayen
 	<LI><A href="cayenne-user-directory.html" title="Cayenne User Directory">Cayenne User Directory</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/introduction.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/introduction.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/introduction.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Introduction
-
-	
+<!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; Introduction</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 is a mature, powerful, full-featured open source Object/Relational Mapping (ORM) framework. Cayenne is written in Java and is intended for Java developers working with relational databases. Cayenne has been successfully deployed in production environments on high volume sites.</P>
 
 <P>Cayenne allows to reduce the development time in any database project by creating an object-oriented abstraction of the database schema. Development teams using Cayenne will be able to concentrate on the core business requirements and the data model instead of the SQL details.</P>
@@ -18,3 +65,12 @@ Title: 2.0 &raquo; Introduction
 	<LI><A href="guide-to-12-features.html" title="Guide to 1.2 Features">Guide to 1.2 Features</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/iterating-through-data-rows.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/iterating-through-data-rows.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/iterating-through-data-rows.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Iterating Through Data Rows
-
-	
+<!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; Iterating Through Data Rows</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>There are cases when the result sets are so large that even when fetching data rows, application can run out of memory. For instance, a user may be creating a report that requires in-memory processing of hundreds of thousands of database rows. In such cases normal Cayenne behavior of reading the whole java.sql.ResultSet in the memory before returning it to the user may result in an application exhausing all memory and crashing.</P>
 
 <P>Cayenne solves this by allowing to obtain results in the form of ResultIterator. ResultIterator is connected to an open java.sql.ResultSet, therefore its methods may throw checked exceptions. ResultIterator returns data rows (not DataObjects) one at a time, reading them on demand from the open ResultSet. Each data row can be converted to a DataObject or accessed directly. Open ResultIterator locks the database connection, therefore <B>ResultIterator always requires explicit closing in the user code</B>.</P>
@@ -53,3 +100,12 @@ ResultIterator it = <SPAN class="code-ke
 ...
 </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/jar-files-and-dependencies.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/jar-files-and-dependencies.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/jar-files-and-dependencies.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; JAR Files and Dependencies
-
-	
+<!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; JAR Files and Dependencies</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>This sections explains where all the relevant jar files are located. It also lists Cayenne dependencies.</P>
 
@@ -52,3 +99,12 @@ Title: 2.0 &raquo; JAR Files and Depende
 
 <P>cayenne-modeler.jar implicitly relies on the presence of [cayenne_install_dir]/lib/cayenne.jar. Instructions on how to start modeler can be found <A href="running-cayennemodeler.html" title="Running CayenneModeler">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/java-interface-to-an-existing-database.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/java-interface-to-an-existing-database.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/java-interface-to-an-existing-database.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Java Interface to an Existing Database
-
-	
+<!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; Java Interface to an Existing Database</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="JavaInterfacetoanExistingDatabase-JavaInterfacetoanExistingDatabase"></A>Java Interface to an Existing Database</H3>
 
@@ -14,3 +61,12 @@ Title: 2.0 &raquo; Java Interface to an 
 	<LI><A href="reverse-engineer-database.html" title="Reverse Engineer Database">Create New DataMap by reverse engineering database</A></LI>
 </UL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/license.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/license.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/license.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; License
-
-	
+<!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; License</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>This software is distributed and should be used on terms of Apache 2.0 software license. In short, it is free of charge, and unrestricted for commercial use. Here is the full license text:</P>
 
 <DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
@@ -207,3 +254,12 @@ Title: 2.0 &raquo; License
    limitations under the License.
 </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/local-datasources.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/local-datasources.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/local-datasources.html Fri Nov  9 07:29:01 2012
@@ -1,9 +1,65 @@
-Title: 2.0 &raquo; Local DataSources
+<!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; Local DataSources</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="LocalDataSources-LocalDataSources"></A>Local DataSources</H3>
 
 <P>Local DataSource panel allows to configure a number of named DataSources that can be used for local database access from the Modeler, or to speed up creation of new DataNodes. Also since local DataSources can be associated with any DataNodes, regardless of the actual information configured for a given DataNode, it makes them extremely useful to separate your local connection information from the one in the deployment environment. For example a JNDI DataNode can be used for the database access from the Modeler in the absence of JNDI container.</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="local-datasources.data/prefs-datasource.jpg" style="border: 0px solid black"></SPAN></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/many-to-many-relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/many-to-many-relationships.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/many-to-many-relationships.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Many-to-Many Relationships
+<!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; Many-to-Many Relationships</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="Many-to-ManyRelationships-ManytoManyRelationships"></A>Many-to-Many Relationships</H3>
 
@@ -10,3 +57,12 @@ Title: 2.0 &raquo; Many-to-Many Relation
 	<LI>Making join table transparent to the object model. This is achieved by using flattened relationships discussed further in this chapter.</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/modeler-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/modeler-guide.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/modeler-guide.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Modeler 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; Modeler 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="ModelerGuide-Modelerguide"></A>Modeler 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="ModelerGuide-Modelerguide"></A>Modeler guide</H2>
 
 <OL>
 	<LI><A href="introduction-to-cayennemodeler.html" title="Introduction to CayenneModeler">Introduction to CayenneModeler</A></LI>
@@ -19,3 +66,12 @@ Title: 2.0 &raquo; Modeler Guide
 
 <H3><A name="ModelerGuide-Completealphabeticalguideindex"></A>Complete alphabetical guide index</H3>
 <UL><LI><A href="cayenne-project-structure.html" title="Cayenne Project Structure">Cayenne Project Structure</A><UL><LI><A href="cayenne-datamaps.html" title="Cayenne DataMaps">Cayenne DataMaps</A></LI><LI><A href="cayenne-projects.html" title="Cayenne Projects">Cayenne Projects</A></LI></UL></LI><LI><A href="common-modeling-tasks.html" title="Common Modeling Tasks">Common Modeling Tasks</A><UL><LI><A href="create-datanode.html" title="Create DataNode">Create DataNode</A></LI><LI><A href="create-new-project.html" title="Create New Project">Create New Project</A></LI><LI><A href="generate-database-schema.html" title="Generate Database Schema">Generate Database Schema</A></LI><LI><A href="generate-java-classes.html" title="Generate Java Classes">Generate Java Classes</A></LI><LI><A href="generate-primary-key-support.html" title="Generate Primary Key Support">Generate Primary Key Support</A></LI><LI><A href="reverse-engineer-database.html" title="Reverse Engineer Database">Reve
 rse Engineer Database</A></LI><LI><A href="setting-datamap-defaults.html" title="Setting DataMap Defaults">Setting DataMap Defaults</A></LI></UL></LI><LI><A href="configuring-deployment-settings.html" title="Configuring Deployment Settings">Configuring Deployment Settings</A><UL><LI><A href="configuring-caching-behavior.html" title="Configuring Caching Behavior">Configuring Caching Behavior</A></LI><LI><A href="configuring-object-validation.html" title="Configuring Object Validation">Configuring Object Validation</A></LI><LI><A href="configuring-transactional-behavior.html" title="Configuring Transactional Behavior">Configuring Transactional Behavior</A></LI></UL></LI><LI><A href="introduction-to-cayennemodeler.html" title="Introduction to CayenneModeler">Introduction to CayenneModeler</A><UL><LI><A href="cayennemodeler-and-eclipse.html" title="CayenneModeler and Eclipse">CayenneModeler and Eclipse</A></LI><LI><A href="cayenne-user-directory.html" title="Cayenne User Directo
 ry">Cayenne User Directory</A></LI><LI><A href="general-navigation.html" title="General Navigation">General Navigation</A></LI><LI><A href="running-cayennemodeler.html" title="Running CayenneModeler">Running CayenneModeler</A></LI></UL></LI><LI><A href="modeling-database-layer.html" title="Modeling Database Layer">Modeling Database Layer</A><UL><LI><A href="to-dep-pk-checkbox.html" title="To Dep PK Checkbox">To Dep PK Checkbox</A></LI></UL></LI><LI><A href="modeling-object-layer.html" title="Modeling Object Layer">Modeling Object Layer</A><UL><LI><A href="cayennemodeler-flattened-relationships.html" title="CayenneModeler Flattened Relationships">CayenneModeler Flattened Relationships</A></LI><LI><A href="delete-rules.html" title="Delete Rules">Delete Rules</A></LI><LI><A href="many-to-many-relationships.html" title="Many-to-Many Relationships">Many-to-Many Relationships</A></LI><LI><A href="modeling-inheritance.html" title="Modeling Inheritance">Modeling Inheritance</A></LI>
 <LI><A href="modeling-objentities.html" title="Modeling ObjEntities">Modeling ObjEntities</A></LI><LI><A href="modeling-remote-persistence.html" title="Modeling Remote Persistence">Modeling Remote Persistence</A></LI></UL></LI><LI><A href="modeling-queries.html" title="Modeling Queries">Modeling Queries</A></LI><LI><A href="modeling-tips.html" title="Modeling Tips">Modeling Tips</A></LI><LI><A href="orm-case-study.html" title="ORM Case Study">ORM Case Study</A><UL><LI><A href="converting-an-existing-business-framework.html" title="Converting an Existing Business Framework">Converting an Existing Business Framework</A></LI><LI><A href="java-interface-to-an-existing-database.html" title="Java Interface to an Existing Database">Java Interface to an Existing Database</A></LI><LI><A href="new-system.html" title="New System">New System</A></LI></UL></LI><LI><A href="preferences-panel.html" title="Preferences Panel">Preferences Panel</A><UL><LI><A href="classpath.html" title="Class
 Path">ClassPath</A></LI><LI><A href="general-preferences.html" title="General Preferences">General Preferences</A></LI><LI><A href="local-datasources.html" title="Local DataSources">Local DataSources</A></LI></UL></LI></UL>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/modeling-database-layer.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/modeling-database-layer.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/modeling-database-layer.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Modeling Database Layer
-
-	
+<!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; Modeling Database Layer</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>This chapter describes modeling the RDBMS schema in Cayenne.</P>
 
 <P>To be done...</P>
@@ -12,3 +59,12 @@ Title: 2.0 &raquo; Modeling Database Lay
 </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/modeling-inheritance.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/modeling-inheritance.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/modeling-inheritance.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Modeling Inheritance
-
-	
+<!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; Modeling Inheritance</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="ModelingInheritance-ModelingInheritance"></A>Modeling Inheritance</H3>
 
@@ -50,3 +97,12 @@ Title: 2.0 &raquo; Modeling Inheritance
 
 
 <DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Qualifiers Note</B><BR>Qualifiers are not inherited! When defining qualifiers for inheritance purposes keep in mind that the actual qualifier built by Cayenne will include the qualifier of a root entity and qualifiers of all its known subentities joined using &quot;or&quot; operator, as shown in the above example.</TD></TR></TABLE></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/modeling-object-layer.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/modeling-object-layer.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/modeling-object-layer.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Modeling Object Layer
+<!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; Modeling Object Layer</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>This chapter describes modeling persistent object layer in Cayenne.</P>
 
 <H3><A name="ModelingObjectLayer-Sections"></A>Sections</H3>
@@ -14,3 +61,12 @@ Title: 2.0 &raquo; Modeling Object Layer
 	<LI><A href="modeling-remote-persistence.html" title="Modeling Remote Persistence">Modeling Remote Persistence</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/modeling-objentities.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/modeling-objentities.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/modeling-objentities.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Modeling ObjEntities
-
-	
+<!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; Modeling ObjEntities</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="ModelingObjEntities-ModelingObjEntities"></A>Modeling ObjEntities</H3>
 
 <P>Java object layer in Cayenne is modeled as a set of ObjEntities with relationships between them. Each <TT>org.apache.cayenne.map.ObjEntity</TT> consists of a reference to a <TT>org.apache.cayenne.map.DbEntity</TT> (table). It also specifies the Java class for a business object and a set of attributes of this class.</P>
@@ -19,3 +66,12 @@ Title: 2.0 &raquo; Modeling ObjEntities
 <H4><A name="ModelingObjEntities-ObjEntityQualifier"></A>ObjEntity Qualifier</H4>
 
 <P>ObjEntities can hold a qualifier expression that is automatically appended to all SelectQueries rooted in a given ObjEntity. Entity qualifier can be viewed as a global data filter for a given entity. One area where this feature is used is <A href="modeling-inheritance.html" title="Modeling Inheritance">inheritance mapping</A>, however by itself it has nothing to do with inheritance as such and can be used standalone. To set an entity qualifier, type a Cayenne expression into the &quot;Qualifier&quot; field of the ObjEntity editor panel.</P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/modeling-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/modeling-queries.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/modeling-queries.html Fri Nov  9 07:29:01 2012
@@ -1,5 +1,61 @@
-Title: 2.0 &raquo; Modeling 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; Modeling 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">
 
-	<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>
 TBD </P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/modeling-remote-persistence.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/modeling-remote-persistence.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/modeling-remote-persistence.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Modeling Remote Persistence
-
-	
+<!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; Modeling Remote Persistence</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><B>TODO</B></P>
 
@@ -18,3 +65,12 @@ Title: 2.0 &raquo; Modeling Remote Persi
 See Also <A href="../doc/remote-object-persistence-guide.html" title="Remote Object Persistence Guide">Remote Object Persistence</A></LI>
 </UL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/modeling-tips.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/modeling-tips.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/modeling-tips.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Modeling Tips
+<!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; Modeling Tips</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>This section contains a few unorganized tips on Object/Relational modeling in Cayenne. Some of these tips may become obsolete in the future as the Modeler evolves, making many things more transparent to the user.</P>
 
@@ -14,3 +61,12 @@ Title: 2.0 &raquo; Modeling Tips
 	<LI>Display order of Procedure Parameters is important - this is the order in which stored procedure parameters will be bound. Use &quot;Up&quot; and &quot;Down&quot; buttons in the bottom of the &quot;Parameters&quot; tab to change parameter position.</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>



Mime
View raw message