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/08 18:38:28 UTC

svn commit: r837679 [5/7] - in /websites/staging/cayenne/trunk/content: ./ doc/1.2/ doc/1.2/grammar/

Modified: websites/staging/cayenne/trunk/content/doc/1.2/obtaining-datacontext.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/obtaining-datacontext.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/obtaining-datacontext.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 » Obtaining DataContext
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Obtaining DataContext</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Depending on deployment environment and application needs, Cayenne can be configured in a few different ways to make DataContext instances available. This is discussed in detail in deployment chapter. In this chapter we assume a properly deployed application and will concentrate on how to obtain a DataContext for the database access. The following are the most common ways to achieve that:</P>
 
@@ -73,3 +120,12 @@ DataContext context = ServletUtil.getSes
 </SPAN><SPAN class="code-object">String</SPAN> domainName = ...;
 DataContext context = DataContext.createDataContext(domainName);</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/1.2/orm-case-study.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/orm-case-study.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/orm-case-study.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; ORM Case Study
-
-	
+<!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; 1.2 &raquo; ORM Case Study</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>This chapter shows how ORM (Object Relational Modeling) approach should be chosen based on the project requirements and other factors. It contains links to technical aspects of modeling that are discussed elsewhere. A few scenarios are shown below that describe the most common cases that a development team may encounter on a typical O/R project. Lets assume an imaginary company called &quot;Some Company&quot; that sells services to consumers as its main business, but also sells consumer products, and works with business customers. There are a number of project teams working on a set of Object/Relational projects. </P>
 
@@ -17,3 +64,12 @@ Title: 1.2 &raquo; ORM Case Study
 <P>Before getting into O/R technology, &quot;Some Company&quot; created a set of Java applications for its sales and marketing teams working with business customers. These applications use a custom persistence framework based on Data Access Objects (DAO - a term for objects that encapsulate the handcoded SQL for their persistence operations). The goal of the project is to convert DAO to Cayenne-based Object/Relational business framework, preserving all business rules, and using the existing database.</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/1.2/paginated-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/paginated-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/paginated-queries.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Paginated Queries
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Paginated Queries</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Another common situation found in interactive applications is when it is needed to fetch a large number of rows, and at the same time only a small subset of objects is accessed directly. An example of such application would be a search page. User would like to see how many total results exist that match a certain criteria, but she will only look at a few pages of results out of possibly hundreds or thousands. It will be extremely inefficient to fetch all objects in the memory.</P>
 
@@ -44,3 +91,12 @@ q.setPageSize(50);
 </DIV></DIV>
 
 <DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Combining data rows and paginated queries</B><BR>Cayenne supports combining both performance optimizations in the same query - fetching data rows (see previous chapters) and paginated queries. So if users work with tabular data and don't care much about real objects, combining the two approaches would improve speed and memory use even more.</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/1.2/parameterized-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/parameterized-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/parameterized-queries.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Parameterized Queries
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Parameterized Queries</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>SelectQuery objects can be rather complex. They may contain long qualifiers and lots of tuning parameters. Parameterized Queries feature addresses reusability of complex queries. With this feature, for each group of queries that differ only in the values used in the qualifier, a developer may create a single shared &quot;prototype&quot; or &quot;template&quot; query, and use it later as a factory for other queries. All settings configured in the prototype object will be passed to the final queries. Qualifier of the prototype query may use named parameters that are substituted for real values when a final query is created from the prototype.</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>&quot;Prototype&quot; queries are normally created in CayenneModeler and stored in the DataMap XML file. &quot;Queries Stored in DataMap&quot; chapter describes how to use such templates. This chapter shows how to create them on the spot using the API calls.</TD></TR></TABLE></DIV>
@@ -79,3 +126,12 @@ SelectQuery query2 = proto.queryWithPara
 ... 
 </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/1.2/path-expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/path-expressions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/path-expressions.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Path Expressions
-
-	
+<!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; 1.2 &raquo; Path 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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Before we start discussing how to build expressions, it is important to understand one group of expressions widely used in Cayenne: path expressions. There are two types of path expressions: object path used to navigate graphs of Java objects that follow Java Bean property naming conventions and database path used to navigate the database schema.</P>
 
@@ -33,3 +80,12 @@ Title: 1.2 &raquo; Path Expressions
 <H3><A name="PathExpressions-MatchingPathExpressions"></A>Matching Path Expressions</H3>
 
 <P>As described in the following chapters a path expression is usually matched against some value (see for example <A href="expression-factory-utilities.html" title="Expression Factory Utilities">ExpressionFactory API</A> - the first argument to each method is a path, and a second - an Object value that is matched against the path). Such value type must be compatible with the type of the property pointed to by the path. E.g. toArtist.artistName can only be matched against a String, and toArtist - against instances of Artist. </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/1.2/performance-tuning.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/performance-tuning.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/performance-tuning.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Performance Tuning
-
-	
+<!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; 1.2 &raquo; Performance Tuning</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Most performance problems in database applications, including those using ORM, are related to the inefficient queries and/or large volumes of data in the database. Here is a few common issues that a typical application may run into:</P>
 
@@ -13,3 +60,12 @@ Title: 1.2 &raquo; Performance Tuning
 
 <P>There is no single solution to all performance problems. Cayenne offers a few strategies to improve performance. They should be applied where appropriate.</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/1.2/persistent-object-lifecycle.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/persistent-object-lifecycle.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/persistent-object-lifecycle.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Persistent Object Lifecycle
+<!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; 1.2 &raquo; Persistent Object Lifecycle</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>A lifecycle of a persistent object can be represented as a number of states and transitions between them. These states are formally defined as &quot;int&quot; constants in <TT>org.objectstyle.cayenne.PersistenceState</TT> class. Transitions between states (see the diagram below) occur in response to the application interacting with either persistent objects or Cayenne context. Whenever a transition occurs, Cayenne automatically updates &quot;persistenceState&quot; property of all affected objects by calling <TT>setPersistenceState()</TT>.</P>
 
@@ -12,3 +59,12 @@ Title: 1.2 &raquo; Persistent Object Lif
 <TD class="confluenceTd" valign="top">
 <P>A feteched or committed object state transformations:<BR>
 <SPAN class="image-wrap" style=""><IMG src="persistent-object-lifecycle.data/fetched-persistent-object.png" style="border: 0px solid black"></SPAN></P></TD></TR></TBODY></TABLE>
+
+       <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/1.2/preferences-panel.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/preferences-panel.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/preferences-panel.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Preferences Panel
-
-	
+<!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; 1.2 &raquo; Preferences Panel</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>CayenneModeler relies on a number of user-specific preferences to operate in a user-friendly manner. Some preferences are determined automatically behind the scenes (such as preferred window size or last visited directory), some can be configured by users via &quot;Preferences Panel&quot; described in this chapter.</P>
 
@@ -15,3 +62,12 @@ Title: 1.2 &raquo; Preferences Panel
 <P><SPAN class="image-wrap" style=""><IMG src="preferences-panel.data/prefs-panel.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/1.2/prefetching.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/prefetching.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/prefetching.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Prefetching
-
-	
+<!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; 1.2 &raquo; Prefetching</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/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="Prefetching-IntroductiontoPrefetching"></A>Introduction to Prefetching</H3>
 
@@ -121,3 +168,12 @@ context.performQuery(query);
 
 <P>Code above will result in a single SQL statement issued.</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/1.2/primary-key-generation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/primary-key-generation.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/primary-key-generation.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Primary Key Generation
-
-	
+<!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; 1.2 &raquo; Primary Key Generation</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Depending on the type of persistent objects and the database design, primary key values can be handled in a few different ways. A decision to use one or another technique will affect how the mapping is done. Here is a summary of possible scenarios. Each one is described below in details.</P>
 <DIV class="table-wrap">
@@ -70,3 +117,12 @@ Title: 1.2 &raquo; Primary Key Generatio
 
 <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>Cayenne only supports automatic PK generation for a single column per table.</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/1.2/qualifier-expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/qualifier-expressions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/qualifier-expressions.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Qualifier Expressions
-
-	
+<!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; 1.2 &raquo; Qualifier 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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/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="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>This chapter is dedicated to the use of expressions as qualifiers. A detailed discussion on expressions in general is provided at <A href="expressions.html" title="Expressions">Expressions</A>.</TD></TR></TABLE></DIV>
 
@@ -19,3 +66,12 @@ Title: 1.2 &raquo; Qualifier Expressions
       Adding an expression to an already existing qualifier using logical OR.</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/1.2/queries-stored-in-datamap.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/queries-stored-in-datamap.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/queries-stored-in-datamap.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Queries Stored in DataMap
+<!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; 1.2 &raquo; Queries Stored in DataMap</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>To facilitate reuse of queries users can assign symbolic names to them and store such named queries in a DataMap. Normally this is done by <A href="modeling-queries.html" title="Modeling Queries">creating a query in CayenneModeler</A>. Storing queries in a DataMap reduces the amount of code and speeds up query creation process.</P>
 
@@ -30,3 +77,12 @@ SelectQuery query = prototype.queryWithP
 </SPAN>List objects = context.performQuery(<SPAN class="code-quote">&quot;MySelect&quot;</SPAN>, <SPAN class="code-keyword">false</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/1.2/queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/queries.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Queries
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Queries</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Queries are Cayenne abstraction for communicating with an external data storage. Queries are Java objects that are generally independent from the SQL dialect used by the target database. Cayenne includes a number of standard queries in the <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/package-summary.html" class="external-link" rel="nofollow">org.objectstyle.cayenne.query</A> package. Many of them are only used internally. Here we describe the queries that can be useful in the application.</P>
 
@@ -29,3 +76,12 @@ Title: 1.2 &raquo; Queries
 <P>To extend standard Query functionality, users can create <A href="customizing-queries.html" title="Customizing Queries">Custom Queries</A> that implement <TT>org.objectstyle.cayenne.query.Query</TT> interface.</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/1.2/querychain.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/querychain.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/querychain.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; QueryChain
+<!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; 1.2 &raquo; QueryChain</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P><TT>QueryChain</TT>, as the name implies, is a Query that is itself a collection of other queries. It simplifies an execution of multiple queries in a single batch. E.g.:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
@@ -13,3 +60,12 @@ DataContext context = ...
 context.performNonSelectingQuery(query);
 </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/1.2/quick-start.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/quick-start.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/quick-start.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Quick Start
-
-	
+<!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; 1.2 &raquo; Quick Start</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>This chapter provides a step-by-step tutorial on writing a full database application with Cayenne. When you are done with it, you should have an understanding of the basics of object relational mapping with CayenneModeler and how to use Cayenne in standalone (command line or otherwise) and web applications. The tutorial uses the Eclipse IDE (since it is free and very common) and Derby database (since it supports embedded mode and thus requires zero setup), however it can be easily applied to any other database and/or IDE's.</P>
 
@@ -42,3 +89,12 @@ Title: 1.2 &raquo; Quick Start
 </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/1.2/relationshipquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/relationshipquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/relationshipquery.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; RelationshipQuery
+<!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; 1.2 &raquo; RelationshipQuery</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P><TT>RelationshipQuery</TT> is used by Cayenne internally to fetch object(s) related to a single given object via a mapped ObjRelationship. In some cases the query can be used directly in the application, e.g. if we want to refresh related objects.</P>
 
@@ -9,3 +56,12 @@ Title: 1.2 &raquo; RelationshipQuery
 RelationshipQuery query = <SPAN class="code-keyword">new</SPAN> RelationshipQuery(id, <SPAN class="code-quote">&quot;paintingArray&quot;</SPAN>, <SPAN class="code-keyword">true</SPAN>);
 List paintings = context.performQuery(query);</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/1.2/relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/relationships.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/relationships.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Relationships
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; 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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Relationships are special <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/DataObject.html" class="external-link" rel="nofollow">DataObject</A> properties that reference other &quot;related&quot; objects. Semantically there are two types of relationships - to-one pointing to just a single DataObjects (e.g. Painting.toArtist), and to-many pointing to a collection of DataObjects of the same base type (e.g. Artist.paintingArray).</P>
 
@@ -44,3 +91,12 @@ artist.addToPaintingArray(newPainting);
 </PRE>
 </DIV></DIV>
 <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>While to-many relationships in Cayenne are represented by Lists, they are really ordered Sets, as they are not allowed to contain the same object more than once.</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/1.2/remote-object-persistence-client-deployment.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-client-deployment.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-client-deployment.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Client Deployment
-
-	
+<!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; 1.2 &raquo; Remote Object Persistence Client 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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Any J2SE or J2EE application can act as a CWS Client, so its structure and packaging depends on the type of application. Here is a few general hints related to Cayenne:</P>
 
@@ -43,3 +90,12 @@ Title: 1.2 &raquo; Remote Object Persist
 &lt;/jnlp&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/doc/1.2/remote-object-persistence-coding-client.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-coding-client.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-coding-client.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Coding Client
-
-	
+<!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; 1.2 &raquo; Remote Object Persistence Coding Client</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/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="RemoteObjectPersistenceCodingClient-ConnectingtotheService"></A>Connecting to the Service</H3>
 
@@ -65,3 +112,12 @@ ClientConnection connector = <SPAN class
 DataChannel clientChannel = <SPAN class="code-keyword">new</SPAN> ClientChannel(connector);
 ObjectContext context = <SPAN class="code-keyword">new</SPAN> CayenneContext(clientChannel);</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/1.2/remote-object-persistence-coding-server.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-coding-server.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-coding-server.html Thu Nov  8 17:38:23 2012
@@ -1,5 +1,61 @@
-Title: 1.2 &raquo; Remote Object Persistence Coding Server
+<!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; 1.2 &raquo; Remote Object Persistence Coding Server</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	<P><BR>
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P><BR>
 <BR>
 In the simplest case, there is no custom code on the server. The server would only contain Cayenne mapping files, persistent classes and web.xml descriptor <A href="remote-object-persistence-cws-deployment.html" title="Remote Object Persistence CWS Deployment">specifying deployment parameters</A> of the service. Customization is done via subclassing <TT>org.objectstyle.cayenne.remote.hessian.service.HessianServlet</TT>, and adding business logic to the server-side persistent objects (e.g. in the validation methods).</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/1.2/remote-object-persistence-comparison.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-comparison.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-comparison.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Comparison
+<!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; 1.2 &raquo; Remote Object Persistence Comparison</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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>TBD...</P>
 
@@ -9,3 +56,12 @@ Title: 1.2 &raquo; Remote Object Persist
 	<LI>Web Services</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/1.2/remote-object-persistence-cws-deployment.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-cws-deployment.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-cws-deployment.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence CWS Deployment
-
-	
+<!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; 1.2 &raquo; Remote Object Persistence CWS 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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <H2><A name="RemoteObjectPersistenceCWSDeployment-CWSDeploymentwithHessian"></A>CWS Deployment with Hessian</H2>
 
@@ -108,3 +155,12 @@ Title: 1.2 &raquo; Remote Object Persist
 </DIV></DIV></LI>
 </UL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-features.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-features.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-features.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence 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; 1.2 &raquo; Remote Object Persistence 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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/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="RemoteObjectPersistenceFeatures-FeaturesofRemoteObjectPersistenceTechnology"></A>Features of Remote Object Persistence Technology</H3>
 
@@ -18,3 +65,12 @@ Title: 1.2 &raquo; Remote Object Persist
 	<LI>Delete Rules</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/1.2/remote-object-persistence-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-guide.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-guide.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence 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; 1.2 &raquo; Remote Object Persistence 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="RemoteObjectPersistenceGuide-RemoteObjectPersistenceGuide"></A>Remote Object Persistence 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="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="RemoteObjectPersistenceGuide-RemoteObjectPersistenceGuide"></A>Remote Object Persistence Guide</H2>
 <OL>
 	<LI><A href="remote-object-persistence-introduction.html" title="Remote Object Persistence Introduction">Introduction</A></LI>
 	<LI><A href="remote-object-persistence-features.html" title="Remote Object Persistence Features">Main Features</A></LI>
@@ -19,3 +66,12 @@ Title: 1.2 &raquo; Remote Object Persist
 
 <H3><A name="RemoteObjectPersistenceGuide-Completealphabeticalguideindex"></A>Complete alphabetical guide index</H3>
 <UL><LI><A href="remote-object-persistence-client-deployment.html" title="Remote Object Persistence Client Deployment">Remote Object Persistence Client Deployment</A></LI><LI><A href="remote-object-persistence-coding-client.html" title="Remote Object Persistence Coding Client">Remote Object Persistence Coding Client</A></LI><LI><A href="remote-object-persistence-coding-server.html" title="Remote Object Persistence Coding Server">Remote Object Persistence Coding Server</A></LI><LI><A href="remote-object-persistence-comparison.html" title="Remote Object Persistence Comparison">Remote Object Persistence Comparison</A></LI><LI><A href="remote-object-persistence-cws-deployment.html" title="Remote Object Persistence CWS Deployment">Remote Object Persistence CWS Deployment</A></LI><LI><A href="remote-object-persistence-features.html" title="Remote Object Persistence Features">Remote Object Persistence Features</A></LI><LI><A href="remote-object-persistence-installation.html" title=
 "Remote Object Persistence Installation">Remote Object Persistence Installation</A></LI><LI><A href="remote-object-persistence-introduction.html" title="Remote Object Persistence Introduction">Remote Object Persistence Introduction</A></LI><LI><A href="remote-object-persistence-limitations.html" title="Remote Object Persistence Limitations">Remote Object Persistence Limitations</A></LI><LI><A href="remote-object-persistence-quick-start.html" title="Remote Object Persistence Quick Start">Remote Object Persistence Quick Start</A><UL><LI><A href="remote-object-persistence-tutorial-authentication.html" title="Remote Object Persistence Tutorial Authentication">Remote Object Persistence Tutorial Authentication</A></LI><LI><A href="remote-object-persistence-tutorial-client-code.html" title="Remote Object Persistence Tutorial Client Code">Remote Object Persistence Tutorial Client Code</A></LI><LI><A href="remote-object-persistence-tutorial-client-project.html" title="Remote Object P
 ersistence Tutorial Client Project">Remote Object Persistence Tutorial Client Project</A></LI><LI><A href="remote-object-persistence-tutorial-setup.html" title="Remote Object Persistence Tutorial Setup">Remote Object Persistence Tutorial Setup</A></LI><LI><A href="remote-object-persistence-tutorial-webservice.html" title="Remote Object Persistence Tutorial WebService">Remote Object Persistence Tutorial WebService</A></LI></UL></LI><LI><A href="remote-object-persistence-security.html" title="Remote Object Persistence Security">Remote Object Persistence Security</A></LI></UL>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-installation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-installation.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-installation.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Installation
-
-	
+<!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; 1.2 &raquo; Remote Object Persistence Installation</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc12/documentation.html">1.2.x Documentation</a>
+		<ul>
+			<li><a href="/doc12/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc12/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="RemoteObjectPersistenceInstallation-InstallationandSystemRequirements"></A>Installation and System Requirements</H3>
 
@@ -21,3 +68,12 @@ Title: 1.2 &raquo; Remote Object Persist
 	<LI><A href="http://www.caucho.com/hessian/" class="external-link" rel="nofollow">Hessian Library</A>, version 3.0.13.</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>