cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r837683 [23/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/deployment.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/deployment.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/deployment.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 » Deployment
-
-	<H2><A name="Deployment-Deployment"></A>Deployment</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; Deployment</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="Deployment-Deployment"></A>Deployment</H2>
 
 <P>Cayenne application deployment is about configuring the application so that at runtime it can find a main project file (cayenne.xml) and associated resources, such as DataMap and DataNode XML files.</P>
 
@@ -28,3 +76,12 @@ DataDomain domain = conf.getDomain();
 </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/design.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/design.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/design.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Design
+<!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; Design</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="Design-Design"></A>Design</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="Design-Design"></A>Design</H2>
 <P>This chapter discusses the architecture of the Cayenne runtime framework. The information below is not strictly required to start using Cayenne, and new users can skip it initially and come back later to gain better understanding of how Cayenne operates under the hood.</P>
 
 <H3><A name="Design-Sections"></A>Sections</H3>
@@ -13,3 +61,12 @@ Title: 3.0 &raquo; Design
 	<LI><A href="primary-key-generation.html" title="Primary Key Generation">Primary Key generation strategies</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/documentation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/documentation.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/documentation.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Documentation
-
-	<H2>Cayenne Documentation - v. 3.0</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; Documentation</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<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>Cayenne Documentation - v. 3.0</H2>
 
 <P>Cayenne documentation consists of the following &quot;books&quot;:</P>
 
@@ -20,3 +68,12 @@ Title: 3.0 &raquo; Documentation
 	<LI><A href="http://sourceforge.net/projects/tapcaycrud" class="external-link" rel="nofollow">TapCayCrud</A> - a Tapestry/Cayenne/Maven2 tutorial.</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/ejbqlquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/ejbqlquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/ejbqlquery.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; EJBQLQuery
-
-	<P><EM>(available since 3.0 in both classic and JPA modes; as of June 2007 only a subset of EJBQL syntax is supported)</EM></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; EJBQLQuery</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><EM>(available since 3.0 in both classic and JPA modes; as of June 2007 only a subset of EJBQL syntax is supported)</EM></P>
 
 <P>EJBQL is an object query language that is not unlike SQL, only it operates in terms of the Java object model. In fact &quot;EJB&quot; in its name is entirely misleading - the language is applicable in the non-&quot;enterprise&quot; environments just as well. Standard EJBQL syntax is specified in the <A href="../CAYJPA/jpa-guide.html" title="JPA Guide">JPA specification</A>, still Cayenne supports it in a classic mode, and no JPA runtime is required to execute such queries. This chapter deals specifically with classic mode operation. </P>
 
@@ -59,3 +107,12 @@ Title: 3.0 &raquo; EJBQLQuery
 	<LI><B>Null Handling</B>:</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/entityresolver.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/entityresolver.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/entityresolver.html Thu Nov  8 17:48:56 2012
@@ -1,5 +1,62 @@
-Title: 3.0 &raquo; EntityResolver
+<!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; EntityResolver</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	<P>In runtime the mapping metadata is accessed via a <A href="datachannel.html" title="DataChannel">DataChannel</A> in a form of <TT>org.apache.cayenne.map.EntityResolver</TT> (EntityResolver available via ObjectContext is usually obtained from the channel behind the scenes). EntityResolver provides a single namespace for multiple DataMaps. </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>In runtime the mapping metadata is accessed via a <A href="datachannel.html" title="DataChannel">DataChannel</A> in a form of <TT>org.apache.cayenne.map.EntityResolver</TT> (EntityResolver available via ObjectContext is usually obtained from the channel behind the scenes). EntityResolver provides a single namespace for multiple DataMaps. </P>
 
 <P>Another important function of the EntityResolver is providing access to the <TT>org.apache.cayenne.property.ClassDescriptor</TT> instances for each persistent entity. Those a compiled by Cayenne on the fly using EntityResolver's <TT>org.apache.cayenne.property.ClassDescriptorFactory</TT>.</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/event-package.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/event-package.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/event-package.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Event Package
+<!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; Event Package</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>Cayenne includes a full-featured events mechanism. It allows creation of local and distributed event queues. It is very powerful and generic; it is not tied to Cayenne persistence features in any way and can be used in any application. The most important features are:</P>
 
 <UL>
@@ -14,3 +62,12 @@ Title: 3.0 &raquo; Event Package
 
 
 <DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The most common error when using EventSubject is not storing a reference to it. This may result in a premature cleanup of a given subject, and automatic unregistering of all listeners. Good practice is to make subject a &quot;public static final&quot; variable of the event sender class if a subject is common for all instances of senders; or make it an ivar of a sender instance if subject is only related to this instance.</TD></TR></TABLE></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/executing-a-stored-procedure.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/executing-a-stored-procedure.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/executing-a-stored-procedure.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Executing a Stored Procedure
-
-	<H3><A name="ExecutingaStoredProcedure-UsingQueryResponsetoProcessComplexResults"></A>Using QueryResponse to Process Complex Results</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; Executing a Stored Procedure</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="ExecutingaStoredProcedure-UsingQueryResponsetoProcessComplexResults"></A>Using QueryResponse to Process Complex Results</H3>
 
 <P>Previous chapter showed how to select a single set of data rows using a ProcedureQuery. In a more general case stored procedures can return multiple sets of data, either as ResultSets or via OUT parameters, execute update/delete/insert queries, etc. To collect the results of execution of such stored procedure, you need to run a query using context's <TT>&quot;performGenericQuery&quot;</TT> method and inspect returned QueryResponse.</P>
 
@@ -61,3 +109,12 @@ query.addParameter(<SPAN class="code-quo
 }
 </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/expression-factory-utilities.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/expression-factory-utilities.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/expression-factory-utilities.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Expression Factory Utilities
-
-	<P>Sometimes there is a need to build an expression by combining other existing expressions. Also quiet often it is desirable to use strongly typed API instead of interpreted string expressions. The following sections describe <A href="http://cayenne.apache.org/doc/api/org/apache/cayenne/exp/ExpressionFactory.html" class="external-link" rel="nofollow">ExpressionFactory</A> and <A href="http://cayenne.apache.org/doc/api/org/apache/cayenne/exp/Expression.html" class="external-link" rel="nofollow">Expression</A> methods that allow to construct expressions step by step via API calls.</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; Expression Factory Utilities</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>Sometimes there is a need to build an expression by combining other existing expressions. Also quiet often it is desirable to use strongly typed API instead of interpreted string expressions. The following sections describe <A href="http://cayenne.apache.org/doc/api/org/apache/cayenne/exp/ExpressionFactory.html" class="external-link" rel="nofollow">ExpressionFactory</A> and <A href="http://cayenne.apache.org/doc/api/org/apache/cayenne/exp/Expression.html" class="external-link" rel="nofollow">Expression</A> methods that allow to construct expressions step by step via API calls.</P>
 
 <H3><A name="ExpressionFactoryUtilities-Path%2FValueExpressions"></A>Path/Value Expressions</H3>
 
@@ -106,3 +154,12 @@ Expression qual = ExpressionFactory.matc
 <P>&quot;Path&quot; argument to both of these methods can use a split character (a pipe symbol '|') instead of dot to indicate that relationship following a path should be split into a separate set of joins, one per collection value. There can only be one split at most in any given path. Split must always precede a relationship. E.g. <TT>&quot;|exhibits.paintings&quot;</TT>, <TT>&quot;exhibits|paintings&quot;</TT>, etc. Internally Cayenne would generate distinct aliases for each of the split expressions, forcing separate joins.</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/expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/expressions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/expressions.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Expressions
-
-	<H2><A name="Expressions-Expressions"></A>Expressions</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; 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="/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="Expressions-Expressions"></A>Expressions</H2>
 
 <P>Cayenne defines a simple yet powerful object-based expression language. Cayenne expressions are database independent and are used as query qualifiers and orderings and also to perform in-memory evaluation with DataObjects (and generally any kind of Java Beans). BNF of Cayenne expression language is described <A href="bnf-for-expressionparser.html" title="BNF for ExpressionParser">here</A>.</P>
 
@@ -17,3 +65,12 @@ Title: 3.0 &raquo; Expressions
 	<LI><A href="bnf-for-expressionparser.html" title="BNF for ExpressionParser">BNF for ExpressionParser</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/extended-types.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/extended-types.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/extended-types.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Extended Types
-
-	<P>JDBC specification defines a set of &quot;standard&quot; database column types (defined in java.sql.Types class) and a very specific mapping of these types to Java Object Types, such as java.lang.String, java.math.BigDecimal, etc. Sometimes there is a need to use a custom Java type not known to JDBC driver. CayenneModeler allows to configure an arbitrary Java class as an <TT>org.apache.cayenne.map.ObjAttribute</TT> type by simply entering a fully-qualified name such class in the type column of an ObjAttribute. However there is more to it than just that. Cayenne needs to know how to instantiate this type from a database &quot;primitive&quot; value, and conversly, how to transform an object of the custom type to a JDBC-compatible object.</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; Extended Types</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>JDBC specification defines a set of &quot;standard&quot; database column types (defined in java.sql.Types class) and a very specific mapping of these types to Java Object Types, such as java.lang.String, java.math.BigDecimal, etc. Sometimes there is a need to use a custom Java type not known to JDBC driver. CayenneModeler allows to configure an arbitrary Java class as an <TT>org.apache.cayenne.map.ObjAttribute</TT> type by simply entering a fully-qualified name such class in the type column of an ObjAttribute. However there is more to it than just that. Cayenne needs to know how to instantiate this type from a database &quot;primitive&quot; value, and conversly, how to transform an object of the custom type to a JDBC-compatible object.</P>
 
 <H3><A name="ExtendedTypes-SupportingNonStandardTypes"></A>Supporting Non-Standard Types</H3>
 
@@ -26,3 +74,12 @@ Title: 3.0 &raquo; Extended Types
 <H3><A name="ExtendedTypes-ROPConsiderations"></A>ROP Considerations</H3>
 
 <P>If you are using Cayenne in a three tier (ROP) environment, serialization of the extended type becomes important. More information can be found <A href="remote-object-persistence-customization.html" title="Remote Object Persistence Customization">here.</A></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/flattened-relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/flattened-relationships.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/flattened-relationships.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Flattened Relationships
-
-	<P>Flattened relationships are a fancy term for a relationship which involves three or more tables in the database. Lets say you have Artists and Exhibits. They are joined with a many-many join table called Artist_Exhibit, because many Artists could collaborate on one Exhibit and each Artist might be part of many Exhibits. Now you could map these as separate joins and end up with Java code which looks like this:</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; 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="/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>Flattened relationships are a fancy term for a relationship which involves three or more tables in the database. Lets say you have Artists and Exhibits. They are joined with a many-many join table called Artist_Exhibit, because many Artists could collaborate on one Exhibit and each Artist might be part of many Exhibits. Now you could map these as separate joins and end up with Java code which looks like this:</P>
 
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java">
@@ -20,3 +68,12 @@ artist.getExhibits()
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Flattened Relationships Limitations</B><BR>Only many-to-many flattened relatationships with a single join table can be modified. All other types of flattened relationships can be used as &quot;read-only&quot;. This is reflected in the DataObject code generated for such relationships - no set/addTo/RemoveFrom methods are created for read-only relationships.</TD></TR></TABLE></DIV>
 
 <P>See this documentation on how to <A href="cayennemodeler-flattened-relationships.html" title="CayenneModeler Flattened Relationships">create flattened relationships in Cayenne Modeler</A></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/general-navigation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/general-navigation.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/general-navigation.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; General Navigation
-
-	<H3><A name="GeneralNavigation-GeneralNavigation"></A>General Navigation</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; General Navigation</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="GeneralNavigation-GeneralNavigation"></A>General Navigation</H3>
 
 
 <P>CayenneModeler supports executing commands via its main menu, a button toolbar and contextual menus that open on right-click. All of the toolbar buttons have corresponding items in the menu that perform the exact same operation (plus there are operations that are available via the menu only). If an item or a button action can not be performed in a given context an item is visually disabled.</P>
@@ -52,3 +100,12 @@ Title: 3.0 &raquo; General Navigation
 <H5><A name="GeneralNavigation-Query%3A%21iconquery.gif%21"></A>Query: <SPAN class="image-wrap" style=""><IMG src="general-navigation.data/icon-query.gif" style="border: 0px solid black"></SPAN></H5>
 
 <P>Cayenne allows to store queries in the DataMap. There are 4 types of Cayenne queries that can be created in the Modeler - object select query, raw SQL query, procedure query and EJBQL query.</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/general-preferences.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/general-preferences.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/general-preferences.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,63 @@
-Title: 3.0 &raquo; General Preferences
+<!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; General Preferences</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="GeneralPreferences-GeneralPreferences"></A>General Preferences</H3>
 
 <P>&quot;General Preferences&quot; panel currently supports configuration of a single parameter - &quot;Preferences Save Interval&quot;. This parameter determines how often should the Modeler commit preference values that it collects automatically during normal operation (e.g. main window or panel sizes, etc.). Don't set this to a small value as this may sometimes degrade Modeler performance. </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/generate-database-schema.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/generate-database-schema.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/generate-database-schema.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Generate Database Schema
+<!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; Generate Database Schema</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="GenerateDatabaseSchema-GenerateDatabaseSchema"></A>Generate Database Schema</H3>
 
 <P>To be done...</P>
@@ -10,3 +58,12 @@ Title: 3.0 &raquo; Generate Database Sch
 <P><SPAN class="image-wrap" style=""><IMG src="generate-database-schema.data/generate-options.jpg" style="border: 0px solid black"></SPAN></P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="generate-database-schema.data/generate-options-tables.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/generate-java-classes.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/generate-java-classes.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/generate-java-classes.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Generate Java Classes
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 3.0 &raquo; Generate Java Classes</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>First we'd like to mention an alternative way of generating classes from the model, that can save time in many situtations compared to using the GUI: <A href="cgen.html" title="cgen">cgen Ant task</A> would automatically refresh generated classes when needed during the build.</P>
 
 <P>To generate classes from the Modeler, you must select either a DataMap or an ObjEntity in the project tree and then select <TT>&quot;Tools &gt; Generate Classes&quot;</TT> from the menu. A &quot;Code Generation&quot; dialog opens:</P>
@@ -24,3 +72,12 @@ Title: 3.0 &raquo; Generate Java Classes
 <P>As the name implies this mode allows much more customization of the generation procedure, such as custom Velocity templates (that are configured in Modeler Preferences), single run per entity or single run for the entire DataMap, etc. The options available in the dialog closely mirror those of the <A href="cgen.html" title="cgen">cgen</A> Ant task.</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="generate-java-classes.data/generator2.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/generate-primary-key-support.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/generate-primary-key-support.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/generate-primary-key-support.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Generate Primary Key Support
-
-	<H3><A name="GeneratePrimaryKeySupport-GeneratePrimaryKeySupport"></A>Generate Primary Key Support</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; Generate Primary Key Support</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="GeneratePrimaryKeySupport-GeneratePrimaryKeySupport"></A>Generate Primary Key Support</H3>
 
 <P>One of Cayenne core features is automatic generation of the database primary keys for the new objects. This requires a set of special database objects to be present in the database. Those are adapter-specific and can be special lookup tables, stored procedures, sequences, etc. If the database schema was generated by CayenneModeler as described in previous chapters, chances are that all needed database objects were already created. Otherwise, if there was an existing schema, these objects must be created in the database. The easiest way to do that is to use CayenneModeler &quot;<TT>Tools &gt; Generate Database Schema</TT>&quot; menu item, setting special generation options.</P>
 
@@ -13,3 +61,12 @@ Title: 3.0 &raquo; Generate Primary Key 
 <P><SPAN class="image-wrap" style=""><IMG src="generate-primary-key-support.data/generate-connect.jpg" style="border: 0px solid black"></SPAN></P>
 
 <P>You must uncheck all options except for &quot;Create Primary key Support&quot;, and then click &quot;Generate&quot;. If there were any database specific errors during generation they will be listed in a status window. Sometimes such errors can be simply ignored (e.g. when a there was an existing primary key support already configured in the DB).</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/generated-columns.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/generated-columns.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/generated-columns.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Generated Columns
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 3.0 &raquo; Generated Columns</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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="GeneratedColumns-WhatIsa%22Generated%22Column"></A>What Is a &quot;Generated&quot; Column</H2>
 
 <P>Many databases allow users to define special columns with values that are automatically created by the the database to be unique for each inserted row. Main use if this feature is to generate a primary key. Such columns are often called <B>&quot;autoincrement&quot;</B> or <B>&quot;identity&quot;</B> columns. JDBC3 specification provides Java API to read values of such columns right after an insert is performed. JDBC calls such columns <B>&quot;generated keys&quot;</B>, and Cayenne follows JDBC in that. Namely DbAttribute has a <TT>&quot;generated&quot;</TT> boolean property to indicate that a given column value is provided by the database on insert.</P>
@@ -48,3 +96,12 @@ adapter.setSupportsGeneratedKeys(<SPAN c
 
 
 <DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>MS SQLServer Note</B><BR>MS drivers prior to 2005 version do not support generated columns, while newer drivers and <A href="http://jtds.sourceforge.net/" class="external-link" rel="nofollow">jTDS</A> support it just fine. Cayenne can automatically detect the driver type and configure SQLServerAdapter, but only when AutoAdapter is used. To make sure auto-detection works, clear the &quot;Custom Adapter&quot; field for the corresponding DataNode in the Modeler.</TD></TR></TABLE></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/generic-persistent-class.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/generic-persistent-class.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/generic-persistent-class.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Generic Persistent Class
-
-	<H2><A name="GenericPersistentClass-WhatIs%22GenericPersistentClass%22"></A>What Is &quot;Generic Persistent Class&quot;</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; Generic Persistent Class</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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="GenericPersistentClass-WhatIs%22GenericPersistentClass%22"></A>What Is &quot;Generic Persistent Class&quot;</H2>
 
 <P>Each kind of persistent objects (such as &quot;Artist&quot; or &quot;Painting&quot;) is described in Cayenne by a single ObjEntity. The most common and useful scenario is mapping an ObjEntity to a &quot;specialized&quot; Java class, one class per entity. But there is an alternative - use a single generic persistent object class to map any entity.</P>
 
@@ -90,3 +138,12 @@ DataObject object = ...;
 object.writeProperty(<SPAN class="code-quote">&quot;subject&quot;</SPAN>, <SPAN class="code-quote">&quot;Post On Topic&quot;</SPAN>);
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/guide-to-11-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/guide-to-11-features.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/guide-to-11-features.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Guide to 1.1 Features
-
-	<P>Cayenne version 1.1 introduces a large number of new features and enhancements over 1.0. This chapter lists most of them, providing the links to more detailed information about each feature.</P>
+<!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; Guide to 1.1 Features</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>Cayenne version 1.1 introduces a large number of new features and enhancements over 1.0. This chapter lists most of them, providing the links to more detailed information about each feature.</P>
 
 <H3><A name="Guideto1.1Features-DTDAdditions."></A>DTD Additions.</H3>
 
@@ -139,3 +187,12 @@ Title: 3.0 &raquo; Guide to 1.1 Features
 <P>The following is an incomplete list of enhancements: new professional look and feel, preference engine, reenginnering of stored procedures, local DataSources, configurable locations of JDBC drivers, custom class generation templates, etc. A number of Modeler tasks and dialogs have been redesigned and improved to be more user-friendly and consistent.</P>
 
 <P>Also CayenneModeler supports mapping of all the new 1.1 framework features, such as DataMap queries, cache synchronization configuration, etc.</P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/guide-to-12-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/guide-to-12-features.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/guide-to-12-features.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Guide to 1.2 Features
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 3.0 &raquo; Guide to 1.2 Features</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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 page describes new features and other changes introduced in 1.2 release.</P>
 
 <H2><A name="Guideto1.2Features-CoreFramework"></A>Core Framework </H2>
@@ -155,3 +203,12 @@ Title: 3.0 &raquo; Guide to 1.2 Features
 	<LI>Customizable Encoding Of Generated Files. Desired encoding for generated Java files can be specified in the Modeler in Preferences and as an &quot;encoding&quot; attribute of the cgen Ant task. This is helpful in cross-platform development situations.</LI>
 </UL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/guide-to-30-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/guide-to-30-features.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/guide-to-30-features.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Guide to 3.0 Features
-
-	<P>This page highlights the new features and changes introduced in 3.0 release. It is a high level overview and as such is by no means complete. Consult RELEASE-NOTES.txt file included in each release for the full list of changes, and UPGRADE.txt for the upgrade instructions.</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; Guide to 3.0 Features</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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 page highlights the new features and changes introduced in 3.0 release. It is a high level overview and as such is by no means complete. Consult RELEASE-NOTES.txt file included in each release for the full list of changes, and UPGRADE.txt for the upgrade instructions.</P>
 
 <UL>
 	<LI><A href="#Guideto3.0Features-DistributionContentsStructure">Distribution Contents Structure</A></LI>
@@ -247,3 +295,12 @@ Title: 3.0 &raquo; Guide to 3.0 Features
 	<LI>The Modeler can be <A href="maven2-modeler.html" title="maven2-modeler">started from Maven</A>, that can potentially help in aligning the Modeler version with the project runtime Cayenne version.</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/handling-inheritance.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/handling-inheritance.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/handling-inheritance.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,54 @@
-Title: 3.0 &raquo; Handling Inheritance
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 3.0 &raquo; Handling Inheritance</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
 
-	<P>&quot;Inheritance&quot; is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called &quot;single table inheritance&quot;). Such mapping is described in detail in the <A href="modeling-single-table-inheritance.html" title="Modeling Single Table Inheritance">Modeler Guide</A>. The idea of single table inheritance is that a &quot;class&quot; of a database row is determined from the values in one or more columns of the base table. These columns are called &quot;class designator columns&quot;.</P>
+<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>&quot;Inheritance&quot; is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called &quot;single table inheritance&quot;). Such mapping is described in detail in the <A href="modeling-single-table-inheritance.html" title="Modeling Single Table Inheritance">Modeler Guide</A>. The idea of single table inheritance is that a &quot;class&quot; of a database row is determined from the values in one or more columns of the base table. These columns are called &quot;class designator columns&quot;.</P>
 
 <H3><A name="HandlingInheritance-InheritanceandnewDataObjects"></A>Inheritance and new DataObjects</H3>
 <P>Consider the following class hierarchy (also used in the Modeler Guide example):<BR>
@@ -56,3 +104,12 @@ List employees = context.performQuery(qu
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Whenever an object is obtained via a relationship, it is always fully resolved to the lowest possible subclass in an entity inheritance tree.</TD></TR></TABLE></DIV>
 
 <DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Use <TT>setResolvingInherited(false)</TT> with caution, and only if you never plan to work with subclasses. The downside of it is that the DataContext may end up with two objects pointing to the same database row, thus violating uniquing principle. With the above example, this may happen if at a later time user decides to fetch Managers directly, or if a Manager object is obtained via a relationship.</TD></TR></TABLE></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>



Mime
View raw message