You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by am...@apache.org on 2012/10/30 06:42:23 UTC

svn commit: r1403615 [40/48] - in /cayenne/site/cms/trunk/content: doc12/ doc20/ doc30/

Modified: cayenne/site/cms/trunk/content/doc30/maven2-modeler.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/maven2-modeler.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/maven2-modeler.html (original)
+++ cayenne/site/cms/trunk/content/doc30/maven2-modeler.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne » maven2-modeler
 
-<!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; maven2-modeler</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="maven2-plugins.html" title="Maven2 Plugins">Maven2 Plugins</A>&nbsp;&gt;&nbsp;<A href="" title="maven2-modeler">maven2-modeler</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966293">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966293">new page</A></LI>
-          </UL>
-        </DIV>
 	<P><TT>modeler</TT> is an Maven 2 mojo that runs the latest version of Cayenne Modeler.  It saves you from having to download the modeler and installing it manually, which is really nice if you're following the latest changes in the snapshot builds.</P>
 
 <P>There is no configuration of this plugin, but you do need to add to add the plugin to your POM:</P>
@@ -119,21 +24,3 @@
 $ mvn cayenne-modeler:run
 </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: cayenne/site/cms/trunk/content/doc30/maven2-plugins.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/maven2-plugins.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/maven2-plugins.html (original)
+++ cayenne/site/cms/trunk/content/doc30/maven2-plugins.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Maven2 Plugins
 
-<!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; Maven2 Plugins</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="" title="Maven2 Plugins">Maven2 Plugins</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966290">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966290">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="Maven2Plugins-Maven2Plugins"></A>Maven2 Plugins</H2>
 
 <P>Cayenne ships three plugins that provide Maven 2 frontend to a number of useful operations in Cayenne. </P>
@@ -167,21 +72,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: cayenne/site/cms/trunk/content/doc30/migrate-changes-between-model-and-database.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/migrate-changes-between-model-and-database.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/migrate-changes-between-model-and-database.html (original)
+++ cayenne/site/cms/trunk/content/doc30/migrate-changes-between-model-and-database.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Migrate Changes between Model and Database
 
-<!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; Migrate Changes between Model and Database</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="Migrate Changes between Model and Database">Migrate Changes between Model and Database</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966151">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966151">new page</A></LI>
-          </UL>
-        </DIV>
 	<H3><A name="MigrateChangesbetweenModelandDatabase-IntroductiontoMerging"></A>Introduction to Merging</H3>
 
 <P>After working some time with the model and/or the database, it can be a lot of work to make sure they are in sync. E.g. A table has been added/removed, a varchar column has a different max length and so on. The merge functionality in the modeler handle all of this.</P>
@@ -129,21 +34,3 @@
 
 <P><SPAN class="image-wrap" style=""><IMG src="migrate-changes-between-model-and-database.data/merge-complete.png" 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: cayenne/site/cms/trunk/content/doc30/modeler-guide.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/modeler-guide.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/modeler-guide.html (original)
+++ cayenne/site/cms/trunk/content/doc30/modeler-guide.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Modeler Guide
 
-<!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; Modeler Guide</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="" title="Modeler Guide">Modeler Guide</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966128">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966128">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="ModelerGuide-ModelerGuide"></A>Modeler Guide</H2>
 
 
@@ -113,21 +18,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: cayenne/site/cms/trunk/content/doc30/modeling-database-layer.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/modeling-database-layer.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/modeling-database-layer.html (original)
+++ cayenne/site/cms/trunk/content/doc30/modeling-database-layer.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Modeling Database Layer
 
-<!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; Modeling Database Layer</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="Modeling Database Layer">Modeling Database Layer</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966197">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966197">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="ModelingDatabaseLayer-ModelingDatabaseLayer"></A>Modeling Database Layer</H2>
 
 <P>This chapter describes modeling the RDBMS schema in Cayenne.</P>
@@ -108,21 +13,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: cayenne/site/cms/trunk/content/doc30/modeling-embeddables.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/modeling-embeddables.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/modeling-embeddables.html (original)
+++ cayenne/site/cms/trunk/content/doc30/modeling-embeddables.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Modeling Embeddables
 
-<!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; Modeling Embeddables</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="modeling-object-layer.html" title="Modeling Object Layer">Modeling Object Layer</A>&nbsp;&gt;&nbsp;<A href="" title="Modeling Embeddables">Modeling Embeddables</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=9798087">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=9798087">new page</A></LI>
-          </UL>
-        </DIV>
 	<P>An <TT>Embeddable</TT> is a persistent Java class that does not have its own persistent &quot;identity&quot; (&quot;identity&quot; is an ORM concept similar to &quot;primary key&quot;) and is managed by Cayenne as a part of its owning object. Embeddables are mapped in Cayenne similar to ObjEntities, except that they are not linked to any DbEntity. An Embeddable becomes linked to one when it is &quot;embedded&quot; in an owning ObjEntity. &quot;Embedding&quot; means mapping ObjEntity's ObjAttribute to an embeddable type.  A single embeddable can be included (&quot;embedded&quot;) in more than one ObjEntity.</P>
 
 <P>Embeddable classes are generated by Cayenne (via the Modeler, Ant or Maven), just like other persistent classes. There's no common embeddable superclass, so each embeddable inherits from Object. Still Cayenne generates a familiar pair of <TT>&#95;Xyz</TT> superclass and <TT>Xyz</TT> subclass for each Embeddable.</P>
@@ -114,21 +19,3 @@
 <P>The process of embedding an Embeddable is rather simple. Add a new attribute to your Java class (under the ObjEntity Attributes tab) and then inspect the entry. (Note: It is important that you inspect the entry instead of entering the embeddable's type directly in  the Java Type column under the Attributes tab due to a limitation in Cayenne Modeler.) Select the embeddable type in the Type pulldown list. CayenneModeler will automatically include all Embeddable classes it knows about in the Java types dropdown. If the underlying DbEntity has the same column names as the original Embeddable, that's all you need to do. If not, you can override the default column names by clicking on the attribute inspector button (&quot;I&quot;) and changing DbAttribute mappings for this particular embedding:</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="modeling-embeddables.data/modeler-embeddedinspector.png" 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: cayenne/site/cms/trunk/content/doc30/modeling-enumerations.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/modeling-enumerations.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/modeling-enumerations.html (original)
+++ cayenne/site/cms/trunk/content/doc30/modeling-enumerations.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Modeling Enumerations
 
-<!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; Modeling Enumerations</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="modeling-object-layer.html" title="Modeling Object Layer">Modeling Object Layer</A>&nbsp;&gt;&nbsp;<A href="" title="Modeling Enumerations">Modeling Enumerations</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966142">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966142">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="ModelingEnumerations-MappingandModelingJavaEnumerations"></A>Mapping and Modeling Java Enumerations</H2>
 
 <P>Cayenne allows to use any <A href="http://java.sun.com/j2se/1.5.0/docs/guide/language/enums.html" class="external-link" rel="nofollow">Java enumeration</A> as an ObjAttribute type. In CayenneModeler's ObjEntity editor, under the Attributes tab, enter the full class name for your enumeration under the Java Type column, and this is it:</P>
@@ -123,21 +28,3 @@
 
 <P>This instructs Cayenne to read/write 3, 6, and 9 as RED, GREEN, and BLUE, respectively.  The order is unimportant - if someone re-orders them to be BLUE, GREEN, and RED in the enum class, all values will still map correctly.</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: cayenne/site/cms/trunk/content/doc30/modeling-inheritance.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/modeling-inheritance.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/modeling-inheritance.html (original)
+++ cayenne/site/cms/trunk/content/doc30/modeling-inheritance.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Modeling Inheritance
 
-<!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; Modeling Inheritance</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="modeling-object-layer.html" title="Modeling Object Layer">Modeling Object Layer</A>&nbsp;&gt;&nbsp;<A href="" title="Modeling Inheritance">Modeling Inheritance</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966141">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966141">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="ModelingInheritance-Overview"></A>Overview</H2>
 
 <P>Inheritance is a familiar and a very useful concept to any Java developer. There are three common ways of mapping it to a relational schema. In Cayenne we are calling them &quot;single table&quot;, &quot;vertical&quot; and &quot;horizontal&quot;. Other ORM frameworks may use different terms for those (e.g. in JPA &quot;single table&quot; is called &quot;single table per class&quot;, &quot;vertical&quot; - &quot;joined subclass&quot;, and &quot;horizontal&quot; - &quot;table per concrete class&quot;, still they are referring to the same types of mapping). The picture below is a high-level representation of these three strategies. </P>
@@ -169,21 +74,3 @@
 
 
 
-	<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: cayenne/site/cms/trunk/content/doc30/modeling-object-layer.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/modeling-object-layer.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/modeling-object-layer.html (original)
+++ cayenne/site/cms/trunk/content/doc30/modeling-object-layer.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Modeling Object Layer
 
-<!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; Modeling Object Layer</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="Modeling Object Layer">Modeling Object Layer</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966139">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966139">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="ModelingObjectLayer-ModelingObjectLayer"></A>Modeling Object Layer</H2>
 
 <P>This chapter describes modeling persistent object layer in Cayenne.</P>
@@ -112,21 +17,3 @@
 	<LI><A href="modeling-remote-persistence.html" title="Modeling Remote Persistence">Modeling Remote Persistence</A></LI>
 </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: cayenne/site/cms/trunk/content/doc30/modeling-objentities.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/modeling-objentities.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/modeling-objentities.html (original)
+++ cayenne/site/cms/trunk/content/doc30/modeling-objentities.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Modeling ObjEntities
 
-<!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; Modeling ObjEntities</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="modeling-object-layer.html" title="Modeling Object Layer">Modeling Object Layer</A>&nbsp;&gt;&nbsp;<A href="" title="Modeling ObjEntities">Modeling ObjEntities</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966194">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966194">new page</A></LI>
-          </UL>
-        </DIV>
 	<H3><A name="ModelingObjEntities-ModelingObjEntities"></A>Modeling ObjEntities</H3>
 
 <P>Java object layer in Cayenne is modeled as a set of ObjEntities with relationships between them. Each <TT>org.apache.cayenne.map.ObjEntity</TT> consists of a reference to a <TT>org.apache.cayenne.map.DbEntity</TT> (table). It also specifies the Java class for a business object and a set of attributes of this class.</P>
@@ -113,21 +18,3 @@
 <H4><A name="ModelingObjEntities-ObjEntityQualifier"></A>ObjEntity Qualifier</H4>
 
 <P>ObjEntities can hold a qualifier expression that is automatically appended to all SelectQueries rooted in a given ObjEntity. Entity qualifier can be viewed as a global data filter for a given entity. One area where this feature is used is <A href="modeling-single-table-inheritance.html" title="Modeling Single Table Inheritance">inheritance mapping</A>, however by itself it has nothing to do with inheritance as such and can be used standalone. To set an entity qualifier, type a Cayenne expression into the &quot;Qualifier&quot; field of the ObjEntity editor panel.</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: cayenne/site/cms/trunk/content/doc30/modeling-queries.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/modeling-queries.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/modeling-queries.html (original)
+++ cayenne/site/cms/trunk/content/doc30/modeling-queries.html Tue Oct 30 05:42:06 2012
@@ -1,117 +1,4 @@
+Title: Apache Cayenne &raquo; Modeling 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; Modeling 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="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="Modeling Queries">Modeling Queries</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966196">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966196">new page</A></LI>
-          </UL>
-        </DIV>
 	<P><BR>
 TBD </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