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

Author: buildbot
Date: Thu Nov  8 17:38:23 2012
New Revision: 837679

Log:
Staging update by buildbot for cayenne

Modified:
    websites/staging/cayenne/trunk/content/   (props changed)
    websites/staging/cayenne/trunk/content/doc/1.2/accessing-pk-and-fk-values.html
    websites/staging/cayenne/trunk/content/doc/1.2/acknowledgments.html
    websites/staging/cayenne/trunk/content/doc/1.2/ant-tasks.html
    websites/staging/cayenne/trunk/content/doc/1.2/building-expressions.html
    websites/staging/cayenne/trunk/content/doc/1.2/caching-lookup-tables.html
    websites/staging/cayenne/trunk/content/doc/1.2/caching-query-results.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-contract.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-datamaps.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-project-structure.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-projects.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayenne-user-directory.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayennemodeler-and-eclipse.html
    websites/staging/cayenne/trunk/content/doc/1.2/cayennemodeler-flattened-relationships.html
    websites/staging/cayenne/trunk/content/doc/1.2/cdataport.html
    websites/staging/cayenne/trunk/content/doc/1.2/cdbgen.html
    websites/staging/cayenne/trunk/content/doc/1.2/cdeploy.html
    websites/staging/cayenne/trunk/content/doc/1.2/cgen.html
    websites/staging/cayenne/trunk/content/doc/1.2/classpath.html
    websites/staging/cayenne/trunk/content/doc/1.2/common-modeling-tasks.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-caching-behavior.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-deployment-settings.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-logging.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-object-validation.html
    websites/staging/cayenne/trunk/content/doc/1.2/configuring-transactional-behavior.html
    websites/staging/cayenne/trunk/content/doc/1.2/converting-an-existing-business-framework.html
    websites/staging/cayenne/trunk/content/doc/1.2/create-datanode.html
    websites/staging/cayenne/trunk/content/doc/1.2/create-new-project.html
    websites/staging/cayenne/trunk/content/doc/1.2/customizing-configuration.html
    websites/staging/cayenne/trunk/content/doc/1.2/customizing-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/customizing.html
    websites/staging/cayenne/trunk/content/doc/1.2/data-rows.html
    websites/staging/cayenne/trunk/content/doc/1.2/datachannel.html
    websites/staging/cayenne/trunk/content/doc/1.2/datacontext.html
    websites/staging/cayenne/trunk/content/doc/1.2/datacontextdelegate.html
    websites/staging/cayenne/trunk/content/doc/1.2/datacontextfactory.html
    websites/staging/cayenne/trunk/content/doc/1.2/datanode.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobject-state-management.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobject-validation.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobjects-example.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobjects.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataobjectutils.html
    websites/staging/cayenne/trunk/content/doc/1.2/datasource.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataview-concepts.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataviews-in-action.html
    websites/staging/cayenne/trunk/content/doc/1.2/dataviews.html
    websites/staging/cayenne/trunk/content/doc/1.2/dbadapter.html
    websites/staging/cayenne/trunk/content/doc/1.2/delete-rules.html
    websites/staging/cayenne/trunk/content/doc/1.2/deleting-objects.html
    websites/staging/cayenne/trunk/content/doc/1.2/deployment-with-ant.html
    websites/staging/cayenne/trunk/content/doc/1.2/deployment.html
    websites/staging/cayenne/trunk/content/doc/1.2/design.html
    websites/staging/cayenne/trunk/content/doc/1.2/documentation.html
    websites/staging/cayenne/trunk/content/doc/1.2/dvmodeler-gui-tool.html
    websites/staging/cayenne/trunk/content/doc/1.2/entityresolver.html
    websites/staging/cayenne/trunk/content/doc/1.2/event-package.html
    websites/staging/cayenne/trunk/content/doc/1.2/executing-a-stored-procedure.html
    websites/staging/cayenne/trunk/content/doc/1.2/expression-factory-utilities.html
    websites/staging/cayenne/trunk/content/doc/1.2/expressions.html
    websites/staging/cayenne/trunk/content/doc/1.2/extended-types.html
    websites/staging/cayenne/trunk/content/doc/1.2/flattened-relationships.html
    websites/staging/cayenne/trunk/content/doc/1.2/general-navigation.html
    websites/staging/cayenne/trunk/content/doc/1.2/general-preferences.html
    websites/staging/cayenne/trunk/content/doc/1.2/generate-database-schema.html
    websites/staging/cayenne/trunk/content/doc/1.2/generate-java-classes.html
    websites/staging/cayenne/trunk/content/doc/1.2/generate-primary-key-support.html
    websites/staging/cayenne/trunk/content/doc/1.2/generated-columns.html
    websites/staging/cayenne/trunk/content/doc/1.2/generic-persistent-class.html
    websites/staging/cayenne/trunk/content/doc/1.2/grammar/ExpressionParser.html
    websites/staging/cayenne/trunk/content/doc/1.2/guide-to-11-features.html
    websites/staging/cayenne/trunk/content/doc/1.2/guide-to-12-features.html
    websites/staging/cayenne/trunk/content/doc/1.2/handling-inheritance.html
    websites/staging/cayenne/trunk/content/doc/1.2/in-memory-evaluation.html
    websites/staging/cayenne/trunk/content/doc/1.2/index.html
    websites/staging/cayenne/trunk/content/doc/1.2/installation.html
    websites/staging/cayenne/trunk/content/doc/1.2/introduction-to-cayennemodeler.html
    websites/staging/cayenne/trunk/content/doc/1.2/introduction.html
    websites/staging/cayenne/trunk/content/doc/1.2/iterating-through-data-rows.html
    websites/staging/cayenne/trunk/content/doc/1.2/jar-files-and-dependencies.html
    websites/staging/cayenne/trunk/content/doc/1.2/java-interface-to-an-existing-database.html
    websites/staging/cayenne/trunk/content/doc/1.2/license.html
    websites/staging/cayenne/trunk/content/doc/1.2/local-datasources.html
    websites/staging/cayenne/trunk/content/doc/1.2/many-to-many-relationships.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeler-guide.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-database-layer.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-inheritance.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-object-layer.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-objentities.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-remote-persistence.html
    websites/staging/cayenne/trunk/content/doc/1.2/modeling-tips.html
    websites/staging/cayenne/trunk/content/doc/1.2/moving-objects-between-contexts.html
    websites/staging/cayenne/trunk/content/doc/1.2/namedquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/nested-datacontexts.html
    websites/staging/cayenne/trunk/content/doc/1.2/new-system.html
    websites/staging/cayenne/trunk/content/doc/1.2/null-handling.html
    websites/staging/cayenne/trunk/content/doc/1.2/object-caching.html
    websites/staging/cayenne/trunk/content/doc/1.2/objectcontext.html
    websites/staging/cayenne/trunk/content/doc/1.2/objectidquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/obtaining-datacontext.html
    websites/staging/cayenne/trunk/content/doc/1.2/orm-case-study.html
    websites/staging/cayenne/trunk/content/doc/1.2/paginated-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/parameterized-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/path-expressions.html
    websites/staging/cayenne/trunk/content/doc/1.2/performance-tuning.html
    websites/staging/cayenne/trunk/content/doc/1.2/persistent-object-lifecycle.html
    websites/staging/cayenne/trunk/content/doc/1.2/preferences-panel.html
    websites/staging/cayenne/trunk/content/doc/1.2/prefetching.html
    websites/staging/cayenne/trunk/content/doc/1.2/primary-key-generation.html
    websites/staging/cayenne/trunk/content/doc/1.2/qualifier-expressions.html
    websites/staging/cayenne/trunk/content/doc/1.2/queries-stored-in-datamap.html
    websites/staging/cayenne/trunk/content/doc/1.2/queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/querychain.html
    websites/staging/cayenne/trunk/content/doc/1.2/quick-start.html
    websites/staging/cayenne/trunk/content/doc/1.2/relationshipquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/relationships.html
    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-coding-client.html
    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-comparison.html
    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-features.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-guide.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-installation.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-introduction.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-limitations.html
    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-security.html
    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-client-code.html
    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-setup.html
    websites/staging/cayenne/trunk/content/doc/1.2/remote-object-persistence-tutorial-webservice.html
    websites/staging/cayenne/trunk/content/doc/1.2/reverse-engineer-database.html
    websites/staging/cayenne/trunk/content/doc/1.2/running-cayennemodeler.html
    websites/staging/cayenne/trunk/content/doc/1.2/running-queries.html
    websites/staging/cayenne/trunk/content/doc/1.2/runtime-components.html
    websites/staging/cayenne/trunk/content/doc/1.2/scripting-sqltemplate.html
    websites/staging/cayenne/trunk/content/doc/1.2/selecting-objects.html
    websites/staging/cayenne/trunk/content/doc/1.2/selectquery-customization.html
    websites/staging/cayenne/trunk/content/doc/1.2/selectquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/setting-datamap-defaults.html
    websites/staging/cayenne/trunk/content/doc/1.2/sqltemplate-query.html
    websites/staging/cayenne/trunk/content/doc/1.2/standalone-applications.html
    websites/staging/cayenne/trunk/content/doc/1.2/stored-procedures-and-transactions.html
    websites/staging/cayenne/trunk/content/doc/1.2/stored-procedures.html
    websites/staging/cayenne/trunk/content/doc/1.2/swing-applications.html
    websites/staging/cayenne/trunk/content/doc/1.2/system-requirements.html
    websites/staging/cayenne/trunk/content/doc/1.2/to-dep-pk-checkbox.html
    websites/staging/cayenne/trunk/content/doc/1.2/turning-off-context-synchronization.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-datacontext.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-dataobjects.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-delete.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-generate-database-and-java-classes.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-mapping-query.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-object-relational-mapping.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-selectquery.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-setup.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-starting-mapping-project.html
    websites/staging/cayenne/trunk/content/doc/1.2/tutorial-webapp.html
    websites/staging/cayenne/trunk/content/doc/1.2/understanding-transactions.html
    websites/staging/cayenne/trunk/content/doc/1.2/upgrade.html
    websites/staging/cayenne/trunk/content/doc/1.2/user-guide.html
    websites/staging/cayenne/trunk/content/doc/1.2/using-jndi.html
    websites/staging/cayenne/trunk/content/doc/1.2/using-orderings.html
    websites/staging/cayenne/trunk/content/doc/1.2/web-applications.html

Propchange: websites/staging/cayenne/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Nov  8 17:38:23 2012
@@ -1 +1 @@
-1407177
+1407179

Modified: websites/staging/cayenne/trunk/content/doc/1.2/accessing-pk-and-fk-values.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/accessing-pk-and-fk-values.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/accessing-pk-and-fk-values.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 » Accessing PK and FK values
-
-	
+<!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; Accessing PK and FK values</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>Normally it is not advisable to map primary and foreign key columns (PK and FK) as Java class properties (ObjAttributes). When reverse engineering of the database is done using CayenneModeler, produced mapping will reflect that - PKs and FKs will not be included in the Java class. However sometimes an application requires access to these values.</P>
 
@@ -79,3 +126,12 @@ Title: 1.2 &raquo; Accessing PK and FK v
 }
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/acknowledgments.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/acknowledgments.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/acknowledgments.html Thu Nov  8 17:38:23 2012
@@ -1,5 +1,61 @@
-Title: 1.2 &raquo; Acknowledgments
+<!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; Acknowledgments</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>
 We would like to thank our dedicated team of <A href="http://objectstyle.org/cayenne/contributors.html" class="external-link" rel="nofollow">contributors</A> - for making this project possible, early adopters - for taking all the pain to help us make a usable product, other users - for providing feedback, comments, patches and bug reports.</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/ant-tasks.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/ant-tasks.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/ant-tasks.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Ant Tasks
-
-	
+<!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; Ant Tasks</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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 ships with Ant tasks that provide Ant frontend to a number of useful operations in Cayenne. The following tasks are included:</P>
 
@@ -25,3 +72,12 @@ Title: 1.2 &raquo; Ant Tasks
 <P>When using the Antlib construct, omit the <TT>&lt;taskdef&gt;</TT> elements shown in the examples of each task, as the antlib.xml file defines all of the Cayenne Ant tasks. </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/building-expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/building-expressions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/building-expressions.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Building 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; Building Expressions</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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 Expression class (<TT>org.objectstyle.cayenne.exp.Expression</TT>) provides <TT>Expression.fromString(String)</TT> as a convenience method to create expressions of arbitrary complexity.  The structure of expressions is fairly intuitive, with the <A href="http://www.objectstyle.org/cayenne/1_2/grammar/ExpressionParser.html" class="external-link" rel="nofollow">formal grammar</A> showing the formal syntax and operators currently supported, but this topic is devoted to showing examples of usage.  To demonstrate, an expression that matches Paintings with names that start with &quot;A&quot; and a price less than $1000.00 can be written as:</P>
 
@@ -159,3 +206,12 @@ values = dataContext.performQuery(query)
 </DIV></DIV>
 
 <P>Even though the specified expression has two named parameters, the &quot;gallery&quot; key has been omitted.  Cayenne will automatically translate the expression into <TT>&quot;artist.artistName = $artist&quot;</TT> (which becomes <TT>&quot;artist.artistName = 'Salvador Dali'&quot;</TT>).  This feature allows a restrictive search qualifier to be written and prompt the user for search criteria.  If the user leaves values out, the expression can automatically widen to be a less restrictive search by omitting the keys for the map.</P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/caching-lookup-tables.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/caching-lookup-tables.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/caching-lookup-tables.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Caching Lookup Tables
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Caching Lookup Tables</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>Query result caching feature can be used to implement caching of lookup tables. &quot;Lookup&quot; or &quot;configuration&quot; tables can be loosely defined as small tables that change rarely and mostly used in read-only fashion. Examples of such tables are COUNTRY, USER_TYPE, AREA_CODE, etc. Often data from such tables is displayed in a combo box or dropdown.</P>
 
@@ -11,3 +58,12 @@ Title: 1.2 &raquo; Caching Lookup Tables
 	<LI>Whenever a list of countries is needed, use a local DataContext to get it from cache - <TT>context.performQuery(&quot;AllCountries&quot;, false)</TT>.</LI>
 </UL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/caching-query-results.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/caching-query-results.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/caching-query-results.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Caching Query Results
-
-	
+<!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; Caching Query Results</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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 provides a way to cache query results, avoiding unneeded database trips for the frequently used queries. Caching policy is configured per query. Policy can be set via the API or in CayenneModeler.</P>
 
@@ -126,3 +173,12 @@ List objects2 = context.performQuery(<SP
 </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/cayenne-contract.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cayenne-contract.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cayenne-contract.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Cayenne Contract
-
-	
+<!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; Cayenne Contract</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>There is an implied contract between persistent objects and Cayenne runtime. Cayenne expects persistent objects to follow certain conventions, while itself providing management of the various aspects of a persistent object graph.</P>
 
 <H2><A name="CayenneContract-PersistentObjectRequirements"></A>Persistent Object Requirements</H2>
@@ -99,3 +146,12 @@ assertFalse(b1.getListOfA().contains(a1)
 <H3><A name="CayenneContract-LazyObjectResolution"></A>Lazy Object Resolution</H3>
 
 <P>One of the object states is HOLLOW, corresponding to unresolved objects that only have their PK known. Most often HOLLOW objects are returned from to-one relationships. Whenever such object is &quot;touched&quot; by the user (i.e. a  setter or a getter is invoked), Cayenne automatically infaltes it with the database values.</P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/cayenne-datamaps.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cayenne-datamaps.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cayenne-datamaps.html Thu Nov  8 17:38:23 2012
@@ -1,7 +1,63 @@
-Title: 1.2 &raquo; Cayenne DataMaps
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; Cayenne DataMaps</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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 BE DONE</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="cayenne-datamaps.data/entities.gif" style="border: 0px solid black"></SPAN></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/cayenne-project-structure.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cayenne-project-structure.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cayenne-project-structure.html Thu Nov  8 17:38:23 2012
@@ -1,7 +1,63 @@
-Title: 1.2 &raquo; Cayenne Project Structure
+<!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; Cayenne Project Structure</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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 what Cayenne projects are and how different parts of projects are organized.</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/cayenne-projects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cayenne-projects.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cayenne-projects.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Cayenne Projects
-
-	
+<!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; Cayenne Projects</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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="CayenneProjects-CayenneProjects"></A>Cayenne Projects</H3>
 
@@ -24,3 +71,12 @@ Title: 1.2 &raquo; Cayenne Projects
 	<LI><B>DataSource file</B>: In a standalone Java application, Java code has no access to DataSource objects that are normally provided by deployment containers. Cayenne framework still needs a DataSource to connect to the database. Therefore Cayenne has a set of wrapper classes located in <A href="http://www.objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/conn/package-summary.html" class="external-link" rel="nofollow">org.objectstyle.cayenne.conn</A> package, to create DataSource objects based on regular JDBC drivers. DataSource file provides needed information about database URL, JDBC driver, login, password and connection pooling parameters of a single DataSource. <EM>Note: such configuration file can be present in development so that CayenneModeler tool could obtain a database connection, even if an application wouldn't use it in deployment and instead would use a DataSource provided by the container</EM>. DTD for the DataSource file can be found <A href="htt
 p://www.objectstyle.org/cayenne/dtd/driver.dtd" class="external-link" rel="nofollow">here</A>.</LI>
 </UL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/cayenne-user-directory.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cayenne-user-directory.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cayenne-user-directory.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Cayenne User Directory
-
-	
+<!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; Cayenne User Directory</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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="CayenneUserDirectory-CayenneUserDirectory"></A>Cayenne User Directory</H3>
 
@@ -23,3 +70,12 @@ Title: 1.2 &raquo; Cayenne User Director
 <TT>cayenne-log.properties</TT>: Log4J configuration file for the Modeler.<BR>
 <TT>modeler.log</TT>: CayenneModeler log file.<BR>
 <TT>modeler.classpath</TT>: (unused) an old CLASSPATH configuration file that is now migrated to the preferences 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/cayennemodeler-and-eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cayennemodeler-and-eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cayennemodeler-and-eclipse.html Thu Nov  8 17:38:23 2012
@@ -1,7 +1,63 @@
-Title: 1.2 &raquo; CayenneModeler and Eclipse
+<!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; CayenneModeler and Eclipse</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 you use <A href="http://www.eclipse.org/" class="external-link" rel="nofollow">Eclipse IDE</A> for your Java development, it can be configured to launch CayenneModeler when clicking on &quot;cayenne.xml&quot; file in the project tree. Here is the instructions for Windows, other platforms should work in a similar fashion. </P>
 
 <P>In Eclipse Properties panel go to &quot;Workbench -&gt; File Associations&quot;. Add an association for &quot;cayenne.xml&quot; to open with &quot;external editor&quot;. Select &quot;modeler.bat&quot; file as an external editor. Caveat - CAYENNE_HOME variable must be either defined in the environment, or you may need to edit modeler.bat and set it right there, otherwise modeler will not start. </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/cayennemodeler-flattened-relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cayennemodeler-flattened-relationships.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cayennemodeler-flattened-relationships.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; CayenneModeler Flattened 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; CayenneModeler Flattened Relationships</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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="CayenneModelerFlattenedRelationships-FlattenedRelationships"></A>Flattened Relationships</H3>
 
@@ -16,3 +63,12 @@ Title: 1.2 &raquo; CayenneModeler Flatte
 
 <P>The dialog contains a DbRelationship table. Clicking on each row in this table will show valid choices of DbRelationships. Once you add a &quot;chain&quot; component, another row automatically opens below, so you can build a chain of arbitrary length.</P>
 <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>Join Table Tip</B><BR>If you flatten across a join table and this join table was mapped to an ObjEntity (and a correspoding Java class), such ObjEntity can be deleted, as it is no longer needed. Underlying DbEntity must be preserved.</TD></TR></TABLE></DIV>
+
+       <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/cdataport.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cdataport.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cdataport.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; cdataport
-
-	
+<!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; cdataport</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>Sometimes it is necessary to recreate a database, copying data from another existing database. For instance, recreating development database instance from production data, etc. While most RDBMS provide data import/export tools, they normally require advanced DBA skills to use and are most often not portable across database engines. Cayenne will provide a lightweight ant task to do data porting between the databases with identical schema, using DataMap information.</P>
 
@@ -63,3 +110,12 @@ Title: 1.2 &raquo; cdataport
 <SPAN class="code-tag">&lt;cdataport projectFile=<SPAN class="code-quote">&quot;subdir/cayenne.xml&quot;</SPAN> srcNode=<SPAN class="code-quote">&quot;ProductionNode&quot;</SPAN> destNode=<SPAN class="code-quote">&quot;DevNode&quot;</SPAN> excludeTables=<SPAN class="code-quote">&quot;BILL_*&quot;</SPAN>/&gt;</SPAN>
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/cdbgen.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cdbgen.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cdbgen.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; cdbgen
-
-	
+<!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; cdbgen</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>cdbgen</TT> is an Ant task that uses Cayenne DataMap to drop and/or generate schema objects of a specified database.</P>
 
@@ -88,3 +135,12 @@ Title: 1.2 &raquo; cdbgen
     username=<SPAN class="code-quote">&quot;sa&quot;</SPAN>/&gt;
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/cdeploy.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cdeploy.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cdeploy.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; cdeploy
-
-	
+<!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; cdeploy</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>cdeploy</TT> is an Ant task that configures Cayenne connection information in existing jar files that contain Cayenne project information. It is useful for the automation of deployment of Cayenne-based frameworks in different environments.</P>
 
@@ -93,3 +140,12 @@ Nested node Parameters:</P>
 <SPAN class="code-tag">&lt;cdeploy src=<SPAN class="code-quote">&quot;business.jar&quot;</SPAN> altProjectFile=<SPAN class="code-quote">&quot;my-cayenne.xml&quot;</SPAN>/&gt;</SPAN>
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/cgen.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/cgen.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/cgen.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; cgen
-
-	
+<!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; cgen</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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>cgen</TT> is an Ant task that generates and maintains DataObjects source files based on Cayenne DataMap. If &quot;makepairs&quot; is set to &quot;true&quot; (default), this task will generate a pair of classes (superclass/subclass) for each ObjEntity in the DataMap. Superclasses should not be changed manually, since they are always overwritten. Subclasses are never overwritten and may be later customized by the user. If &quot;makepairs&quot; is set to &quot;false&quot;, a single class will be generated for each ObjEntity.</P>
 
@@ -193,3 +240,12 @@ Title: 1.2 &raquo; cgen
 <SPAN class="code-tag">&lt;/cgen&gt;</SPAN>
 </PRE>
 </DIV></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/classpath.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/classpath.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/classpath.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; ClassPath
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 1.2 &raquo; ClassPath</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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="ClassPath-ClassPath"></A>ClassPath</H3>
 
@@ -9,3 +56,12 @@ Title: 1.2 &raquo; ClassPath
 <DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Modeler ClassNotFound Errors</B><BR>If you encounter any CLASSPATH-related errors during DB reverse engineering, DataSource configuration, etc., in most cases you simply need to go to Preferences ClassPath panel and add an entry pointing to a missing external library.</TD></TR></TABLE></DIV>
 
 <P><SPAN class="image-wrap" style=""><IMG src="classpath.data/prefs-classpath.jpg" style="border: 0px solid black"></SPAN></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/1.2/common-modeling-tasks.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/common-modeling-tasks.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/common-modeling-tasks.html Thu Nov  8 17:38:23 2012
@@ -1,7 +1,63 @@
-Title: 1.2 &raquo; Common Modeling Tasks
+<!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; Common Modeling Tasks</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/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 describes a number of very common operations performed in CayenneModeler. All tasks assume that the Modeler has been started successfully, and, in most cases, that there is an open project.</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/configuring-caching-behavior.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/configuring-caching-behavior.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/configuring-caching-behavior.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Configuring Caching Behavior
-
-	
+<!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; Configuring Caching Behavior</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 supports local and distributed caching of fetched data. The design of the caching feature is discussed in the User Guide. When a new DataDomain is created, it uses default caching settings - data is cached within JVM, but no remote synchronization is performed. User can change these settings depending on the target application deployment strategy.</P>
 
@@ -31,3 +78,12 @@ Title: 1.2 &raquo; Configuring Caching B
 <P>JavaGroups is the most portable and flexible mechanism. At the minimum, JMS setup requires a JMS server running, and subjects for each of the DataDomains to be configured. JavaGroups is peer-to-peer library that is embedded into applications. Default configuration provided by CayenneModeler will work out of the box, provided that IP multicast is enabled on the network. </P>
 
 <P>The conclusion is that using JMS is probably most appropriate when deploying within J2EE containers that alreay support this service, while JavaGroups can be used in almost any environment.</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/configuring-deployment-settings.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/configuring-deployment-settings.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/configuring-deployment-settings.html Thu Nov  8 17:38:23 2012
@@ -1,9 +1,65 @@
-Title: 1.2 &raquo; Configuring Deployment Settings
+<!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; Configuring Deployment Settings</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 project deployment settings, aside from <A href="create-datanode.html" title="Create DataNode">DataNode</A> configuration discussed elsewhere, are done using DataDomain panel. This chapter describes various supported settings.</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="configuring-deployment-settings.data/data-domain.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/configuring-logging.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/1.2/configuring-logging.html (original)
+++ websites/staging/cayenne/trunk/content/doc/1.2/configuring-logging.html Thu Nov  8 17:38:23 2012
@@ -1,6 +1,53 @@
-Title: 1.2 &raquo; Configuring Logging
-
-	
+<!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; Configuring Logging</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 logging is based on Log4J package from Jakarta Apache Project. This is the most powerful and flexible logging framework available in Java. Log4J configuration is normally done using a property file. Later in this chapter we explain how Cayenne loads configuration files and how to customize this process. Format of the entries in this file is described in the Log4j documentation. Here is a sample configuration file contents:</P>
 
 <DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
@@ -65,3 +112,12 @@ log4j.logger.org.objectstyle.cayenne.uti
 <H3><A name="ConfiguringLogging-ConfiguringLog4JoutsideofCayenne"></A>Configuring Log4J outside of Cayenne</H3>
 
 <P>Finally, if your application already uses Log4J and implements its own logic to configure logging, it would be undesirable for Cayenne to use its default behavior and override any application settings. Also it is convenient to use a single logging configuration file per application. Cayenne detects if Log4J has already been started and will stop any attempts to configure logging. This means that Log4J services must be configured prior to any calls to Cayenne. </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>