cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r837766 [10/23] - in /websites/staging/cayenne/trunk/content: ./ docs/ docs/1.2/ docs/2.0/ docs/3.0/ docs/3.1/
Date Fri, 09 Nov 2012 07:29:36 GMT
Modified: websites/staging/cayenne/trunk/content/docs/2.0/datasource.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/datasource.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/datasource.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,62 @@
-Title: 2.0 » 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/dataview-concepts.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/dataview-concepts.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/dataview-concepts.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/dataviews-in-action.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/dataviews-in-action.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/dataviews-in-action.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/dataviews.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/dataviews.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/dataviews.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/dbadapter.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/dbadapter.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/dbadapter.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/dbcpdatasourcefactory.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/dbcpdatasourcefactory.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/dbcpdatasourcefactory.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/delete-rules.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/delete-rules.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/delete-rules.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/deleting-objects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/deleting-objects.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/deleting-objects.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/deployment-with-ant.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/deployment-with-ant.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/deployment-with-ant.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/deployment.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/deployment.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/deployment.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/design.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/design.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/design.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/dvmodeler-gui-tool.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/dvmodeler-gui-tool.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/dvmodeler-gui-tool.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/entityresolver.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/entityresolver.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/entityresolver.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/event-package.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/event-package.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/event-package.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/executing-a-stored-procedure.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/executing-a-stored-procedure.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/executing-a-stored-procedure.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/expression-factory-utilities.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/expression-factory-utilities.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/expression-factory-utilities.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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/docs/2.0/expressions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/expressions.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/expressions.html Fri Nov  9 07:29:01 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="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/extended-types.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/extended-types.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/extended-types.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Extended Types
-
-	
+<!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; Extended Types</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 <P>JDBC specification defines a set of &quot;standard&quot; database column types (defined in java.sql.Types class) and a very specific mapping of these types to Java Object Types, such as java.lang.String, java.math.BigDecimal, etc. Sometimes there is a need to use a custom Java type not known to JDBC driver. CayenneModeler allows to configure an arbitrary Java class as an <TT>org.apache.cayenne.map.ObjAttribute</TT> type by simply entering a fully-qualified name such class in the type column of an ObjAttribute. However there is more to it than just that. Cayenne needs to know how to instantiate this type from a database &quot;primitive&quot; value, and conversly, how to transform an object of the custom type to a JDBC-compatible object.</P>
 
 <H3><A name="ExtendedTypes-SupportingNonStandardTypes"></A>Supporting Non-Standard Types</H3>
@@ -23,3 +70,12 @@ DataNode node = domain.getNode(<SPAN cla
 <H3><A name="ExtendedTypes-DbAdaptersandExtendedTypes"></A>DbAdapters and Extended Types</H3>
 
 <P>As shown in the example above, ExtendedTypes are stored by <A href="dbadapter.html" title="DbAdapter">DbAdapter</A>. In fact DbAdapters often install their own extended types to address incompatibilities, incompletness and differences between JDBC drivers in handling &quot;standard&quot; JDBC types. For instance some drivers support reading large character columns (CLOB) as java.sql.Clob, but some other - as &quot;character stream&quot;, etc. Adapters provided with Cayenne override <TT>configureExtendedTypes()</TT> method to install their own types, possibly substituting Cayenne defaults. Custom DbAdapters can use the same technique.</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/docs/2.0/flattened-relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/flattened-relationships.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/flattened-relationships.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,62 @@
-Title: 2.0 &raquo; 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; 2.0 &raquo; Flattened Relationships</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>Flattened relationships represent relationship between two types of DataObjects that is not direct in the underlying relational storage. Instead it is mapped across one or more &quot;join&quot; tables. Still from the application point of view there is no diffrence in working with flattened relationships compared to the &quot;normal&quot; ones. Cayenne internally figures out how to build the needed query joins to retrieve related objects. On adding or removing an object to/from a flattened relationship via a corresponding &quot;addTo...&quot; / &quot;removeFrom...&quot; method an appropriate join record is created or removed.</P>
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Flattened Relationships Limitations</B><BR>Currently only many-to-many flattened relatationships with a single join table can be modified. All other types of flattened relationships can be used as &quot;read-only&quot;. This is reflected in the DataObject code generated for such relationships - no set/addTo/RemoveFrom methods are created for read-only relationships.</TD></TR></TABLE></DIV>
+
+       <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/docs/2.0/general-navigation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/general-navigation.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/general-navigation.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; General Navigation
-
-	
+<!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; General Navigation</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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="GeneralNavigation-GeneralNavigation"></A>General Navigation</H3>
 
 
@@ -51,3 +98,12 @@ Title: 2.0 &raquo; General Navigation
 <H5><A name="GeneralNavigation-Query%3A%21iconquery.gif%21"></A>Query: <SPAN class="image-wrap" style=""><IMG src="general-navigation.data/icon-query.gif" style="border: 0px solid black"></SPAN></H5>
 
 <P>Cayenne allows to store queries in the DataMap. There are three types of Cayenne queries that can be created in the Modeler - object select query, raw SQL query, and procedure query.</P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/general-preferences.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/general-preferences.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/general-preferences.html Fri Nov  9 07:29:01 2012
@@ -1,7 +1,63 @@
-Title: 2.0 &raquo; General Preferences
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; General Preferences</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
 
-	
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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="GeneralPreferences-GeneralPreferences"></A>General Preferences</H3>
 
 <P>&quot;General Preferences&quot; panel currently supports configuration of a single parameter - &quot;Preferences Save Interval&quot;. This parameter determines how often should the Modeler commit preference values that it collects automatically during normal operation (e.g. main window or panel sizes, etc.). Don't set this to a small value as this may sometimes degrade Modeler performance. </P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/generate-database-schema.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/generate-database-schema.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/generate-database-schema.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Generate Database Schema
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Generate Database Schema</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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="GenerateDatabaseSchema-GenerateDatabaseSchema"></A>Generate Database Schema</H3>
 
@@ -11,3 +58,12 @@ Title: 2.0 &raquo; Generate Database Sch
 <P><SPAN class="image-wrap" style=""><IMG src="generate-database-schema.data/generate-options.jpg" style="border: 0px solid black"></SPAN></P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="generate-database-schema.data/generate-options-tables.jpg" style="border: 0px solid black"></SPAN></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/generate-java-classes.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/generate-java-classes.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/generate-java-classes.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Generate Java Classes
-
-	
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; 2.0 &raquo; Generate Java Classes</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/api/cayenne/index.html">JavaDoc</a></li>
+			<li><a href="/index.html">Back...</a>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       	
 
 <P>First we'd like to mention an alternative way of generating classes from the model, that can save time in many situtations compared to using the GUI: <A href="cgen.html" title="cgen">cgen Ant task</A> would automatically refresh generated classes when needed during the build.</P>
 
@@ -25,3 +72,12 @@ Title: 2.0 &raquo; Generate Java Classes
 <P>As the name implies this mode allows much more customization of the generation procedure, such as custom Velocity templates (that are configured in Modeler Preferences), single run per entity or single run for the entire DataMap, etc. The options available in the dialog closely mirror those of the <A href="cgen.html" title="cgen">cgen</A> Ant task.</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="generate-java-classes.data/generator2.jpg" style="border: 0px solid black"></SPAN></P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/docs/2.0/generate-primary-key-support.html
==============================================================================
--- websites/staging/cayenne/trunk/content/docs/2.0/generate-primary-key-support.html (original)
+++ websites/staging/cayenne/trunk/content/docs/2.0/generate-primary-key-support.html Fri Nov  9 07:29:01 2012
@@ -1,6 +1,53 @@
-Title: 2.0 &raquo; Generate Primary Key Support
-
-	
+<!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; Generate Primary Key Support</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7036673-1']);
+  _gaq.push(['_trackPageview']);
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+</script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/docs/2.0/index.html">2.0.x Documentation</a>
+		<ul>
+			<li><a href="/docs/2.0/user-guide.html">Cayenne Guide</a></li>
+			<li><a href="/docs/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/docs/2.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/docs/2.0/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="GeneratePrimaryKeySupport-GeneratePrimaryKeySupport"></A>Generate Primary Key Support</H3>
 
@@ -15,3 +62,12 @@ Title: 2.0 &raquo; Generate Primary Key 
 <P><SPAN class="image-wrap" style=""><IMG src="generate-primary-key-support.data/generate-options-pk.jpg" style="border: 0px solid black"></SPAN></P>
 
 <P>You must uncheck all options except for &quot;Create Primary key Support&quot;, and then click &quot;Generate&quot;. If there were any database specific errors during generation they will be listed in a status window. Sometimes such errors can be simply ignored (e.g. when a there was an existing primary key support already configured in the DB).</P>
+
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+</body>
+</html>



Mime
View raw message