cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r836565 [33/47] - in /websites/staging/cayenne/trunk/content: ./ doc12/ doc20/ doc30/
Date Tue, 30 Oct 2012 05:43:02 GMT
Modified: websites/staging/cayenne/trunk/content/doc30/classpath.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/classpath.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/classpath.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne » ClassPath
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; ClassPath</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="preferences-panel.html" title="Preferences Panel">Preferences Panel</A>&nbsp;&gt;&nbsp;<A href="" title="ClassPath">ClassPath</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966137">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966137">new page</A></LI>
-          </UL>
-        </DIV>
 	
 <H3><A name="ClassPath-ClassPath"></A>ClassPath</H3>
 
@@ -103,21 +8,3 @@
 <DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Modeler ClassNotFound Errors</B><BR>If you encounter any CLASSPATH-related errors during DB reverse engineering, DataSource configuration, etc., in most cases you simply need to go to Preferences ClassPath panel and add an entry pointing to a missing external library.</TD></TR></TABLE></DIV>
 
 <P><SPAN class="image-wrap" style=""><IMG src="classpath.data/prefs-classpath.jpg" style="border: 0px solid black"></SPAN></P>
-	<HR>
-	<P id="footer">Copyright &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/doc30/common-modeling-tasks.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/common-modeling-tasks.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/common-modeling-tasks.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Common Modeling Tasks
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Common Modeling Tasks</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Common Modeling Tasks">Common Modeling Tasks</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966144">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966144">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="CommonModelingTasks-CommonModelingTasks"></A>Common Modeling Tasks</H2>
 
 <P>This chapter describes a number of very common operations performed in CayenneModeler. All tasks assume that the Modeler has been started successfully, and, in most cases, that there is an open project.</P>
@@ -112,21 +17,3 @@
 </OL>
 
 
-	<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/doc30/comparing-dataobjects.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/comparing-dataobjects.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/comparing-dataobjects.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Comparing DataObjects
 
-<!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; Comparing DataObjects</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="cayenne-guide.html" title="Cayenne Guide">Cayenne Guide</A>&nbsp;&gt;&nbsp;<A href="dataobjects.html" title="DataObjects">DataObjects</A>&nbsp;&gt;&nbsp;<A href="" title="Comparing DataObjects">Comparing DataObjects</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966211">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966211">new page</A></LI>
-          </UL>
-        </DIV>
 	<P>If you have two objects a and b in the same DataContext, then you can check to see if they refer to the same database entity as simply as this:</P>
 
 <P>{{ if (a == b) }}</P>
@@ -106,21 +11,3 @@
 
 <P>{{ if (a.getObjectId().equals(b.getObjectId()) }}</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/doc30/configuring-caching-behavior.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/configuring-caching-behavior.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/configuring-caching-behavior.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Configuring Caching Behavior
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Configuring Caching Behavior</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="configuring-deployment-settings.html" title="Configuring Deployment Settings">Configuring Deployment Settings</A>&nbsp;&gt;&nbsp;<A href="" title="Configuring Caching Behavior">Configuring Caching Behavior</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966134">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966134">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="ConfiguringCachingBehavior-CacheMemoryManagement"></A>Cache Memory Management</H2>
 
 <P>&quot;Cache Configuration&quot; panel allows to configure a max number of objects in the shared LRU cache. By default it is set to 10000, which is appropriate for most applications. It is up to the user whether to change this parameter, however we advise to set it to a value to be higher than an estimated max. number of objects committed in a single transaction.</P>
@@ -133,21 +38,3 @@
 <H2><A name="ConfiguringCachingBehavior-Moreaboutcaching"></A>More about caching</H2>
 
 <P>Read more about <A href="caching-and-fresh-data.html" title="Caching and Fresh Data">caching options here. </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/doc30/configuring-deployment-settings.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/configuring-deployment-settings.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/configuring-deployment-settings.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Configuring Deployment Settings
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Configuring Deployment Settings</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="" title="Configuring Deployment Settings">Configuring Deployment Settings</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966133">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966133">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="ConfiguringDeploymentSettings-ConfiguringDeploymentSettings"></A>Configuring Deployment Settings</H2>
 
 <P>Cayenne project deployment settings, aside from <A href="create-datanode.html" title="Create DataNode">DataNode</A> configuration discussed elsewhere, are done using DataDomain panel. This chapter describes various supported settings.</P>
@@ -110,21 +15,3 @@
 </OL>
 
 
-	<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/doc30/configuring-logging.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/configuring-logging.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/configuring-logging.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Configuring Logging
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Configuring Logging</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="cayenne-guide.html" title="Cayenne Guide">Cayenne Guide</A>&nbsp;&gt;&nbsp;<A href="deployment.html" title="Deployment">Deployment</A>&nbsp;&gt;&nbsp;<A href="" title="Configuring Logging">Configuring Logging</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966257">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966257">new page</A></LI>
-          </UL>
-        </DIV>
 	<P>Cayenne logging is based on Jakarta Apache <A href="http://jakarta.apache.org/commons/logging/" class="external-link" rel="nofollow">commons-logging package</A>. Commons-logging allows users to choose their own logging provider, such as Log4J or <TT>java.util.logging</TT>. Below is an example of a <A href="http://logging.apache.org/log4j/docs/" class="external-link" rel="nofollow">Log4J-based</A> configuration of the most important Cayenne logger that turns on and off SQL tracing:</P>
 
 <DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
@@ -113,21 +18,3 @@ log4j.logger.org.apache.cayenne.access.Q
 log4j.logger.org.apache.cayenne.util = DEBUG
 </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/doc30/configuring-object-validation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/configuring-object-validation.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/configuring-object-validation.html Tue Oct 30 05:42:47 2012
@@ -1,117 +1,4 @@
+Title: Apache Cayenne &raquo; Configuring Object 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; Configuring Object 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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="configuring-deployment-settings.html" title="Configuring Deployment Settings">Configuring Deployment Settings</A>&nbsp;&gt;&nbsp;<A href="" title="Configuring Object Validation">Configuring Object Validation</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966189">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966189">new page</A></LI>
-          </UL>
-        </DIV>
 	<P><BR>
 Each DataDomain can be configured to enable or disable DataObject pre-commit validation by (un)checking &quot;Child DataContexts Validate Objects&quot; checkbox. By default validation is enabled for all newly created DataDomains. More information on DataObject validation is provided in the <A href="dataobject-validation.html" title="DataObject Validation">user guide</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/doc30/configuring-transactional-behavior.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/configuring-transactional-behavior.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/configuring-transactional-behavior.html Tue Oct 30 05:42:47 2012
@@ -1,119 +1,6 @@
+Title: Apache Cayenne &raquo; Configuring Transactional Behavior
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Configuring Transactional Behavior</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="configuring-deployment-settings.html" title="Configuring Deployment Settings">Configuring Deployment Settings</A>&nbsp;&gt;&nbsp;<A href="" title="Configuring Transactional Behavior">Configuring Transactional Behavior</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966190">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966190">new page</A></LI>
-          </UL>
-        </DIV>
 	
 <P>Each DataDomain can be configured to explicitly commit/rollback its transactions or to rely on deployment container to do that. This is done by checking or unchecking &quot;Container-Managed Transactions&quot; checkbox. </P>
 
 <P>By default &quot;Container-Managed Transactions&quot; is unchecked, letting Cayenne to handle its transactions. Check this checkbox when using Cayenne under container-managed transactions control, i.e. within EJB environment.</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/doc30/converting-an-existing-business-framework.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/converting-an-existing-business-framework.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/converting-an-existing-business-framework.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Converting an Existing Business Framework
 
-<!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; Converting an Existing Business Framework</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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="orm-case-study.html" title="ORM Case Study">ORM Case Study</A>&nbsp;&gt;&nbsp;<A href="" title="Converting an Existing Business Framework">Converting an Existing Business Framework</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966202">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966202">new page</A></LI>
-          </UL>
-        </DIV>
 	
 <H3><A name="ConvertinganExistingBusinessFramework-ConvertinganExistingBusinessFramework"></A>Converting an Existing Business Framework</H3>
 
@@ -124,21 +29,3 @@
 	<LI><A href="generate-java-classes.html" title="Generate Java Classes">Generate Java Classes</A></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/doc30/create-datanode.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/create-datanode.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/create-datanode.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Create 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; Create 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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="common-modeling-tasks.html" title="Common Modeling Tasks">Common Modeling Tasks</A>&nbsp;&gt;&nbsp;<A href="" title="Create DataNode">Create DataNode</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966143">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966143">new page</A></LI>
-          </UL>
-        </DIV>
 	
 <H3><A name="CreateDataNode-CreateDataNode"></A>Create DataNode</H3>
 
@@ -111,21 +16,3 @@
 <P><B>Configure DataSource Factory.</B> Depending on how you plan to deploy your Cayenne project, make a selection from the &quot;DataSource Factory&quot; dropdown. Select JNDIDataSourceFactory if you plan to obtain DataSource via JNDI from deployment container. If you either have a standalone application or want Cayenne to handle connection pooling, select DriverDataSourceFactory (default). A custom factory can also be used. </P>
 
 <P><B>Configure DataSource Information (Driver factory only).</B> Depending on the type of DataSource Factory selected, bottom right area of the screen will change to show a form appropriate for a selected type of DataSource. It allows to enter JDBC information for DriverDataSourceFactory or JNDI name for JNDI. If custom DataSource Factory was selected, an optional string parameter can be entered (it can be anything that a custom DataSource factory understands).</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/doc30/create-new-project.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/create-new-project.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/create-new-project.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Create New Project
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Create New Project</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="common-modeling-tasks.html" title="Common Modeling Tasks">Common Modeling Tasks</A>&nbsp;&gt;&nbsp;<A href="" title="Create New Project">Create New Project</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966149">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966149">new page</A></LI>
-          </UL>
-        </DIV>
 	
 <H3><A name="CreateNewProject-CreateNewProject"></A>Create New Project</H3>
 
@@ -108,21 +13,3 @@
 <P><SPAN class="image-wrap" style=""><IMG src="create-new-project.data/new-project-done.jpg" style="border: 0px solid black"></SPAN></P>
 
 <P>When you click on &quot;UntitledDomain&quot;, this opens an editor for this domain and also activates two new actions: &quot;<TT>Create DataNode</TT>&quot; and &quot;<TT>Create DataMap</TT>&quot;. </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



Mime
View raw message