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/10/30 06:43:02 UTC

svn commit: r836565 [4/47] - in /websites/staging/cayenne/trunk/content: ./ doc12/ doc20/ doc30/

Modified: websites/staging/cayenne/trunk/content/doc12/customizing-queries.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/customizing-queries.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/customizing-queries.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne » Customizing Queries
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Customizing Queries</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="queries.html" title="Queries">Queries</A>&nbsp;&gt;&nbsp;<A href="" title="Customizing Queries">Customizing Queries</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8035">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8035">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <P>Any object that implements <TT>org.objectstyle.cayenne.query.Query</TT> interface can be executed with a DataContext. </P>
@@ -184,21 +89,3 @@ Map row = (Map) context.performQuery(que
 
 <P>All standard queries can be subclassed, overriding some of their methods. For instance overriding <TT>route</TT> and/or <TT>createSQLAction</TT> would allow to implement custom callbacks at different points of query lifecycle.</P>
 
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/customizing.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/customizing.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/customizing.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Customizing
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Customizing</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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Customizing">Customizing</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=7998">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=7998">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <P>Here we will discuss a few Cayenne customization techniques:</P>
@@ -104,21 +9,3 @@
 </UL>
 
 
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/data-rows.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/data-rows.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/data-rows.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Data Rows
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Data Rows</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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="performance-tuning.html" title="Performance Tuning">Performance Tuning</A>&nbsp;&gt;&nbsp;<A href="" title="Data Rows">Data Rows</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8057">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8057">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <P>DataObjects creation and registering with DataContext is an expensive operation. There are cases when only a few objects are really used, but the application still has to fetch a lot of objects. For instance when a user performs a search, result may contain thousands of records, but user will only check 2-3 of them. Cayenne allows programmers to explicitly disable objects creation for such cases. Results will be returned in the form of java.util.Map's. In Cayenne such maps are called <TT>DataRows</TT>.</P>
@@ -137,21 +42,3 @@ List artistRows = ctxt.performQuery(q);
 ...
 </PRE>
 </DIV></DIV>
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/datachannel.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/datachannel.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/datachannel.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; DataChannel
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; DataChannel</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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="design.html" title="Design">Design</A>&nbsp;&gt;&nbsp;<A href="runtime-components.html" title="Runtime Components">Runtime Components</A>&nbsp;&gt;&nbsp;<A href="" title="DataChannel">DataChannel</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8024">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8024">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <P><TT>&quot;org.objectstyle.cayenne.DataChannel&quot;</TT> is an abstraction of Cayenne persistence stack. It is very simple - it defines only 4 methods, two for actually performing persistent operations, one to access metadata, and one - to access EventManager:</P>
@@ -120,21 +25,3 @@
 	<LI>ClientChannel is a DataChannel that connects to a remote Cayenne service.</LI>
 </UL>
 
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/datacontext.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/datacontext.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/datacontext.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; DataContext
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; DataContext</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="" title="DataContext">DataContext</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8038">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8038">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <P>In most applications <A href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/access/DataContext.html" class="external-link" rel="nofollow">DataContext</A> is the main user access point to all Cayenne functionality. It provides query execution facilities as well as object state management functions. Applications rarely directly deal with access or mapping objects beyond DataContext.</P>
@@ -102,21 +7,3 @@
 <P>One of the important features of DataContext is that it isolates changes made in a user session from other users. With this in mind, DataContext normally has a session scope. &quot;Session&quot; can have different meanings in different types of applications. Good example is an HttpSession in a web application. Each one of HttpSessions will normally need a single instance of DataContext.</P>
 
 
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/datacontextdelegate.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/datacontextdelegate.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/datacontextdelegate.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; DataContextDelegate
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; DataContextDelegate</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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="datacontext.html" title="DataContext">DataContext</A>&nbsp;&gt;&nbsp;<A href="" title="DataContextDelegate">DataContextDelegate</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8017">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8017">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <P>DataContext supports runtime customization via a DataContextDelegate interface. A user can assign a custom delegate instance to a DataContext by calling DataContext.setDelegate(..). Delegate is optional, and if it is not set, DataContext would go on with its default behavior. If a delegate is set, DataContext consults with it at some critical points in the normal flow execution. A delegate can modify the flow, abort an operation, modify objects participating in an operation, or perform any other tasks it deems necessary.</P>
@@ -117,21 +22,3 @@
 
 
 <P>These methods are called by the ObjectStore whenever it performs an update of its state triggered by external events. Default ObjectStore behavior is to merge all changes to the existing objects, and change deleted objects state to TRANSIENT, removing them from the store. Delegate has an option to abort standard processing by returning &quot;false&quot; from &quot;should*&quot; methods.</P>
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/datacontextfactory.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/datacontextfactory.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/datacontextfactory.html Tue Oct 30 05:42:47 2012
@@ -1,120 +1,7 @@
+Title: Apache Cayenne &raquo; DataContextFactory
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; DataContextFactory</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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="datacontext.html" title="DataContext">DataContext</A>&nbsp;&gt;&nbsp;<A href="" title="DataContextFactory">DataContextFactory</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8033">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8033">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <P>To customize how the DataContext is built, an <EM>optional</EM> DataContextFactory can be registered with DataDomain in the Modeler. The class name you enter must implement <TT>org.objectstyle.cayenne.access.DataContextFactory</TT> interface. If a factory is entered, Cayenne will use it in <A href="obtaining-datacontext.html" title="Obtaining DataContext">all places</A> where the DataContext is created. A single factory instance is reused for the life of the DataDomain.</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="datacontextfactory.data/datacontextfactory.jpg" style="border: 0px solid black"></SPAN></P>
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/datanode.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/datanode.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/datanode.html Tue Oct 30 05:42:47 2012
@@ -1,120 +1,7 @@
+Title: Apache Cayenne &raquo; 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 &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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="design.html" title="Design">Design</A>&nbsp;&gt;&nbsp;<A href="runtime-components.html" title="Runtime Components">Runtime Components</A>&nbsp;&gt;&nbsp;<A href="" title="DataNode">DataNode</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8111">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8111">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <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.objectstyle.cayenne.action.SQLAction&quot;</TT> instances returned by <A href="dbadapter.html" title="DbAdapter">DbAdapter</A>.</P>
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/dataobject-state-management.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/dataobject-state-management.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/dataobject-state-management.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &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 &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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="datacontext.html" title="DataContext">DataContext</A>&nbsp;&gt;&nbsp;<A href="" title="DataObject State Management">DataObject State Management</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8053">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8053">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <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>
@@ -222,21 +127,3 @@ 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 &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/dataobject-validation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/dataobject-validation.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/dataobject-validation.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &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 &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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="dataobjects.html" title="DataObjects">DataObjects</A>&nbsp;&gt;&nbsp;<A href="" title="DataObject Validation">DataObject Validation</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=8136">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=8136">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <P>DataObject implements a set of methods to validate its state. DataContext calls these methods before performing a commit. If validation fails, 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>
@@ -148,21 +53,3 @@
 
 <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 &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc12/dataobjects-example.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc12/dataobjects-example.html (original)
+++ websites/staging/cayenne/trunk/content/doc12/dataobjects-example.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &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 &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.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" 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="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="documentation.html" title="Apache Cayenne Documentation v1.2">Apache Cayenne Documentation v1.2</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="user-guide.html" title="User Guide">User Guide</A>&nbsp;&gt;&nbsp;<A href="dataobjects.html" title="DataObjects">DataObjects</A>&nbsp;&gt;&nbsp;<A href="" title="DataObjects Example">DataObjects Example</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=7971">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC12&fromPageId=7971">new page</A></LI>
-          </UL>
-        </DIV>
 	
 
 <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>
@@ -157,21 +62,3 @@ List realExpensiveArt = ctxt.performQuer
 [main 12-22 15:50:19] QueryLogger: +++ transaction committed.
 </PRE>
 </DIV></DIV>
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 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="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file