You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by bu...@apache.org on 2012/11/09 08:29:36 UTC

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

Modified: websites/staging/cayenne/trunk/content/docs/2.0/web-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/web-applications.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/web-applications.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 » Web Applications
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Web Applications</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <H3><A name="WebApplications-PuttingCayenneFilesinWebApplicationCLASSPATH"></A>Putting Cayenne Files in Web Application CLASSPATH</H3>
 
 <P>When deploying an application in a web container it is possible to follow the procedure for the standalone applications, i.e. put all XML files in the application CLASSPATH (e.g. in &quot;mywebapp/WEB-INF/classes/&quot;, but DON'T put it in container shared locations!). Session DataContext can be obtained via ServletUtil:</P>
@@ -71,3 +118,12 @@ WEB-INF/lib/...</PRE>
     &lt;param-value&gt;/WEB-INF/config/cayenne-files&lt;/param-value&gt;
 &lt;/context-param&gt;</PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/3.0/accessing-pk-and-fk-values.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/accessing-pk-and-fk-values.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/accessing-pk-and-fk-values.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Accessing PK and FK Values
-
-	<P>Normally it is not advisable to map primary and foreign key columns (PK and FK) as Java class properties (ObjAttributes). When reverse engineering of the database is done using CayenneModeler, the generated mapping will reflect that PKs and FKs will not be included in the Java class. However, sometimes an application requires access to these values.</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; Accessing PK and FK Values</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>Normally it is not advisable to map primary and foreign key columns (PK and FK) as Java class properties (ObjAttributes). When reverse engineering of the database is done using CayenneModeler, the generated mapping will reflect that PKs and FKs will not be included in the Java class. However, sometimes an application requires access to these values.</P>
 
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>For an easier way to obtain an object primary key or to find an object from a known PK, skip to the chapter on the <A href="dataobjectutils.html" title="DataObjectUtils">DataObjectUtils</A> class.</TD></TR></TABLE></DIV>
 
@@ -80,3 +128,12 @@ Title: 3.0 &raquo; Accessing PK and FK V
 }
 </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/3.0/advanced-sqltemplate.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/advanced-sqltemplate.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/advanced-sqltemplate.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Advanced SQLTemplate
-
-	<H3><A name="AdvancedSQLTemplate-ControllingResultDataRowCaps"></A>Controlling Result DataRow Caps</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; Advanced SQLTemplate</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H3><A name="AdvancedSQLTemplate-ControllingResultDataRowCaps"></A>Controlling Result DataRow Caps</H3>
 
 <P><EM>(available since 3.0)</EM></P>
 
@@ -47,3 +95,12 @@ List objects = context.performQuery(quer
 </DIV></DIV>
 
 <P>Note that a call to &quot;addPrefetch&quot; is still needed to tell Cayenne which relationships are prefetched.</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/3.0/ant-tasks.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/ant-tasks.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/ant-tasks.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Ant Tasks
-
-	<H2><A name="AntTasks-Anttasks"></A>Ant tasks</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; Ant Tasks</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="AntTasks-Anttasks"></A>Ant tasks</H2>
 
 <P>Cayenne ships with Ant tasks that provide Ant frontend to a number of useful operations in Cayenne.  These tasks are part of the cayenne-tools JAR. The following tasks are included:</P>
 
@@ -47,3 +95,12 @@ Title: 3.0 &raquo; Ant Tasks
 </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/3.0/bnf-for-expressionparser.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/bnf-for-expressionparser.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/bnf-for-expressionparser.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; BNF for ExpressionParser
+<!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; BNF for ExpressionParser</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="BNFforExpressionParser-BNFforExpressionParser.jj"></A>BNF for ExpressionParser.jj</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="BNFforExpressionParser-BNFforExpressionParser.jj"></A>BNF for ExpressionParser.jj</H2>
 
 <DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
 <PRE>NON-TERMINALS
@@ -47,3 +95,12 @@ namedParameter 	::= 	&quot;$&quot; &lt;P
 pathExpression 	::= 	( &lt;PROPERTY_PATH&gt; | &quot;obj:&quot; &lt;PROPERTY_PATH&gt; | &quot;db:&quot; &lt;PROPERTY_PATH&gt; )
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/3.0/building-expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/building-expressions.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/building-expressions.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Building Expressions
-
-	<P>The Expression class (<TT>org.apache.cayenne.exp.Expression</TT>) provides <TT>Expression.fromString(String)</TT> as a convenience method to create expressions of arbitrary complexity.  The structure of expressions is fairly intuitive, with the <A href="http://incubator.apache.org/cayenne/1_2/grammar/ExpressionParser.html" class="external-link" rel="nofollow">formal grammar</A> showing the formal syntax and operators currently supported, but this topic is devoted to showing examples of usage.  To demonstrate, an expression that matches Paintings with names that start with &quot;A&quot; and a price less than $1000.00 can be written as:</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; Building Expressions</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>The Expression class (<TT>org.apache.cayenne.exp.Expression</TT>) provides <TT>Expression.fromString(String)</TT> as a convenience method to create expressions of arbitrary complexity.  The structure of expressions is fairly intuitive, with the <A href="http://incubator.apache.org/cayenne/1_2/grammar/ExpressionParser.html" class="external-link" rel="nofollow">formal grammar</A> showing the formal syntax and operators currently supported, but this topic is devoted to showing examples of usage.  To demonstrate, an expression that matches Paintings with names that start with &quot;A&quot; and a price less than $1000.00 can be written as:</P>
 
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
@@ -168,3 +216,12 @@ values = dataContext.performQuery(query)
 </DIV></DIV>
 
 <P>Even though the specified expression has two named parameters, the &quot;gallery&quot; key has been omitted.  Cayenne will automatically translate the expression into <TT>&quot;artist.artistName = $artist&quot;</TT> (which becomes <TT>&quot;artist.artistName = 'Salvador Dali'&quot;</TT>).  This feature allows a restrictive search qualifier to be written and prompt the user for search criteria.  If the user leaves values out, the expression can automatically widen to be a less restrictive search by omitting the keys for the map.</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/3.0/caching-and-fresh-data.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/caching-and-fresh-data.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/caching-and-fresh-data.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Caching and Fresh Data
-
-	<H2><A name="CachingandFreshData-CachingandFreshData"></A>Caching and Fresh Data</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; Caching and Fresh Data</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="CachingandFreshData-CachingandFreshData"></A>Caching and Fresh Data</H2>
 
 <P>Caching is used by Cayenne to reduce database access and improve performance of your application. Sometimes caching automatically happens behind the scenes, and in other places the user must declare an intent to cache data. Configuring caching parameters beyond the provided reasonable defaults is an art of balancing performance with the need to see the fresh data.</P>
 
@@ -26,3 +74,12 @@ Title: 3.0 &raquo; Caching and Fresh Dat
 
 
 
+
+       <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/3.0/caching-lookup-tables.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/caching-lookup-tables.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/caching-lookup-tables.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Caching Lookup Tables
+<!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; Caching Lookup Tables</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>Query result caching feature can be used to implement caching of lookup tables. &quot;Lookup&quot; or &quot;configuration&quot; tables can be loosely defined as small tables that change rarely and mostly used in read-only fashion. Examples of such tables are COUNTRY, USER_TYPE, AREA_CODE, etc. Often data from such tables is displayed in a combo box or dropdown.</P>
 
 <P>For performance reasons it makes sense to store the lookup data in the shared cache. The following steps could be taken to create and use a shared query for a Country entity:</P>
@@ -10,3 +58,12 @@ Title: 3.0 &raquo; Caching Lookup Tables
 	<LI>Whenever a list of countries is needed, use a local DataContext to get it from cache - <TT>context.performQuery(&quot;AllCountries&quot;, false)</TT>.</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/3.0/caching-query-results.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/caching-query-results.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/caching-query-results.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Caching Query Results
-
-	<P>Cayenne provides a way to cache query results, avoiding unneeded database trips for the frequently used queries. Caching strategy is configured per query. A strategy can be set via API or in CayenneModeler. Possible strategies, as defined in the <TT>org.apache.cayenne.query.QueryCacheStrategy</TT> enum are the following:</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; Caching Query Results</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>Cayenne provides a way to cache query results, avoiding unneeded database trips for the frequently used queries. Caching strategy is configured per query. A strategy can be set via API or in CayenneModeler. Possible strategies, as defined in the <TT>org.apache.cayenne.query.QueryCacheStrategy</TT> enum are the following:</P>
 
 <DIV class="table-wrap">
 <TABLE class="confluenceTable"><TBODY>
@@ -92,3 +140,12 @@ List objects2 = context.performQuery(que
 <P><SPAN class="image-wrap" style=""><IMG src="caching-query-results.data/caching.jpg" style="border: 0px solid black"></SPAN></P>
 
 <P>NamedQueries that are using caching can be executed just like any other <A href="namedquery.html" title="NamedQuery">NamedQuery</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/3.0/cayenne-and-maven.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cayenne-and-maven.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cayenne-and-maven.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Cayenne and Maven
+<!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; Cayenne and Maven</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="CayenneandMaven-CayenneandMaven"></A>Cayenne and Maven</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="CayenneandMaven-CayenneandMaven"></A>Cayenne and Maven</H2>
 
 <P>Cayenne publishes Maven2 artifacts to the central Maven repository, so they can be declared as dependencies in the user application <TT>pom.xml</TT>:</P>
 
@@ -18,3 +66,12 @@ Title: 3.0 &raquo; Cayenne and Maven
 &lt;/dependency&gt;
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/3.0/cayenne-contract.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cayenne-contract.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cayenne-contract.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Cayenne Contract
-
-	<P>There is an implied contract between persistent objects and Cayenne runtime. Cayenne expects persistent objects to follow certain conventions, while itself providing management of the various aspects of a persistent object graph.</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; Cayenne Contract</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>There is an implied contract between persistent objects and Cayenne runtime. Cayenne expects persistent objects to follow certain conventions, while itself providing management of the various aspects of a persistent object graph.</P>
 
 <H2><A name="CayenneContract-PersistentObjectRequirements"></A>Persistent Object Requirements</H2>
 
@@ -98,3 +146,12 @@ assertFalse(b1.getListOfA().contains(a1)
 <H3><A name="CayenneContract-LazyObjectResolution"></A>Lazy Object Resolution</H3>
 
 <P>One of the object states is HOLLOW, corresponding to unresolved objects that only have their PK known. Most often HOLLOW objects are returned from to-one relationships. Whenever such object is &quot;touched&quot; by the user (i.e. a  setter or a getter is invoked), Cayenne automatically infaltes it with the database values.</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/3.0/cayenne-datamaps.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cayenne-datamaps.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cayenne-datamaps.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,63 @@
-Title: 3.0 &raquo; Cayenne DataMaps
+<!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; Cayenne DataMaps</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>TO BE DONE</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="cayenne-datamaps.data/entities.gif" 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/3.0/cayenne-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cayenne-guide.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cayenne-guide.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Cayenne 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; Cayenne 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="CayenneGuide-CayenneGuide"></A>Cayenne 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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="CayenneGuide-CayenneGuide"></A>Cayenne Guide</H2>
 
 
 <OL>
@@ -22,3 +70,12 @@ Title: 3.0 &raquo; Cayenne Guide
 	<LI><A href="customization.html" title="Customization">Customization</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/3.0/cayenne-project-structure.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cayenne-project-structure.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cayenne-project-structure.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Cayenne Project Structure
-
-	<H2><A name="CayenneProjectStructure-CayenneProjectStructure"></A>Cayenne Project Structure</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; Cayenne Project Structure</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="CayenneProjectStructure-CayenneProjectStructure"></A>Cayenne Project Structure</H2>
 
 <P>This chapter shows what Cayenne projects are and how different parts of projects are organized.</P>
 
@@ -12,3 +60,12 @@ Title: 3.0 &raquo; Cayenne Project Struc
 </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/3.0/cayenne-projects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cayenne-projects.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cayenne-projects.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Cayenne Projects
-
-	<H3><A name="CayenneProjects-CayenneProjects"></A>Cayenne Projects</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; Cayenne Projects</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H3><A name="CayenneProjects-CayenneProjects"></A>Cayenne Projects</H3>
 
 <P>Cayenne project is a set of XML configuration files needed for a Java application to work with Cayenne. It is editable by CayenneModeler. A project has roughly the following structure:</P>
 
@@ -22,3 +70,12 @@ Title: 3.0 &raquo; Cayenne Projects
 	<LI><B>DataSource file</B>: In a standalone Java application, Java code has no access to DataSource objects that are normally provided by deployment containers. Cayenne framework still needs a DataSource to connect to the database. Therefore Cayenne has a set of wrapper classes located in <TT>org.apache.cayenne.conn</TT> package, to create DataSource objects based on regular JDBC drivers. DataSource file provides needed information about database URL, JDBC driver, login, password and connection pooling parameters of a single DataSource. <EM>Note: such configuration file can be present in development so that CayenneModeler tool could obtain a database connection, even if an application wouldn't use it in deployment and instead would use a DataSource provided by the container</EM>. DTD for the DataSource file can be found <A href="http://svn.apache.org/repos/asf/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/dtd/cayenne-driver-1_1.dtd" class="exte
 rnal-link" rel="nofollow">here</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/3.0/cayenne-user-directory.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cayenne-user-directory.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cayenne-user-directory.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Cayenne User Directory
-
-	<H3><A name="CayenneUserDirectory-CayenneUserDirectory"></A>Cayenne User Directory</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; Cayenne User Directory</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H3><A name="CayenneUserDirectory-CayenneUserDirectory"></A>Cayenne User Directory</H3>
 
 <P>Cayenne has a notion of Cayenne User Directory - a file system directory, one per each user account on a given machine, where Cayenne-related information is stored. While Cayenne runtime knows how to locate and access this directory, it never uses it or relies on its presence. The reason is that Cayenne is often deployed in J2EE containers and should avoid any assumptions about the underlying filesystem layout. CayenneModeler on the other hand uses it to store a number of things, like log files, preferences, etc. While users shouldn't normally care about Cayenne User Directory, as its creation and use are transparent, sometimes it is helpful to know where it is located and what information is stored there. </P>
 
@@ -19,3 +67,12 @@ Title: 3.0 &raquo; Cayenne User Director
 <P><TT>prefs</TT>: preferences database subdirectory.<BR>
 <TT>modeler.preferences</TT>: this is an old modeler preferences file. It is still used by CayenneModeler, but will be completely replaced by the preferences database in the future releases.<BR>
 <TT>modeler.log</TT>: CayenneModeler log file.</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/3.0/cayennemodeler-flattened-relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cayennemodeler-flattened-relationships.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cayennemodeler-flattened-relationships.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; CayenneModeler Flattened Relationships
-
-	<H3><A name="CayenneModelerFlattenedRelationships-FlattenedRelationships"></A>Flattened Relationships</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; CayenneModeler Flattened 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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H3><A name="CayenneModelerFlattenedRelationships-FlattenedRelationships"></A>Flattened Relationships</H3>
 
 <P>ObjRelationships that map to more than a single DbRelationship are called <TT>&quot;flattened&quot;</TT>.</P>
 
@@ -17,3 +65,12 @@ Title: 3.0 &raquo; CayenneModeler Flatte
 <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>Join Table Tip</B><BR>If you flatten across a join table and this join table was mapped to an ObjEntity (and a correspoding Java class), such ObjEntity can be deleted, as it is no longer needed. Underlying DbEntity must be preserved.</TD></TR></TABLE></DIV>
 
 <P>Further information about flattened relationships can be <A href="flattened-relationships.html" title="Flattened Relationships">found 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/3.0/cdataport.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cdataport.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cdataport.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; cdataport
-
-	<P>Sometimes it is necessary to recreate a database, copying data from another existing database. For instance, recreating development database instance from production data, etc. While most RDBMS provide data import/export tools, they normally require advanced DBA skills to use and are most often not portable across database engines. Cayenne will provide a lightweight ant task to do data porting between the databases with identical schema, using DataMap information.</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; cdataport</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>Sometimes it is necessary to recreate a database, copying data from another existing database. For instance, recreating development database instance from production data, etc. While most RDBMS provide data import/export tools, they normally require advanced DBA skills to use and are most often not portable across database engines. Cayenne will provide a lightweight ant task to do data porting between the databases with identical schema, using DataMap information.</P>
 
 <P><TT>cdataport</TT> is an Ant task that takes a Cayenne project (cayenne.xml) with at least one DataMap and two DataNodes and ports data from source DataNode to a destination DataNode. All DataMaps linked to either the source or the target DataNode will be considered for porting.</P>
 
@@ -57,3 +105,12 @@ Title: 3.0 &raquo; cdataport
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-xml"><SPAN class="code-tag">&lt;cdataport projectFile=<SPAN class="code-quote">&quot;subdir/cayenne.xml&quot;</SPAN> srcNode=<SPAN class="code-quote">&quot;ProductionNode&quot;</SPAN> destNode=<SPAN class="code-quote">&quot;DevNode&quot;</SPAN> excludeTables=<SPAN class="code-quote">&quot;BILL_*&quot;</SPAN>/&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/docs/3.0/cdbgen.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cdbgen.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cdbgen.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; cdbgen
-
-	<P><TT>cdbgen</TT> is an Ant task that uses Cayenne DataMap to drop and/or generate schema objects of a specified database.</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; 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="/docs/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/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 Ant task that uses Cayenne DataMap to drop and/or generate schema objects of a specified database.</P>
 
 <H3><A name="cdbgen-Parameters"></A>Parameters</H3>
 <DIV class="table-wrap">
@@ -91,3 +139,12 @@ Title: 3.0 &raquo; cdbgen
     username=<SPAN class="code-quote">&quot;sa&quot;</SPAN>/&gt;
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/3.0/cdbimport.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cdbimport.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cdbimport.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; cdbimport
-
-	<P><TT>cdbimport</TT> is an Ant task that that uses Cayenne to generate a DataMap based on an existing database schema.  This allows you to generate your DataMap prior to building your project, which may be necessary if you are also using the <A href="cgen.html" title="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; 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="/docs/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/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 an Ant task that that uses Cayenne to generate a DataMap based on an existing database schema.  This allows you to generate your DataMap prior to building your project, which may be necessary if you are also using the <A href="cgen.html" title="cgen">cgen</A> task.</P>
 
 <H3><A name="cdbimport-Parameters"></A>Parameters</H3>
 
@@ -93,3 +141,12 @@ Title: 3.0 &raquo; cdbimport
     username=<SPAN class="code-quote">&quot;sa&quot;</SPAN>/&gt;
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/3.0/cdeploy.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cdeploy.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cdeploy.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; cdeploy
-
-	<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><B>Deprecation Warning</B><BR>cdeploy is deprecated in 3.0 and will be removed in subsequent releases</TD></TR></TABLE></DIV>
+<!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; cdeploy</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<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><B>Deprecation Warning</B><BR>cdeploy is deprecated in 3.0 and will be removed in subsequent releases</TD></TR></TABLE></DIV>
 
 <P><TT>cdeploy</TT> is an Ant task that configures Cayenne connection information in existing jar files that contain Cayenne project information. It is useful for the automation of deployment of Cayenne-based frameworks in different environments.</P>
 
@@ -91,3 +139,12 @@ Nested node Parameters:</P>
 <PRE class="code-xml"><SPAN class="code-tag">&lt;cdeploy src=<SPAN class="code-quote">&quot;business.jar&quot;</SPAN> altProjectFile=<SPAN class="code-quote">&quot;my-cayenne.xml&quot;</SPAN>/&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/docs/3.0/cgen.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/cgen.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/cgen.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; cgen
-
-	<P><TT>cgen</TT> is an Ant task that generates and maintains DataObjects source files based on Cayenne DataMap. 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; 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="/docs/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/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 Ant task that generates and maintains DataObjects source files based on Cayenne DataMap. 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, Cgen can also be used to generate other output (such as web pages, reports, specialized code templates) based on DataMap information.</P>
 
@@ -186,3 +234,12 @@ Title: 3.0 &raquo; cgen
 <SPAN class="code-tag">&lt;/cgen&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/docs/3.0/classpath.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/3.0/classpath.html (original)
+++ websites/staging/cayenne/trunk/content/docs/3.0/classpath.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; ClassPath
+<!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; ClassPath</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/3.0/index.html">3.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/3.0/overview.html">Overview</a></li>
+			<li><a href="/docs/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/3.0/api/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <H3><A name="ClassPath-ClassPath"></A>ClassPath</H3>
 
 <P>ClassPath Preferences panel allows users to add or remove locations of the external class libraries (JAR, ZIP, or class directories). These external libraries will be used by CayenneModeler to load JDBC drivers, custom DB adapters, or any other Java resources that are not a part of the Modeler distribution itself.</P>
@@ -8,3 +56,12 @@ Title: 3.0 &raquo; ClassPath
 <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>Modeler ClassNotFound Errors</B><BR>If you encounter any CLASSPATH-related errors during DB reverse engineering, DataSource configuration, etc., in most cases you simply need to go to Preferences ClassPath panel and add an entry pointing to a missing external library.</TD></TR></TABLE></DIV>
 
 <P><SPAN class="image-wrap" style=""><IMG src="classpath.data/prefs-classpath.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>