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 [38/48] - in /cayenne/site/cms/trunk/content: doc12/ doc20/ doc30/

Modified: cayenne/site/cms/trunk/content/doc30/generic-persistent-class.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/generic-persistent-class.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/generic-persistent-class.html (original)
+++ cayenne/site/cms/trunk/content/doc30/generic-persistent-class.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne » Generic Persistent Class
 
-<!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; Generic Persistent Class</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="Generic Persistent Class">Generic Persistent Class</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966152">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966152">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="GenericPersistentClass-WhatIs%22GenericPersistentClass%22"></A>What Is &quot;Generic Persistent Class&quot;</H2>
 
 <P>Each kind of persistent objects (such as &quot;Artist&quot; or &quot;Painting&quot;) is described in Cayenne by a single ObjEntity. The most common and useful scenario is mapping an ObjEntity to a &quot;specialized&quot; Java class, one class per entity. But there is an alternative - use a single generic persistent object class to map any entity.</P>
@@ -185,21 +90,3 @@ DataObject object = ...;
 object.writeProperty(<SPAN class="code-quote">&quot;subject&quot;</SPAN>, <SPAN class="code-quote">&quot;Post On Topic&quot;</SPAN>);
 </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/guide-to-11-features.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/guide-to-11-features.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/guide-to-11-features.html (original)
+++ cayenne/site/cms/trunk/content/doc30/guide-to-11-features.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Guide to 1.1 Features
 
-<!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; Guide to 1.1 Features</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="overview.html" title="Overview">Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Guide to 1.1 Features">Guide to 1.1 Features</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966178">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966178">new page</A></LI>
-          </UL>
-        </DIV>
 	<P>Cayenne version 1.1 introduces a large number of new features and enhancements over 1.0. This chapter lists most of them, providing the links to more detailed information about each feature.</P>
 
 <H3><A name="Guideto1.1Features-DTDAdditions."></A>DTD Additions.</H3>
@@ -234,21 +139,3 @@
 <P>The following is an incomplete list of enhancements: new professional look and feel, preference engine, reenginnering of stored procedures, local DataSources, configurable locations of JDBC drivers, custom class generation templates, etc. A number of Modeler tasks and dialogs have been redesigned and improved to be more user-friendly and consistent.</P>
 
 <P>Also CayenneModeler supports mapping of all the new 1.1 framework features, such as DataMap queries, cache synchronization configuration, etc.</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/guide-to-12-features.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/guide-to-12-features.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/guide-to-12-features.html (original)
+++ cayenne/site/cms/trunk/content/doc30/guide-to-12-features.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Guide to 1.2 Features
 
-<!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; Guide to 1.2 Features</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="overview.html" title="Overview">Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Guide to 1.2 Features">Guide to 1.2 Features</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966299">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966299">new page</A></LI>
-          </UL>
-        </DIV>
 	
 <P>This page describes new features and other changes introduced in 1.2 release.</P>
 
@@ -250,21 +155,3 @@
 	<LI>Customizable Encoding Of Generated Files. Desired encoding for generated Java files can be specified in the Modeler in Preferences and as an &quot;encoding&quot; attribute of the cgen Ant task. This is helpful in cross-platform development situations.</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: cayenne/site/cms/trunk/content/doc30/guide-to-30-features.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/guide-to-30-features.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/guide-to-30-features.html (original)
+++ cayenne/site/cms/trunk/content/doc30/guide-to-30-features.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Guide to 3.0 Features
 
-<!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; Guide to 3.0 Features</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="overview.html" title="Overview">Overview</A>&nbsp;&gt;&nbsp;<A href="" title="Guide to 3.0 Features">Guide to 3.0 Features</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966300">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966300">new page</A></LI>
-          </UL>
-        </DIV>
 	<P>This page highlights the new features and changes introduced in 3.0 release. It is a high level overview and as such is by no means complete. Consult RELEASE-NOTES.txt file included in each release for the full list of changes, and UPGRADE.txt for the upgrade instructions.</P>
 
 <UL>
@@ -342,21 +247,3 @@
 	<LI>The Modeler can be <A href="maven2-modeler.html" title="maven2-modeler">started from Maven</A>, that can potentially help in aligning the Modeler version with the project runtime Cayenne version.</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: cayenne/site/cms/trunk/content/doc30/handling-inheritance.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/handling-inheritance.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/handling-inheritance.html (original)
+++ cayenne/site/cms/trunk/content/doc30/handling-inheritance.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Handling 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; Handling 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="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="Handling Inheritance">Handling Inheritance</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966155">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966155">new page</A></LI>
-          </UL>
-        </DIV>
 	<P>&quot;Inheritance&quot; is an Object Oriented concept absent in traditional RDBMS. Cayenne however allows to map a hierarchical class tree to a single base table (so called &quot;single table inheritance&quot;). Such mapping is described in detail in the <A href="modeling-single-table-inheritance.html" title="Modeling Single Table Inheritance">Modeler Guide</A>. The idea of single table inheritance is that a &quot;class&quot; of a database row is determined from the values in one or more columns of the base table. These columns are called &quot;class designator columns&quot;.</P>
 
 <H3><A name="HandlingInheritance-InheritanceandnewDataObjects"></A>Inheritance and new DataObjects</H3>
@@ -151,21 +56,3 @@ List employees = context.performQuery(qu
 <DIV class="panelMacro"><TABLE class="infoMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/information.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Whenever an object is obtained via a relationship, it is always fully resolved to the lowest possible subclass in an entity inheritance tree.</TD></TR></TABLE></DIV>
 
 <DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>Use <TT>setResolvingInherited(false)</TT> with caution, and only if you never plan to work with subclasses. The downside of it is that the DataContext may end up with two objects pointing to the same database row, thus violating uniquing principle. With the above example, this may happen if at a later time user decides to fetch Managers directly, or if a Manager object is obtained via a relationship.</TD></TR></TABLE></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/in-memory-evaluation.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/in-memory-evaluation.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/in-memory-evaluation.html (original)
+++ cayenne/site/cms/trunk/content/doc30/in-memory-evaluation.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; In-Memory Evaluation
 
-<!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; In-Memory Evaluation</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="expressions.html" title="Expressions">Expressions</A>&nbsp;&gt;&nbsp;<A href="" title="In-Memory Evaluation">In-Memory Evaluation</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966281">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966281">new page</A></LI>
-          </UL>
-        </DIV>
 	
 <P>In additions to providing a database-independent WHERE clause for SQL queries, expressions support in-memory evaluation. An expressions can be evaluated with any type of objects that follow Java Beans method naming convention. Of course this includes DataObjects. The following API is used for expressions evaluation:</P>
 
@@ -149,21 +54,3 @@ NonPersistentUser nonPersistentBean;
 List startWithA = exp.filterObjects(artists);
 </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/index.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/index.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/index.html (original)
+++ cayenne/site/cms/trunk/content/doc30/index.html Tue Oct 30 05:42:06 2012
@@ -1,116 +1,3 @@
+Title: Apache Cayenne &raquo; Index
 
-<!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; Index</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="" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="" title="Index">Index</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966186">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966186">new page</A></LI>
-          </UL>
-        </DIV>
 	<P><B><A href="documentation.html" title="Documentation">Apache Cayenne Documentation - v3.0</A></B></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/individual-object-caching.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/individual-object-caching.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/individual-object-caching.html (original)
+++ cayenne/site/cms/trunk/content/doc30/individual-object-caching.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Individual Object Caching
 
-<!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; Individual Object Caching</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="caching-and-fresh-data.html" title="Caching and Fresh Data">Caching and Fresh Data</A>&nbsp;&gt;&nbsp;<A href="" title="Individual Object Caching">Individual Object Caching</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966288">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966288">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="IndividualObjectCaching-IndividualObjectCaching"></A>Individual Object Caching</H2>
 
 <P>Whenever an object is fetched from the database or created by the user and registered with Cayenne, it is automatically cached. Accessing this object later (e.g. when traversing a relationship from another object, or doing a lookup by primary key via DataObjectUtils) will not incur an overhead of extra database access. </P>
@@ -147,21 +52,3 @@ Artist a = (Artist) DataObjectUtils.obje
 </DIV></DIV></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: cayenne/site/cms/trunk/content/doc30/inheritance-overview.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/inheritance-overview.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/inheritance-overview.html (original)
+++ cayenne/site/cms/trunk/content/doc30/inheritance-overview.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Inheritance Overview
 
-<!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; Inheritance Overview</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="Inheritance Overview">Inheritance Overview</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="InheritanceOverview-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. We'll discuss them in general terms in this chapter and provide Cayenne-specific details in dedicated chapters. </P>

Modified: cayenne/site/cms/trunk/content/doc30/installation.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/installation.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/installation.html (original)
+++ cayenne/site/cms/trunk/content/doc30/installation.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Installation
 
-<!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; Installation</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="Installation">Installation</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966212">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966212">new page</A></LI>
-          </UL>
-        </DIV>
 	<H3><A name="Installation-SystemRequirements"></A>System Requirements</H3>
 
 <UL>
@@ -130,21 +35,3 @@
 	<LI><A href="cayenne-and-maven.html" title="Cayenne and Maven">Cayenne and Maven</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/introduction-to-cayennemodeler.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc30/introduction-to-cayennemodeler.html?rev=1403615&r1=1403614&r2=1403615&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc30/introduction-to-cayennemodeler.html (original)
+++ cayenne/site/cms/trunk/content/doc30/introduction-to-cayennemodeler.html Tue Oct 30 05:42:06 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Introduction to CayenneModeler
 
-<!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; Introduction to CayenneModeler</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="Introduction to CayenneModeler">Introduction to CayenneModeler</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966132">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966132">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="IntroductiontoCayenneModeler-IntroductiontoCayenneModeler"></A>Introduction to CayenneModeler</H2>
 <P>Cayenne stores mapping and deployment information using a set of XML files with a predefined format. These files can be always edited by hand, but Cayenne goes beyond that. A standard distribution contains CayenneModeler - a Java Swing GUI application that serves as an Object/Relational modeling tool. It is much more than just a specialized XML editor. It provides a comprehensive set of O/R functions, including:</P>
 
@@ -121,21 +26,3 @@
 	<LI><A href="cayenne-user-directory.html" title="Cayenne User Directory">Cayenne User Directory</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