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 [6/7] - in /websites/staging/cayenne/trunk/content: ./ doc/1.2/ doc/1.2/grammar/

Modified: websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-introduction.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-introduction.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-introduction.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 » Remote Object Persistence Introduction
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Remote Object Persistence Introduction</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>&quot;Remote Object Persistence&quot; is a low-overhead web services-based technology that provides lightweight object persistence and query functionality to 'remote' applications. In other words it provides familiar Cayenne API to applications that do not have direct access to the database. Instead such applications would access <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAY&title=Cayenne%20Web%20Service" class="createlink">Cayenne Web Service (CWS)</A>. A single abstract data model (expressed as Cayenne XML DataMap) is used on the server and on the client, while execution logic can be partitioned between the tiers.</P>
 
@@ -16,3 +63,12 @@ Title: 1.2 &raquo; Remote Object Persist
 	<LI><B>Remote Tier (aka Client Tier):</B> A Java application that has no direct DB connection and persists its objects by connecting to remote Cayenne Web Service (CWS). Note that CWS Client doesn't have to be a desktop application. It can be another server-side application. The word &quot;client&quot; means a client of Cayenne Web Service.</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-limitations.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-limitations.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-limitations.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Limitations
+<!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 Limitations</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 page can be viewed as a Remote Object Persistence TODO. The following things are pending improvement:</P>
 
@@ -15,3 +62,12 @@ Title: 1.2 &raquo; Remote Object Persist
 	<LI>No support for nested contexts in the remote tier.</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-quick-start.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-quick-start.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-quick-start.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence 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; Remote Object Persistence 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 tutorial is an extension of a <A href="quick-start.html" title="Quick Start">Quick Start</A> Cayenne tutorial, showing how to deploy an existing mapping project as a Cayenne web service, and then write a command-line client to access the service. Note that in most real applications the client will be a Swing or SWT GUI application. We are showing the command line example to avoid dealing with UI details and concentrate on Cayenne API.</P>
 
@@ -18,3 +65,12 @@ Title: 1.2 &raquo; Remote Object Persist
 
 
 
+
+       <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-security.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-security.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-security.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Security
+<!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 Security</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="RemoteObjectPersistenceSecurity-SecuringCayenneWebServiceAccess"></A>Securing Cayenne Web Service Access</H3>
 
@@ -10,3 +57,12 @@ Title: 1.2 &raquo; Remote Object Persist
 	<LI>Subclass <TT>org.objectstyle.cayenne.remote.hessian.service.HessianServlet</TT> for user-defined fine-grained access control.</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-tutorial-authentication.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-authentication.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-authentication.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Tutorial Authentication
-
-	
+<!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 Tutorial Authentication</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>You probably don't want everybody in the world to connect to your service and access (and update!) arbitrary data. The first step in securing Cayenne service is implementing client authentication. The easiest way to do it is to delegate the authentication task to the web container that is running the service. HessianConnection used in the <A href="remote-object-persistence-tutorial-client-code.html" title="Remote Object Persistence Tutorial Client Code">previous chapter</A> supports such authentication on the client side.</P>
 
@@ -145,3 +192,12 @@ Title: 1.2 &raquo; Remote Object Persist
 
 <P>You are done with the tutorial!</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-tutorial-client-code.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-client-code.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-client-code.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Tutorial Client Code
-
-	
+<!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 Tutorial Client Code</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="RemoteObjectPersistenceTutorialClientCode-StartingCommandLineClient"></A>Starting Command Line Client</H3>
 
@@ -137,3 +184,12 @@ INFO: === Message 7: flush-cascade-sync 
 <P><B>Next Step: <A href="remote-object-persistence-tutorial-authentication.html" title="Remote Object Persistence Tutorial Authentication">Remote Object Persistence Tutorial Authentication</A></B></P>
 <HR>
 
+
+       <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-tutorial-client-project.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-client-project.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-client-project.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Tutorial Client Project
-
-	
+<!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 Tutorial Client Project</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="RemoteObjectPersistenceTutorialClientProject-CreateaClientProject"></A>Create a Client Project</H3>
 
@@ -56,3 +103,12 @@ Title: 1.2 &raquo; Remote Object Persist
 <HR>
 <P><B>Next Step: <A href="remote-object-persistence-tutorial-webservice.html" title="Remote Object Persistence Tutorial WebService">Remote Object Persistence Tutorial WebService</A></B></P>
 <HR>
+
+       <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-tutorial-setup.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-setup.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-setup.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Tutorial Setup
-
-	
+<!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 Tutorial Setup</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>The starting point of this tutorial is a web application that was created in the <A href="quick-start.html" title="Quick Start">Quick Start</A> tutorial. If you went through the Quick Start tutorial already ignore these instructions and proceed to the next chapter. If you skipped it and want to start with Remote Object Persistence right away, below is a brief overview of the setup prerequisites. </P>
 
@@ -16,3 +63,12 @@ Title: 1.2 &raquo; Remote Object Persist
 <HR>
 <P><B>Next Step: <A href="remote-object-persistence-tutorial-client-project.html" title="Remote Object Persistence Tutorial Client Project">Remote Object Persistence Tutorial Client Project</A></B></P>
 <HR>
+
+       <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-tutorial-webservice.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-webservice.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-webservice.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Remote Object Persistence Tutorial WebService
-
-	
+<!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 Tutorial WebService</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="RemoteObjectPersistenceTutorialWebService-DeployingaWebService"></A>Deploying a Web Service</H3>
 
@@ -87,3 +134,12 @@ Title: 1.2 &raquo; Remote Object Persist
 <HR>
 <P><B>Next Step: <A href="remote-object-persistence-tutorial-client-code.html" title="Remote Object Persistence Tutorial Client Code">Remote Object Persistence Tutorial Client Code</A></B></P>
 <HR>
+
+       <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/reverse-engineer-database.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/reverse-engineer-database.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/reverse-engineer-database.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Reverse Engineer Database
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Reverse Engineer Database</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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="ReverseEngineerDatabase-ReverseEngineerDatabase"></A>Reverse Engineer Database</H3>
 
@@ -18,3 +65,12 @@ Title: 1.2 &raquo; Reverse Engineer Data
 <P>After desired options are selected, click &quot;Continue&quot;. Progress dialog will open. It will close automatically when reverse-engineering is done. After that all database tables and stored procedures that matched selected criteria will be added to the DataMap. Default ObjEntity mapping will be created as well.</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="reverse-engineer-database.data/reengineer-schema.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/running-cayennemodeler.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/running-cayennemodeler.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/running-cayennemodeler.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Running CayenneModeler
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Running CayenneModeler</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>Follow the instructions below appropriate for the type of OS and Cayenne distribution that you have:</P>
 
@@ -46,3 +93,12 @@ java -jar cayenne-modeler.jar</PRE>
 <DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
 <PRE>$CAYENNE_HOME/bin/modeler.sh</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/running-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/running-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/running-queries.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Running 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; Running 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>Cayenne Query API is discussed in the following chapters. This chapter concentrates on how to execute an existing query via a DataContext. Still we'd like to point to a few aspects of the query API here, as they are important for the query execution discussion:</P>
 
@@ -68,3 +115,12 @@ Runs a named non-selecting query stored 
 Runs a named non-selecting query stored in the DataMap, using a map of named parameters.</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/runtime-components.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/runtime-components.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/runtime-components.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Runtime Components
-
-	
+<!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; Runtime Components</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>Cayenne runtime framework is an intermediary between a Java application and a relational database. The picture below shows the main components of the framework:</P>
 
@@ -30,3 +77,12 @@ Title: 1.2 &raquo; Runtime Components
 
 
 
+
+       <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/scripting-sqltemplate.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/scripting-sqltemplate.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/scripting-sqltemplate.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Scripting SQLTemplate
-
-	
+<!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; Scripting SQLTemplate</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>SQLTemplate's internal SQL string is a dynamic script that is processed at runtime to generate PreparedStatement SQL code. Dynamic nature of SQLTemplate makes possible a few important things - it allows to bind parameters on the fly; it provides a way to pass extra information to Cayenne that is not included in the SQL text; it supports including/excluding chunks of SQL depending on runtime parameters.</P>
 
@@ -186,3 +233,12 @@ SQLTemplate select = <SPAN class="code-k
 <H3><A name="ScriptingSQLTemplate-BindingObjectIdValues."></A>Binding ObjectId Values.</H3>
 
 <P>TO BE DONE</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/selecting-objects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/selecting-objects.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/selecting-objects.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Selecting Objects
-
-	
+<!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; Selecting Objects</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>If a stored procedure is known to return at least one result set, procedure queries can be executed just like normal select queries. Of course in addtion to returning data, such procedures can perform any other database operations.</P>
 
@@ -33,3 +80,12 @@ query.addParam(<SPAN class="code-quote">
 }
 </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/selectquery-customization.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/selectquery-customization.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/selectquery-customization.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; SelectQuery Customization
+<!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; SelectQuery Customization</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 href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SelectQuery.html" class="external-link" rel="nofollow">SelectQueries</A> allow to fine tune the behavior of the fetch using the following API:</P>
 <UL>
@@ -18,3 +65,12 @@ Title: 1.2 &raquo; SelectQuery Customiza
  If set to a value greater than zero, tells Cayenne that query should do a &quot;lazy&quot; fetch, breaking result into &quot;pages&quot;. <A href="performance-tuning.html" title="Performance Tuning">Performance Tuning</A> has a detailed discussion of paged queries.</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/selectquery.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/selectquery.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/selectquery.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; SelectQuery
-
-	
+<!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; SelectQuery</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>The most commonly used query is <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/SelectQuery.html" class="external-link" rel="nofollow">SelectQuery</A>. It is a descriptor that allows DataContext to fetch lists of DataObjects of the right type matching the specified criteria. SelectQuery together with the DataMap provides just enough information to the Cayenne runtime objects to build the right SQL SELECT statement and control various execution parameters.</P>
 
@@ -68,3 +115,12 @@ DataContext ctxt; <SPAN class="code-comm
 </PRE>
 </DIV></DIV>
 <P>There is a special case when a query is run using <TT>DataContext.performIteratedQuery()</TT>. This is discussed in &quot;Performance Tuning&quot; chapter.</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/setting-datamap-defaults.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/setting-datamap-defaults.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/setting-datamap-defaults.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Setting DataMap Defaults
-
-	
+<!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; Setting DataMap Defaults</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="SettingDataMapDefaults-SettingDataMapDefaults"></A>Setting DataMap Defaults</H3>
 
@@ -30,3 +77,12 @@ Title: 1.2 &raquo; Setting DataMap Defau
 <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>Defaults are ignored in runtime</B><BR>Note that none of the defaults affect entities runtime behavior. For example if a DbEntity &quot;ARTIST&quot; has empty schema, and a DataMap defines a default schema to be &quot;SCHEMA1&quot;, Cayenne will assume that ARTIST entity does not use schema.</TD></TR></TABLE></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/sqltemplate-query.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/sqltemplate-query.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/sqltemplate-query.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; SQLTemplate Query
-
-	
+<!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; SQLTemplate Query</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>Not all features of SQL can (or should) be mapped in the object model in terms of DataObjects. For such cases Cayenne provides a powerful mechanism for running both selecting and non-selecting SQL using scriptable SQLTemplate query. This chapter describes how simple SQLTemplates can be created and executed with DataContext to select or update the database data. Subsequent chapters show how to build SQL dynamically, bind parameters and describe result sets using SQLTemplate scripting features.</P>
 
 <H3><A name="SQLTemplateQuery-CreatingSQLTemplate"></A>Creating SQLTemplate</H3>
@@ -65,3 +112,12 @@ List artists = dataContext.performQuery(
 query.setTemplate(PostgresAdapter.class.getName(), pgTemplate);
 </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/standalone-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/standalone-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/standalone-applications.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Standalone Applications
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Standalone Applications</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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="StandaloneApplications-SharedConfigurationSingleton"></A>Shared Configuration Singleton</H3>
 
@@ -37,3 +84,12 @@ DataContext context = DataContext.create
 DataContext.bindThreadDataContext(context);
 </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/stored-procedures-and-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/stored-procedures-and-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/stored-procedures-and-transactions.html Thu Nov  8 17:38:23 2012
@@ -1,5 +1,61 @@
-Title: 1.2 &raquo; Stored Procedures and Transactions
+<!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; Stored Procedures and Transactions</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>
 There maybe a situations when stored procedures handle their own transactions and an application is configured to use Cayenne-managed transactions. This is obviously conflicting and undesirable behavior. In this case ProcedureQueries should be executed explicitly wrapped in an &quot;external&quot; Transaction. This is one of the few cases when a user should worry about transactions at all. Read more about manual transactions <A href="understanding-transactions.html" title="Understanding Transactions">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/1.2/stored-procedures.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/stored-procedures.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/stored-procedures.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,62 @@
-Title: 1.2 &raquo; Stored Procedures
+<!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; Stored Procedures</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>In addition to mapping database tables and views as entities, Cayenne allows mapping and executing database stored procedures. Just like table structure is described by DbEntities, stored procedures are described by Procedure class. Stored procedures are created using CayenneModeler, and are executed using <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/ProcedureQuery.html" class="external-link" rel="nofollow">ProcedureQuery</A>, as described in the following chapters.</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/swing-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/swing-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/swing-applications.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Swing Applications
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Swing Applications</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>Those who have experience of Swing GUI development knows how much time it takes to work out all the minutest details of formatting, in-place input validation, handling the interactive data modification, enforcing naming, order, and formatting consistensy, etc. Whenever the domain or requirements change (e.g. new attributes are added to an ObjEntity, formats or captions of data are modified, or relationships change their meaning) developers are faced with the necessity to go through the number of Swing data models, panels, various helpers fishing out the bits of code to be corrected.</P>
 
@@ -10,3 +57,12 @@ Title: 1.2 &raquo; Swing Applications
 <SPAN class="image-wrap" style=""><IMG src="swing-applications.data/dataview-usecases.gif" style="border: 0px solid black"></SPAN></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><B>Validation</B><BR>The validation rules mentioned in the Use Cases are meant to be &quot;lightweght&quot;, i.e. it is generally agreed the validation related code to enforce the business rules should be located in the domain area but, still, there are various checks one could prefer to perform right in the presentation layer like inclusion in a predefined range of values, correct input format, sometimes, even preliminary credit card number validity check with the well known Luhn algorithm, the other kinds of sanity checks. Presently the validation is on the list of the features to be added.</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/system-requirements.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/system-requirements.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/system-requirements.html Thu Nov  8 17:38:23 2012
@@ -1,5 +1,53 @@
-Title: 1.2 &raquo; System Requirements</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<!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; System Requirements</TITLE></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">
+       <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. We are working on JPA support">
 <META name="robots" content="index,follow">
 <LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
@@ -64,4 +112,12 @@ Title: 1.2 &raquo; System Requirements</
 			<LI><A href="http://issues.apache.org/cayenne/">Bug/Feature Tracker</A></LI>
 			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
             <LI><A href="http://cwiki.apache.org/CAY/">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-reposi
\ No newline at end of file
+			<LI><A href="http://cayenne.apache.org/code-reposi
+       <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/to-dep-pk-checkbox.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/to-dep-pk-checkbox.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/to-dep-pk-checkbox.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; To Dep PK Checkbox
+<!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; To Dep PK Checkbox</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="ToDepPKCheckbox-%22ToDepPK%22Checkbox"></A>&quot;To Dep PK&quot; Checkbox</H3>
 
@@ -12,3 +59,12 @@ Title: 1.2 &raquo; To Dep PK Checkbox
 
 
 <P>Normally one side of the relationship is considered &quot;master&quot; and another one - &quot;dependent&quot;, meaning that &quot;dependent&quot; part can not exist without a corresponding &quot;master&quot; record, while &quot;master&quot; record can exist without any dependents. This fact is reflected in Cayenne mapping. DbEntity &quot;Relationships&quot; panel contains &quot;To Dep PK&quot; column. The checkboxes in this column are disabled, unless the relationship only consists of the PK attributes. If this is the case, you must select the relationship going in the direction from &quot;master&quot; to &quot;dependent&quot; and check the &quot;To Dep PK&quot; checkbox on this relationship. Otherwise Cayenne will not be able to handle such relationship properly.</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>