cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r837683 [24/28] - in /websites/staging/cayenne/trunk/content: ./ doc/2.0/ doc/2.0/api/cayenne/org/apache/cayenne/remote/hessian/service/ doc/3.0/ doc/3.0/api/org/apache/cayenne/dba/db2/class-use/ doc/3.0/api/org/apache/cayenne/dba/derby/cla...
Date Thu, 08 Nov 2012 17:49:08 GMT
Modified: websites/staging/cayenne/trunk/content/doc/3.0/in-memory-evaluation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/in-memory-evaluation.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/in-memory-evaluation.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 » 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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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>
 
 <UL>
@@ -54,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/doc/3.0/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/index.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/index.html Thu Nov  8 17:48:56 2012
@@ -1,3 +1,60 @@
-Title: 3.0 &raquo; Index
+<!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; 3.0 &raquo; Index</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><B><A href="documentation.html" title="Documentation">Apache Cayenne Documentation - v3.0</A></B></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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P><B><A href="documentation.html" title="Documentation">Apache Cayenne Documentation - v3.0</A></B></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/individual-object-caching.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/individual-object-caching.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/individual-object-caching.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Individual Object Caching
-
-	<H2><A name="IndividualObjectCaching-IndividualObjectCaching"></A>Individual Object Caching</H2>
+<!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; 3.0 &raquo; Individual Object Caching</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="IndividualObjectCaching-IndividualObjectCaching"></A>Individual Object Caching</H2>
 
 <P>Whenever an object is fetched from the database or created by the user and registered with Cayenne, it is automatically cached. Accessing this object later (e.g. when traversing a relationship from another object, or doing a lookup by primary key via DataObjectUtils) will not incur an overhead of extra database access. </P>
 
@@ -52,3 +100,12 @@ Artist a = (Artist) DataObjectUtils.obje
 </DIV></DIV></LI>
 </UL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/inheritance-overview.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/inheritance-overview.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/inheritance-overview.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Inheritance Overview
-
-	<H2><A name="InheritanceOverview-Overview"></A>Overview</H2>
+<!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; 3.0 &raquo; Inheritance Overview</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="InheritanceOverview-Overview"></A>Overview</H2>
 
 <P>Inheritance is a familiar and a very useful concept to any Java developer. There are three common ways of mapping it to a relational schema. In Cayenne we are calling them &quot;single table&quot;, &quot;vertical&quot; and &quot;horizontal&quot;. Other ORM frameworks may use different terms for those (e.g. in JPA &quot;single table&quot; is called &quot;single table per class&quot;, &quot;vertical&quot; - &quot;joined subclass&quot;, and &quot;horizontal&quot; - &quot;table per concrete class&quot;, still they are referring to the same types of mapping). The picture below is a high-level representation of these three strategies. We'll discuss them in general terms in this chapter and provide Cayenne-specific details in dedicated chapters. </P>
 
@@ -88,4 +136,12 @@ var pageTracker = _gat._getTracker("UA-7
 pageTracker._trackPageview();
 } catch(err) {}</SCRIPT>
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/installation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/installation.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/installation.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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.5 or higher. <EM>(The last version of Cayenne compatible with JDK 1.4 is 1.2.x/2.0.x; JDK 1.3 - 1.1.x)</EM></LI>
@@ -35,3 +83,12 @@ Title: 3.0 &raquo; Installation
 	<LI><A href="cayenne-and-maven.html" title="Cayenne and Maven">Cayenne and Maven</A></LI>
 </OL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/introduction-to-cayennemodeler.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/introduction-to-cayennemodeler.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/introduction-to-cayennemodeler.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Introduction to CayenneModeler
-
-	<H2><A name="IntroductiontoCayenneModeler-IntroductiontoCayenneModeler"></A>Introduction to CayenneModeler</H2>
+<!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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="IntroductiontoCayenneModeler-IntroductiontoCayenneModeler"></A>Introduction to CayenneModeler</H2>
 <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>
@@ -26,3 +74,12 @@ Title: 3.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/doc/3.0/introduction.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/introduction.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/introduction.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Introduction
-
-	<P>This book describes how to use Cayenne Persistence API to write persistent Java applications. It includes the following topics:</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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>This book describes how to use Cayenne Persistence API to write persistent Java applications. It includes the following topics:</P>
 
 <UL>
 	<LI>&quot;Getting Started&quot; tutorials,</LI>
@@ -19,3 +67,12 @@ Title: 3.0 &raquo; Introduction
 </UL>
 
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/iterating-through-data-rows.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/iterating-through-data-rows.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/iterating-through-data-rows.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Iterating Through Data Rows
-
-	<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>
+<!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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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>
 
@@ -54,3 +102,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/doc/3.0/jar-files-and-dependencies.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/jar-files-and-dependencies.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/jar-files-and-dependencies.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; JAR Files and Dependencies
-
-	<P>This sections explains where all the relevant jar files are located. It also lists Cayenne dependencies.</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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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>
 
 <H3><A name="JARFilesandDependencies-CayenneRuntimeFramework"></A>Cayenne Runtime Framework</H3>
 
@@ -43,3 +91,12 @@ Title: 3.0 &raquo; JAR Files and Depende
 	<LI><A href="http://www.opensymphony.com/oscache/" class="external-link" rel="nofollow">OSCache</A> version 2.3.2 or newer. Needed if you plan to use OSCache as your <A href="query-result-caching.html" title="Query Result Caching">query results cache provider</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/doc/3.0/java-interface-to-an-existing-database.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/java-interface-to-an-existing-database.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/java-interface-to-an-existing-database.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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>
 
 <P>To quickly start a new project based on an existing database, CayenneModeler &quot;reverse engineering&quot; functionality is used. Cayenne will create an exact model of the database schema, and extrapolate it to the object layer. DataMaps created during reverse engineering will contain metadata for Java business layer. The names of classes and their properties will be compatible with Java naming conventions. E.g for a table called &quot;USER_TYPE&quot;, a class named &quot;UserType&quot; will be created in the mapping. </P>
@@ -13,3 +61,12 @@ Title: 3.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/doc/3.0/license.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/license.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/license.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; License
-
-	<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>
+<!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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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">
 <PRE>                                 Apache License
@@ -206,3 +254,12 @@ Title: 3.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/doc/3.0/lifecycle-callbacks.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/lifecycle-callbacks.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/lifecycle-callbacks.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Lifecycle Callbacks
-
-	<H2><A name="LifecycleCallbacks-LifecycleCallbacks"></A>Lifecycle Callbacks</H2>
+<!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; 3.0 &raquo; Lifecycle Callbacks</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="LifecycleCallbacks-LifecycleCallbacks"></A>Lifecycle Callbacks</H2>
 
 <P>Users can register callback methods that will be invoked during the lifecycle of persistent objects. Callback mechanism is similar to the one defined in the <A href="../CAYJPA/jpa-guide.html" title="JPA Guide">JPA Specification</A>, however there are some noteable differences introduced to better follow the Cayenne object lifecycle. There are eight lifecycle callbacks described below (PostAdd, PrePersist, PostPersist, PreUpdate, PostUpdate, PreRemove, PostRemove, PostLoad). Each one cab be invoked as a <B>callback on a persistent object</B> itself or as a <B>callback on an arbitrary listener object</B>.</P>
 
@@ -188,3 +236,12 @@ registry.addListener(LifecycleListener.P
 </SPAN>registry.addListener(LifecycleListener.POST_LOAD, Artist.class, <SPAN class="code-quote">&quot;onLoad&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/doc/3.0/local-datasources.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/local-datasources.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/local-datasources.html Thu Nov  8 17:48:56 2012
@@ -1,8 +1,65 @@
-Title: 3.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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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/doc/3.0/many-to-many-relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/many-to-many-relationships.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/many-to-many-relationships.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.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; 3.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">
 
-	<H3><A name="Many-to-ManyRelationships-ManytoManyRelationships"></A>Many-to-Many Relationships</H3>
+<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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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>
 
 <P>Many-to-many relationships can be modeled in two different ways:</P>
 <UL>
@@ -8,3 +56,12 @@ Title: 3.0 &raquo; Many-to-Many Relation
 	<LI>Making join table transparent to the object model. This is achieved by using flattened relationships <A href="cayennemodeler-flattened-relationships.html" title="CayenneModeler Flattened Relationships">discussed further in this chapter</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/doc/3.0/maven2-cdbgen.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/maven2-cdbgen.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/maven2-cdbgen.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; maven2-cdbgen
-
-	<P><TT>cdbgen</TT> is an Maven 2 mojo that that uses Cayenne DataMap to drop and/or generate schema objects of a specified database.  By default, it is bound to the <TT>pre-integration-test</TT> phase.  Please see this <A href="http://docs.codehaus.org/display/MAVENUSER/Maven%20and%20Integration%20Testing" class="external-link" rel="nofollow">guide to integration testing with maven2</A> for ideas of how tie this in with your existing test infrastructure.</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; 3.0 &raquo; maven2-cdbgen</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P><TT>cdbgen</TT> is an Maven 2 mojo that that uses Cayenne DataMap to drop and/or generate schema objects of a specified database.  By default, it is bound to the <TT>pre-integration-test</TT> phase.  Please see this <A href="http://docs.codehaus.org/display/MAVENUSER/Maven%20and%20Integration%20Testing" class="external-link" rel="nofollow">guide to integration testing with maven2</A> for ideas of how tie this in with your existing test infrastructure.</P>
 
 <H3><A name="maven2-cdbgen-Parameters%28asXMLelements%29"></A>Parameters (as XML elements)</H3>
 <DIV class="table-wrap">
@@ -126,3 +174,12 @@ Title: 3.0 &raquo; maven2-cdbgen
 <SPAN class="code-tag">&lt;/build&gt;</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/doc/3.0/maven2-cdbimport.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/maven2-cdbimport.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/maven2-cdbimport.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; maven2-cdbimport
-
-	<P><TT>cdbimport</TT> is a Maven 2 mojo that that uses Cayenne to generate a DataMap based on an existing database schema.  By default, it is bound to the <TT>generate-sources</TT> phase.  This allows you to generate your DataMap prior to building your project, which may be necessary if you are also using the <A href="maven2-cgen.html" title="maven2-cgen">cgen</A> task.</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; 3.0 &raquo; maven2-cdbimport</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P><TT>cdbimport</TT> is a Maven 2 mojo that that uses Cayenne to generate a DataMap based on an existing database schema.  By default, it is bound to the <TT>generate-sources</TT> phase.  This allows you to generate your DataMap prior to building your project, which may be necessary if you are also using the <A href="maven2-cgen.html" title="maven2-cgen">cgen</A> task.</P>
 
 <H3><A name="maven2-cdbimport-Parameters%28asXMLelements%29"></A>Parameters (as XML elements)</H3>
 
@@ -135,3 +183,12 @@ Title: 3.0 &raquo; maven2-cdbimport
 <SPAN class="code-tag">&lt;/build&gt;</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/doc/3.0/maven2-cgen.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/maven2-cgen.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/maven2-cgen.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; maven2-cgen
-
-	<P><TT>cgen</TT> is an Maven 2 mojo that generates and maintains DataObjects source files based on Cayenne DataMap.  By default, it is bound to the <TT>generate-sources</TT> phase. If &quot;makePairs&quot; is set to &quot;true&quot; (default), this task will generate a pair of classes (superclass/subclass) for each ObjEntity in the DataMap. Superclasses should not be changed manually, since they are always overwritten. Subclasses are never overwritten and may be later customized by the user. If &quot;makePairs&quot; is set to &quot;false&quot;, a single class will be generated for each ObjEntity.</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; 3.0 &raquo; maven2-cgen</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P><TT>cgen</TT> is an Maven 2 mojo that generates and maintains DataObjects source files based on Cayenne DataMap.  By default, it is bound to the <TT>generate-sources</TT> phase. If &quot;makePairs&quot; is set to &quot;true&quot; (default), this task will generate a pair of classes (superclass/subclass) for each ObjEntity in the DataMap. Superclasses should not be changed manually, since they are always overwritten. Subclasses are never overwritten and may be later customized by the user. If &quot;makePairs&quot; is set to &quot;false&quot;, a single class will be generated for each ObjEntity.</P>
 
 <P>By creating custom templates, <TT>cgen</TT> can also be used to generate other output (such as web pages, reports, specialized code templates) based on DataMap information.</P>
 
@@ -195,3 +243,12 @@ Title: 3.0 &raquo; maven2-cgen
 <SPAN class="code-tag">&lt;/build&gt;</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/doc/3.0/maven2-modeler.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/maven2-modeler.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/maven2-modeler.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; maven2-modeler
+<!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; 3.0 &raquo; maven2-modeler</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><TT>modeler</TT> is an Maven 2 mojo that runs the latest version of Cayenne Modeler.  It saves you from having to download the modeler and installing it manually, which is really nice if you're following the latest changes in the snapshot builds.</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P><TT>modeler</TT> is an Maven 2 mojo that runs the latest version of Cayenne Modeler.  It saves you from having to download the modeler and installing it manually, which is really nice if you're following the latest changes in the snapshot builds.</P>
 
 <P>There is no configuration of this plugin, but you do need to add to add the plugin to your POM:</P>
 
@@ -24,3 +72,12 @@ Title: 3.0 &raquo; maven2-modeler
 $ mvn cayenne-modeler:run
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/maven2-plugins.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/maven2-plugins.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/maven2-plugins.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Maven2 Plugins
-
-	<H2><A name="Maven2Plugins-Maven2Plugins"></A>Maven2 Plugins</H2>
+<!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; 3.0 &raquo; Maven2 Plugins</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="Maven2Plugins-Maven2Plugins"></A>Maven2 Plugins</H2>
 
 <P>Cayenne ships three plugins that provide Maven 2 frontend to a number of useful operations in Cayenne. </P>
 
@@ -72,3 +120,12 @@ Title: 3.0 &raquo; Maven2 Plugins
 </OL>
 
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/migrate-changes-between-model-and-database.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/migrate-changes-between-model-and-database.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/migrate-changes-between-model-and-database.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Migrate Changes between Model and Database
-
-	<H3><A name="MigrateChangesbetweenModelandDatabase-IntroductiontoMerging"></A>Introduction to Merging</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; 3.0 &raquo; Migrate Changes between Model and 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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H3><A name="MigrateChangesbetweenModelandDatabase-IntroductiontoMerging"></A>Introduction to Merging</H3>
 
 <P>After working some time with the model and/or the database, it can be a lot of work to make sure they are in sync. E.g. A table has been added/removed, a varchar column has a different max length and so on. The merge functionality in the modeler handle all of this.</P>
 
@@ -34,3 +82,12 @@ Title: 3.0 &raquo; Migrate Changes betwe
 
 <P><SPAN class="image-wrap" style=""><IMG src="migrate-changes-between-model-and-database.data/merge-complete.png" style="border: 0px solid black"></SPAN></P>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/modeler-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/modeler-guide.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/modeler-guide.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/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>
@@ -18,3 +66,12 @@ Title: 3.0 &raquo; Modeler Guide
 </OL>
 
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/modeling-database-layer.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/modeling-database-layer.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/modeling-database-layer.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Modeling Database Layer
-
-	<H2><A name="ModelingDatabaseLayer-ModelingDatabaseLayer"></A>Modeling Database Layer</H2>
+<!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; 3.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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="ModelingDatabaseLayer-ModelingDatabaseLayer"></A>Modeling Database Layer</H2>
 
 <P>This chapter describes modeling the RDBMS schema in Cayenne.</P>
 
@@ -13,3 +61,12 @@ Title: 3.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/doc/3.0/modeling-embeddables.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/modeling-embeddables.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/modeling-embeddables.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Modeling Embeddables
-
-	<P>An <TT>Embeddable</TT> is a persistent Java class that does not have its own persistent &quot;identity&quot; (&quot;identity&quot; is an ORM concept similar to &quot;primary key&quot;) and is managed by Cayenne as a part of its owning object. Embeddables are mapped in Cayenne similar to ObjEntities, except that they are not linked to any DbEntity. An Embeddable becomes linked to one when it is &quot;embedded&quot; in an owning ObjEntity. &quot;Embedding&quot; means mapping ObjEntity's ObjAttribute to an embeddable type.  A single embeddable can be included (&quot;embedded&quot;) in more than one ObjEntity.</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; 3.0 &raquo; Modeling Embeddables</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>An <TT>Embeddable</TT> is a persistent Java class that does not have its own persistent &quot;identity&quot; (&quot;identity&quot; is an ORM concept similar to &quot;primary key&quot;) and is managed by Cayenne as a part of its owning object. Embeddables are mapped in Cayenne similar to ObjEntities, except that they are not linked to any DbEntity. An Embeddable becomes linked to one when it is &quot;embedded&quot; in an owning ObjEntity. &quot;Embedding&quot; means mapping ObjEntity's ObjAttribute to an embeddable type.  A single embeddable can be included (&quot;embedded&quot;) in more than one ObjEntity.</P>
 
 <P>Embeddable classes are generated by Cayenne (via the Modeler, Ant or Maven), just like other persistent classes. There's no common embeddable superclass, so each embeddable inherits from Object. Still Cayenne generates a familiar pair of <TT>&#95;Xyz</TT> superclass and <TT>Xyz</TT> subclass for each Embeddable.</P>
 
@@ -19,3 +67,12 @@ Title: 3.0 &raquo; Modeling Embeddables
 <P>The process of embedding an Embeddable is rather simple. Add a new attribute to your Java class (under the ObjEntity Attributes tab) and then inspect the entry. (Note: It is important that you inspect the entry instead of entering the embeddable's type directly in  the Java Type column under the Attributes tab due to a limitation in Cayenne Modeler.) Select the embeddable type in the Type pulldown list. CayenneModeler will automatically include all Embeddable classes it knows about in the Java types dropdown. If the underlying DbEntity has the same column names as the original Embeddable, that's all you need to do. If not, you can override the default column names by clicking on the attribute inspector button (&quot;I&quot;) and changing DbAttribute mappings for this particular embedding:</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="modeling-embeddables.data/modeler-embeddedinspector.png" style="border: 0px solid black"></SPAN></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/modeling-enumerations.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/modeling-enumerations.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/modeling-enumerations.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Modeling Enumerations
-
-	<H2><A name="ModelingEnumerations-MappingandModelingJavaEnumerations"></A>Mapping and Modeling Java Enumerations</H2>
+<!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; 3.0 &raquo; Modeling Enumerations</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="/doc30/documentation.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc30/overview.html">Overview</a></li>
+			<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="ModelingEnumerations-MappingandModelingJavaEnumerations"></A>Mapping and Modeling Java Enumerations</H2>
 
 <P>Cayenne allows to use any <A href="http://java.sun.com/j2se/1.5.0/docs/guide/language/enums.html" class="external-link" rel="nofollow">Java enumeration</A> as an ObjAttribute type. In CayenneModeler's ObjEntity editor, under the Attributes tab, enter the full class name for your enumeration under the Java Type column, and this is it:</P>
 
@@ -28,3 +76,12 @@ Title: 3.0 &raquo; Modeling Enumerations
 
 <P>This instructs Cayenne to read/write 3, 6, and 9 as RED, GREEN, and BLUE, respectively.  The order is unimportant - if someone re-orders them to be BLUE, GREEN, and RED in the enum class, all values will still map correctly.</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>



Mime
View raw message