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:49:08 UTC

svn commit: r837683 [4/28] - in /websites/staging/cayenne/trunk/content: ./ doc/2.0/ doc/2.0/api/cayenne/org/apache/cayenne/remote/hessian/service/ doc/3.0/ doc/3.0/api/org/apache/cayenne/dba/db2/class-use/ doc/3.0/api/org/apache/cayenne/dba/derby/clas...

Modified: websites/staging/cayenne/trunk/content/doc/2.0/datanode.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/datanode.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/datanode.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,62 @@
-Title: 2.0 » DataNode
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataNode</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>DataNode is a Cayenne &quot;driver&quot; for a single physical data source, such as a relational database. In fact currently DataNode only handles JDBC sources (so maybe it should be renamed to JdbcDataNode?). </P>
 
 <P>DataNode doesn't do much work on its own, instead delegating most tasks to <TT>&quot;org.apache.cayenne.action.SQLAction&quot;</TT> instances returned by <A href="dbadapter.html" title="DbAdapter">DbAdapter</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/2.0/dataobject-state-management.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dataobject-state-management.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dataobject-state-management.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DataObject State Management
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataObject State Management</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>Arguably the second most important function of DataContext (first is performing queries) is keeping track of changes made to the registered DataObjects. &quot;Registered&quot; is a keyword here - registering an object with DataContext is what gives this object its persistent qualities.</P>
 
 <H3><A name="DataObjectStateManagement-HowtoRegisteraDataObject"></A>How to Register a DataObject</H3>
@@ -126,3 +173,12 @@ DataContext context; <SPAN class="code-c
 
 
 <P>This will restore the persistence state and the values of all registered objects to the values that objects had when they were fetched or the last commitChanges was executed. This effectively restores previously committed state of the object graph. Note that any NEW objects are unregistered from the context.</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/2.0/dataobject-validation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dataobject-validation.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dataobject-validation.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DataObject Validation
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataObject Validation</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>DataObject implements a set of methods to validate its state. DataContext calls these methods before performing a commit. If validation fails, the commit is aborted with ValidationException. There are a few clear benefits of validating DataObjects at the application level before committing them to the database:</P>
 
 <UL>
@@ -53,3 +100,12 @@ Title: 2.0 &raquo; DataObject Validation
 
 <H3><A name="DataObjectValidation-TurningValidationOn%2FOff"></A>Turning Validation On/Off</H3>
 <P>Whether DataContext performs validation at all depends on the value of its property <TT>validatingObjectsOnCommit</TT>. Calling <TT>isValidatingObjectsOnCommit()</TT> returns currently configured value. Default value (usually &quot;true&quot;) is propagated from the parent DataDomain when DataContext is created. This default value can be configured using CayenneModeler as described in <A href="configuring-object-validation.html" title="Configuring Object Validation">Configuring Object Validation</A> section.</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/2.0/dataobjects-example.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dataobjects-example.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dataobjects-example.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DataObjects Example
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataObjects Example</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>As discussed in <A href="dataobjects.html" title="DataObjects">DataContext</A> chapter, any changes made to the DataObjects via &quot;set*&quot; methods are synchronized with the database by calling <TT>DataContext.commitChanges</TT>. Here is an example showing how the <TT>Painting</TT> object is fetched, modified and saved back. The following modifications are performed: the price of the first retrieved painting is doubled, a new painting is added that belongs to the same artist as the painting fetched before:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
 <PRE class="code-java"><SPAN class="code-keyword">import</SPAN> java.math.BigDecimal;
@@ -61,3 +108,12 @@ List realExpensiveArt = ctxt.performQuer
 [main 12-22 15:50:19] QueryLogger: +++ transaction committed.
 </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/2.0/dataobjects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dataobjects.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dataobjects.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DataObjects
-
-	<P>DataObjects (Cayenne persistent objects) are composed of attributes and relationships. Attributes are the simplest object properties (as in &quot;java bean properties&quot;) that can be stored in the columns in the database. Those are usually string, numeric, binary or date values. Another type of properties is relationships. They represent related DataObjects (to-one relationships) or collections of DataObjects (to-many relationships). To read and modify attributes and relationships, application code would simply invoke corresponding get or set methods. In case of to-many relationships represented by collections there are also add and remove methods.</P>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataObjects</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>DataObjects (Cayenne persistent objects) are composed of attributes and relationships. Attributes are the simplest object properties (as in &quot;java bean properties&quot;) that can be stored in the columns in the database. Those are usually string, numeric, binary or date values. Another type of properties is relationships. They represent related DataObjects (to-one relationships) or collections of DataObjects (to-many relationships). To read and modify attributes and relationships, application code would simply invoke corresponding get or set methods. In case of to-many relationships represented by collections there are also add and remove methods.</P>
 
 <P>Queries discussed in the previous chapter are used to obtain the initial sets of DataObjects. After that a graph of persistent objects is navigated and modified via relationship methods, thus hiding the underlying relational storage complexity and giving application a nice object view of the relevant subset of the database data.</P>
 
@@ -21,3 +68,12 @@ Title: 2.0 &raquo; DataObjects
 </OL>
 
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/dataobjectutils.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dataobjectutils.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dataobjectutils.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DataObjectUtils
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataObjectUtils</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>DataObjectUtils class provides an important and easy to use facility to obtain a primary key value from a DataObject and to locate a DataObject in the database for a known primary key. Both operations work in a generic fashion and do not require primary key to be an object property.</P>
 
 <DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Security Warning</B><BR>DataObjectUtils make it very easy to use a primary key value as a universal &quot;code&quot; for an object in web forms and URLs. This opens a potential security hole in the interface. If application code is not careful enough, a malicious user can gain access to the information she is not allowed to see (e.g. other people's accounts) simply by trying a series of sequential numbers. So, for example, it is probably okay to use product PK to build a bookmarkable link to a catalog product, but it may not be appropriate to do that for a private user profile record.</TD></TR></TABLE></DIV>
@@ -28,3 +75,12 @@ DataContext 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/2.0/datasource.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/datasource.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/datasource.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,62 @@
-Title: 2.0 &raquo; DataSource
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataSource</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><A href="datanode.html" title="DataNode">DataNode</A> obtains connections via a <TT>javax.sql.DataSource</TT>. If an application is deployed in a J2EE container, DataSource is normally provided by container <A href="using-jndi.html" title="Using JNDI">via JNDI</A>. For standalone applications (or if you don't want to use JNDI) Cayenne provides its own DataSource that includes connection pooling features. Whenever you select <TT>org.apache.cayenne.conf.DriverDataSourceFactory</TT> in the Modeler, you are choosing to use Cayenne DataSource. </P>
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/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="datanode.html" title="DataNode">DataNode</A> obtains connections via a <TT>javax.sql.DataSource</TT>. If an application is deployed in a J2EE container, DataSource is normally provided by container <A href="using-jndi.html" title="Using JNDI">via JNDI</A>. For standalone applications (or if you don't want to use JNDI) Cayenne provides its own DataSource that includes connection pooling features. Whenever you select <TT>org.apache.cayenne.conf.DriverDataSourceFactory</TT> in the Modeler, you are choosing to use Cayenne DataSource. </P>
 
 <P>Cayenne DataSource implementation is located in the <TT>org.apache.cayenne.conn</TT> package and is fully independent from the rest of the framework. Since Cayenne DataSource is chosen automatically, users rarely need to know more details. One notable exception are applications requiring users to interactively <A href="http://cwiki.apache.org/CAY/setting-database-connection.html" class="external-link" rel="nofollow">enter database login information</A>. In this case you can write your own DataSource wrapper, and internally instantiate Cayenne DataSource (<TT>org.apache.cayenne.conn.PoolManager</TT>) after the user provides login and password.</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/2.0/dataview-concepts.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dataview-concepts.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dataview-concepts.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DataView Concepts
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataView Concepts</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/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="DataViewConcepts-DataViewHierarchy"></A>DataView Hierarchy</H3>
 
@@ -48,3 +95,12 @@ Title: 2.0 &raquo; DataView Concepts
 
 <H3><A name="DataViewConcepts-MiscellaneousFeatures"></A>Miscellaneous Features</H3>
 <P>One more useful feature is a centralized EventDispatcher within the DataView class. It is used by the fields to fire the events whenever their values are changed. Thus the ObjAttribute/ObjRelationship modifications can be easily propagated to all the listening components. </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/2.0/dataviews-in-action.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dataviews-in-action.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dataviews-in-action.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DataViews in Action
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataViews in Action</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Here we illustrate the discussion of DataViews with configuration samples and code snippets. Cayenne project DTD file supports references to data view configuration files. This information is loaded into the Cayenne Configuration instance along with the DataDomain, DataNode, and DataMap entries. Since the DataView functionality is optional and would not be very useful in some deployment scenarios (server-side applications) the DataView configiuration itself is not loaded at the time of initialization. Neither DataView instances are created by the configuration process. A DataView can be created in a Swing application with the code similar to the following:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
@@ -54,3 +101,12 @@ featureTable.setModel(tableModel);
 </DIV></DIV>  
 
 <P>In fact, there is many more cool things you could do with DataViews to build your Cayenne enabled Swing rich client faster and cleaner, and separate the GUI related stuff from your domain logic defining the clear declarative rules telling the framework how to interprete, render, and edit the ObjEntities and DataObjects your application relies upon. </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/2.0/dataviews.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dataviews.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dataviews.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DataViews
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DataViews</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>In the future versions of Cayenne DataViews will be split in a standalone package. Unless we find volunteers, this package won't be supported very well.</TD></TR></TABLE></DIV>
 
 <P>Cayenne takes care of managing persistence layer for all types of applications - web, rich client, command line, etc. With DataViews Cayenne extends into the area of integrating such persistent layer with Swing GUI.</P>
@@ -20,3 +67,12 @@ Title: 2.0 &raquo; DataViews
 	<LI><A href="dataviews-in-action.html" title="DataViews in Action">DataViews in Action</A></LI>
 </OL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/dbadapter.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dbadapter.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dbadapter.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DbAdapter
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DbAdapter</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/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="DbAdapter-PortabilityAcrossDatabases"></A>Portability Across Databases</H3>
 
 <P>The JDBC specification provides a great abstraction for relational database work. Still in practice some cross-database portability issues remain:</P>
@@ -21,3 +68,12 @@ Title: 2.0 &raquo; DbAdapter
 
 <P>Usually Cayenne detects the type of the database dynamically and installs the right adapter in runtime. However a user can enforce a specific adapter class by entering its name using &quot;Adapter&quot; tab in the DataNode Editor panel in CayenneModeler. Alternatively an adapter can be set on a DataNode via a method call.</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/2.0/dbcpdatasourcefactory.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dbcpdatasourcefactory.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dbcpdatasourcefactory.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DBCPDataSourceFactory
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DBCPDataSourceFactory</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>As an alternative to a simple and easy-to-use DataSource bundled with Cayenne, it is possible to configure a more feature-rich DataSource based on Apache Jakarta <A href="http://jakarta.apache.org/commons/dbcp" class="external-link" rel="nofollow">commons-dbcp</A>. To enable commons-dbcp pool, select <TT>DBCPDataSourceFactory</TT> in the Modeler for a DataNode:</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="dbcpdatasourcefactory.data/dbcp-step1.jpg" style="border: 0px solid black"></SPAN></P>
@@ -193,3 +240,12 @@ cayenne.dbcp.maxWait=10000</PRE>
 </TBODY></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/2.0/delete-rules.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/delete-rules.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/delete-rules.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Delete Rules
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Delete Rules</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/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="DeleteRules-DeleteRules"></A>Delete Rules</H3>
 
@@ -24,3 +71,12 @@ Title: 2.0 &raquo; Delete Rules
 
 
 <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>Cayenne Delete Rules vs. DB Delete Rules</B><BR>Some databases allow to define delete rules logically similar to the rules described above. Cayenne rules differ from DB rules in that they deal with object graph instead of relational schema. Some changes to the object graph will result in database operations (e.g. resetting FK to NULL as a result of Nullify rule), some others will not (e.g. removing a deleted DataObject from the to-many array as a result of another Nullify rule).</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/2.0/deleting-objects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/deleting-objects.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/deleting-objects.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Deleting 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; 2.0 &raquo; Deleting 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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>As discussed before, an object must be deleted in the DataContext to trigger a removal of the corresponding row from the database on commit. There are few simple ways to delete individual objects and collections of objects. Quite naturally, a delete operation changes the object state to PersistenceState.DELETED. However there maybe other consequences of such operation for the overall object graph. Such consequences are controlled via <A href="delete-rules.html" title="Delete Rules">Delete Rules</A> configured for object relationships. Properly configuring delete rules will simplify the application code, as you no longer need to track related objects and do the right thing with them. Other delete rule effects are discussed for each DataContext deletion method individually.</P>
 
 <H5><A name="DeletingObjects-Deletingasingleobject"></A>Deleting a single object</H5>
@@ -44,3 +91,12 @@ Iterator it = artist.getPaintings().iter
 }
 </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/2.0/deployment-with-ant.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/deployment-with-ant.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/deployment-with-ant.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Deployment with Ant
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Deployment with Ant</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/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 a number of cases when it is highly desirable to automate changing of Cayenne configuration files, including cayenne.xml and driver information files:</P>
 
@@ -11,3 +58,12 @@ Title: 2.0 &raquo; Deployment with Ant
 
 
 <P>Cayenne provides an Ant task called cdeploy that takes care of such things. More information on cdeploy is available <A href="cdeploy.html" title="cdeploy">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/2.0/deployment.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/deployment.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/deployment.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Deployment
-
-	<P>Cayenne application deployment is about configuring the application so that at runtime it can find a main project file (cayenne.xml) and associated resources, such as DataMap and DataNode XML files.</P>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Deployment</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>Cayenne application deployment is about configuring the application so that at runtime it can find a main project file (cayenne.xml) and associated resources, such as DataMap and DataNode XML files.</P>
 
 <P>The central point in Cayenne deployment is the <A href="http://cayenne.apache.org/doc/api/org/apache/cayenne/conf/Configuration.html" class="external-link" rel="nofollow">Configuration</A> class. It locates and loads all the mapping and configuration information required for Cayenne at runtime. By default Configuration uses a singleton model, i.e. normally there is only one instance of Configuration (or a subclass) that exists in the application. This shared instance can be accessed in the following way:</P>
 <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
@@ -27,3 +74,12 @@ DataDomain domain = conf.getDomain();
 </OL>
 
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/design.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/design.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/design.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Design
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Design</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	<P>This chapter discusses the architecture of the core Cayenne framework. It only deals with the runtime operation of the object-relational persistence layer. <A href="modeler-guide.html" title="Modeler Guide">Mapping procedures</A> and <A href="remote-object-persistence-guide.html" title="Remote Object Persistence Guide">remote object persistence</A> are discussed elsewhere. The information below is not strictly required to start using Cayenne, so new users can skip it initially and come back later to gain better understanding of how Cayenne operates under the hood.</P>
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/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 discusses the architecture of the core Cayenne framework. It only deals with the runtime operation of the object-relational persistence layer. <A href="modeler-guide.html" title="Modeler Guide">Mapping procedures</A> and <A href="remote-object-persistence-guide.html" title="Remote Object Persistence Guide">remote object persistence</A> are discussed elsewhere. The information below is not strictly required to start using Cayenne, so new users can skip it initially and come back later to gain better understanding of how Cayenne operates under the hood.</P>
 
 <H3><A name="Design-Sections"></A>Sections</H3>
 
@@ -13,3 +60,12 @@ Title: 2.0 &raquo; Design
 	<LI><A href="object-caching.html" title="Object Caching">Object Caching Mechanism</A></LI>
 </OL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/documentation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/documentation.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/documentation.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Documentation
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Documentation</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	<H2><A name="Documentation-CayenneDocumentationv.2.0%28STABLE%29"></A>Cayenne Documentation - v. 2.0 (STABLE)</H2>
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<H2><A name="Documentation-CayenneDocumentationv.2.0%28STABLE%29"></A>Cayenne Documentation - v. 2.0 (STABLE)</H2>
 
 <UL>
 	<LI><A href="user-guide.html" title="User Guide">User Guide</A>:  General information on how to get started with Cayenne, main Cayenne concepts, API details and deployment procedures.</LI>
@@ -8,3 +55,12 @@ Title: 2.0 &raquo; Documentation
 	<LI><A href="remote-object-persistence-guide.html" title="Remote Object Persistence Guide">Remote Object Persistence Guide</A>: Writing distributed Java applications with Cayenne remote object persistence mechanism.</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/2.0/dvmodeler-gui-tool.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/dvmodeler-gui-tool.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/dvmodeler-gui-tool.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; DVModeler GUI Tool
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; DVModeler GUI Tool</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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>DVModeler is a Java GUI tool to work with DataViews configuration included in Cayenne projects. Steps needed to start DVModeler are similar to that of CayenneModeler. Main class is <TT>org.apache.cayenne.dataview.dvmodeler.Main</TT>. For convenience Cayenne distribution provides run scripts to start DVModeler on Windows and UNIX platforms. To take advantage of these scripts, user must set CAYENNE_HOME (optional) and JAVA_HOME environment variables as described in <A href="installation.html" title="Installation">Installation</A>.</P>
 
 <P>To run DVModeler, simply doubleclick the appropriate script. Alternatively it can be run from the command line.</P>
@@ -15,3 +62,12 @@ Title: 2.0 &raquo; DVModeler GUI Tool
 <PRE>$CAYENNE_HOME/bin/dvmodeler.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/2.0/entityresolver.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/entityresolver.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/entityresolver.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,62 @@
-Title: 2.0 &raquo; EntityResolver
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; EntityResolver</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>In runtime the mapping metadata is accessed via a <A href="datachannel.html" title="DataChannel">DataChannel</A> in a form of <TT>org.apache.cayenne.map.EntityResolver</TT> (EntityResolver available via ObjectContext is usually obtained from the channel behind the scenes). EntityResolver provides a single namespace for multiple DataMaps. </P>
 
 <P>Another important function of the EntityResolver is providing access to the <TT>org.apache.cayenne.property.ClassDescriptor</TT> instances for each persistent entity. Those a compiled by Cayenne on the fly using EntityResolver's <TT>org.apache.cayenne.property.ClassDescriptorFactory</TT>.</P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/event-package.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/event-package.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/event-package.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Event Package
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Event Package</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Cayenne includes a full-featured events mechanism. It allows creation of local and distributed event queues. It is very powerful and generic; it is not tied to Cayenne persistence features in any way and can be used in any application. The most important features are:</P>
 
@@ -15,3 +62,12 @@ Title: 2.0 &raquo; Event Package
 
 
 <DIV class="panelMacro"><TABLE class="tipMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The most common error when using EventSubject is not storing a reference to it. This may result in a premature cleanup of a given subject, and automatic unregistering of all listeners. Good practice is to make subject a &quot;public static final&quot; variable of the event sender class if a subject is common for all instances of senders; or make it an ivar of a sender instance if subject is only related to this instance.</TD></TR></TABLE></DIV>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/doc/2.0/executing-a-stored-procedure.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/executing-a-stored-procedure.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/executing-a-stored-procedure.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Executing a Stored Procedure
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Executing a Stored Procedure</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/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="ExecutingaStoredProcedure-UsingQueryResponsetoProcessComplexResults"></A>Using QueryResponse to Process Complex Results</H3>
 
@@ -62,3 +109,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/2.0/expression-factory-utilities.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/expression-factory-utilities.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/expression-factory-utilities.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Expression Factory Utilities
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Expression Factory Utilities</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>Sometimes there is a need to build an expression by combining other existing expressions. Also quiet often it is desirable to use strongly typed API instead of interpreted string expressions. The following sections describe <A href="http://incubator.apache.org/cayenne/2_0/api/cayenne/org/apache/cayenne/exp/ExpressionFactory.html" class="external-link" rel="nofollow">ExpressionFactory</A> and <A href="http://incubator.apache.org/cayenne/2_0/api/cayenne/org/apache/cayenne/exp/Expression.html" class="external-link" rel="nofollow">Expression</A> methods that allow to construct expressions step by step via API calls.</P>
 
 <H3><A name="ExpressionFactoryUtilities-Path%2FValueExpressions"></A>Path/Value Expressions</H3>
@@ -106,3 +153,12 @@ map.put(<SPAN class="code-quote">&quot;p
 Expression qual = ExpressionFactory.matchAllExp(map, Expression.EQUAL_TO);
 </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/2.0/expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/2.0/expressions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/2.0/expressions.html Thu Nov  8 17:48:56 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; 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; 2.0 &raquo; Expressions</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	<P>Cayenne defines a simple yet powerful object-based expression language. Cayenne expressions are database independent and are used as query qualifiers and orderings and also to perform in-memory evaluation with DataObjects (and generally any kind of Java Beans). BNF of Cayenne expression language is described <A href="bnf-for-expressionparser.html" title="BNF for ExpressionParser">here</A>.</P>
+<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="/doc20/documentation.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/doc20/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	<P>Cayenne defines a simple yet powerful object-based expression language. Cayenne expressions are database independent and are used as query qualifiers and orderings and also to perform in-memory evaluation with DataObjects (and generally any kind of Java Beans). BNF of Cayenne expression language is described <A href="bnf-for-expressionparser.html" title="BNF for ExpressionParser">here</A>.</P>
 
 <P>Expressions are broadly divided into the following categories: object property expressions (also called &quot;path expressions&quot;), arithmetic operations, and conditional expressions. Cayenne contains a parser to build expressions from strings, and also features explicit expression API. Various ways of creating and using expressions are described later in this chapter. </P>
 
@@ -14,3 +61,12 @@ Title: 2.0 &raquo; Expressions
 	<LI><A href="in-memory-evaluation.html" title="In-Memory Evaluation">In&#45;Memory Evaluation</A></LI>
 </OL>
 
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>