cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r836565 [39/47] - in /websites/staging/cayenne/trunk/content: ./ doc12/ doc20/ doc30/
Date Tue, 30 Oct 2012 05:43:02 GMT
Modified: websites/staging/cayenne/trunk/content/doc30/lifecycle-callbacks.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/lifecycle-callbacks.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/lifecycle-callbacks.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne » Lifecycle Callbacks
 
-<!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; Lifecycle Callbacks</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="Lifecycle Callbacks">Lifecycle Callbacks</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966286">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966286">new page</A></LI>
-          </UL>
-        </DIV>
 	<H2><A name="LifecycleCallbacks-LifecycleCallbacks"></A>Lifecycle Callbacks</H2>
 
 <P>Users can register callback methods that will be invoked during the lifecycle of persistent objects. Callback mechanism is similar to the one defined in the <A href="../CAYJPA/jpa-guide.html" title="JPA Guide">JPA Specification</A>, however there are some noteable differences introduced to better follow the Cayenne object lifecycle. There are eight lifecycle callbacks described below (PostAdd, PrePersist, PostPersist, PreUpdate, PostUpdate, PreRemove, PostRemove, PostLoad). Each one cab be invoked as a <B>callback on a persistent object</B> itself or as a <B>callback on an arbitrary listener object</B>.</P>
@@ -283,21 +188,3 @@ registry.addListener(LifecycleListener.P
 </SPAN>registry.addListener(LifecycleListener.POST_LOAD, Artist.class, <SPAN class="code-quote">&quot;onLoad&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: websites/staging/cayenne/trunk/content/doc30/local-datasources.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/local-datasources.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/local-datasources.html Tue Oct 30 05:42:47 2012
@@ -1,121 +1,8 @@
+Title: Apache Cayenne &raquo; Local DataSources
 
-<!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; Local DataSources</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<META name="robots" content="index,follow">
-<LINK rel="stylesheet" type="text/css" media="screen, projection" href="http://cayenne.apache.org/css/styles.css">
-<LINK rel="stylesheet" type="text/css" media="print" href="http://cayenne.apache.org/css/print.css">
-<LINK rel="shortcut icon" href="http://cayenne.apache.org/img/favicon.ico" type="image/ico">
-<SCRIPT type="text/javascript" src="http://cayenne.apache.org/js/scripts.js"></SCRIPT>
-</HEAD>
-<BODY>
-<DIV id="wrap"><DIV id="wrap-inner">
-
-<DIV id="header">
-	<H1><A href="http://cayenne.apache.org/" title="Return to Apache Cayenne home"><SPAN>The Apache Cayenne Project</SPAN></A></H1>
-	<H2><A href="http://www.apache.org/" title="The Apache Software Foundation"><SPAN>The Apache Software Foundation</SPAN></A></H2>
-</DIV>
-
-<DIV id="container">
-
-<DIV id="sidebar">
-<UL id="nav">
-	<LI><A href="http://cayenne.apache.org/about.html">About</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/why-cayenne.html">Why Cayenne?</A></LI>
-		<!--	<li><a href="http://cayenne.apache.org/features.html">Features</a></li> -->
-			<LI><A href="http://cayenne.apache.org/download.html">Download</A></LI>
-			<LI><A href="http://cayenne.apache.org/success-stories.html">Success Stories</A></LI>
-			<LI><A href="http://cayenne.apache.org/commercial-support.html">Commercial Support</A></LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/documentation.html">Documentation</A>
-		<UL>
-			<LI><A href="http://cayenne.apache.org/doc30/tutorial.html">Getting Started</A></LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc/documentation.html">Development trunk</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc30/documentation.html">Version 3 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc30/overview.html">Overview</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/cayenne-guide.html">Cayenne Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc30/api/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc20/documentation.html">Version 2 (released)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc20/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc20/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-			<LI class="trigger"><A href="http://cayenne.apache.org/doc12/documentation.html">Version 1.2 (archived)</A>
-				<UL>
-					<LI><A href="http://cayenne.apache.org/doc12/user-guide.html">User Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/remote-object-persistence-guide.html">Remote Client Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/modeler-guide.html">Modeler Guide</A></LI>
-					<LI><A href="http://cayenne.apache.org/doc12/api/cayenne/index.html">JavaDoc</A></LI>
-				</UL>
-			</LI>
-		</UL>
-	</LI>
-	<LI><A href="http://cayenne.apache.org/collaboration.html">Collaboration</A>
-		<UL>
-			<LI><A href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</A></LI>
-			<LI><A href="http://cayenne.apache.org/mailing-lists.html">Mailing Lists</A></LI>
-			<LI><A href="http://cwiki.apache.org/CAY">Wiki</A></LI>
-			<LI><A href="http://cayenne.apache.org/code-repository.html">Code Repository</A></LI>
-			<LI><A href="http://cayenne.apache.org/developer-guide.html">Developer Guide</A></LI>
-			<LI><A href="http://cayenne.apache.org/how-can-i-help.html">How Can I Help</A></LI>
-			<LI><A href="http://cayenne.apache.org/contributors.html">Contributors</A></LI>
-		</UL>
-	</LI>
-</UL>
-</DIV>
-
-<HR>
-
-<DIV id="content">
-        <DIV id="bread">
-	  <SPAN><A href="index.html" title="Apache Cayenne Documentation v3.0">Apache Cayenne Documentation v3.0</A>&nbsp;&gt;&nbsp;<A href="documentation.html" title="Documentation">Documentation</A>&nbsp;&gt;&nbsp;<A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>&nbsp;&gt;&nbsp;<A href="preferences-panel.html" title="Preferences Panel">Preferences Panel</A>&nbsp;&gt;&nbsp;<A href="" title="Local DataSources">Local DataSources</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966136">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966136">new page</A></LI>
-          </UL>
-        </DIV>
 	
 <H3><A name="LocalDataSources-LocalDataSources"></A>Local DataSources</H3>
 
 <P>Local DataSource panel allows to configure a number of named DataSources that can be used for local database access from the Modeler, or to speed up creation of new DataNodes. Also since local DataSources can be associated with any DataNodes, regardless of the actual information configured for a given DataNode, it makes them extremely useful to separate your local connection information from the one in the deployment environment. For example a JNDI DataNode can be used for the database access from the Modeler in the absence of JNDI container.</P>
 
 <P><SPAN class="image-wrap" style=""><IMG src="local-datasources.data/prefs-datasource.jpg" style="border: 0px solid black"></SPAN></P>
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <A href="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc30/many-to-many-relationships.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/many-to-many-relationships.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/many-to-many-relationships.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; Many-to-Many Relationships
 
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML lang="en">
-<HEAD>
-<TITLE>Apache Cayenne &raquo; Many-to-Many Relationships</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
-<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="Many-to-Many Relationships">Many-to-Many Relationships</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966195">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966195">new page</A></LI>
-          </UL>
-        </DIV>
 	<H3><A name="Many-to-ManyRelationships-ManytoManyRelationships"></A>Many-to-Many Relationships</H3>
 
 <P>Many-to-many relationships can be modeled in two different ways:</P>
@@ -103,21 +8,3 @@
 	<LI>Making join table transparent to the object model. This is achieved by using flattened relationships <A href="cayennemodeler-flattened-relationships.html" title="CayenneModeler Flattened Relationships">discussed further in this chapter</A>.</LI>
 </UL>
 
-	<HR>
-	<P id="footer">Copyright &copy; 2001-2010 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <A href="http://cayenne.apache.org/privacy-policy.html">Privacy policy.</A></P>
-</DIV>
-
-</DIV>
-
-</DIV></DIV>
-<SCRIPT type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</SCRIPT>
-<SCRIPT type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-7036673-1");
-pageTracker._trackPageview();
-} catch(err) {}</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file

Modified: websites/staging/cayenne/trunk/content/doc30/maven2-cdbgen.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/maven2-cdbgen.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/maven2-cdbgen.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; maven2-cdbgen
 
-<!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-cdbgen</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-cdbgen">maven2-cdbgen</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966294">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966294">new page</A></LI>
-          </UL>
-        </DIV>
 	<P><TT>cdbgen</TT> is an Maven 2 mojo that that uses Cayenne DataMap to drop and/or generate schema objects of a specified database.  By default, it is bound to the <TT>pre-integration-test</TT> phase.  Please see this <A href="http://docs.codehaus.org/display/MAVENUSER/Maven%20and%20Integration%20Testing" class="external-link" rel="nofollow">guide to integration testing with maven2</A> for ideas of how tie this in with your existing test infrastructure.</P>
 
 <H3><A name="maven2-cdbgen-Parameters%28asXMLelements%29"></A>Parameters (as XML elements)</H3>
@@ -221,21 +126,3 @@
 <SPAN class="code-tag">&lt;/build&gt;</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: websites/staging/cayenne/trunk/content/doc30/maven2-cdbimport.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/maven2-cdbimport.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/maven2-cdbimport.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; maven2-cdbimport
 
-<!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-cdbimport</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-cdbimport">maven2-cdbimport</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966295">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966295">new page</A></LI>
-          </UL>
-        </DIV>
 	<P><TT>cdbimport</TT> is a Maven 2 mojo that that uses Cayenne to generate a DataMap based on an existing database schema.  By default, it is bound to the <TT>generate-sources</TT> phase.  This allows you to generate your DataMap prior to building your project, which may be necessary if you are also using the <A href="maven2-cgen.html" title="maven2-cgen">cgen</A> task.</P>
 
 <H3><A name="maven2-cdbimport-Parameters%28asXMLelements%29"></A>Parameters (as XML elements)</H3>
@@ -230,21 +135,3 @@
 <SPAN class="code-tag">&lt;/build&gt;</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: websites/staging/cayenne/trunk/content/doc30/maven2-cgen.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/maven2-cgen.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/maven2-cgen.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; maven2-cgen
 
-<!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-cgen</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-cgen">maven2-cgen</A></SPAN>
-          <UL>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=5966291">edit page</A></LI>
-             <LI><A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=CAYDOC30&fromPageId=5966291">new page</A></LI>
-          </UL>
-        </DIV>
 	<P><TT>cgen</TT> is an Maven 2 mojo that generates and maintains DataObjects source files based on Cayenne DataMap.  By default, it is bound to the <TT>generate-sources</TT> phase. If &quot;makePairs&quot; is set to &quot;true&quot; (default), this task will generate a pair of classes (superclass/subclass) for each ObjEntity in the DataMap. Superclasses should not be changed manually, since they are always overwritten. Subclasses are never overwritten and may be later customized by the user. If &quot;makePairs&quot; is set to &quot;false&quot;, a single class will be generated for each ObjEntity.</P>
 
 <P>By creating custom templates, <TT>cgen</TT> can also be used to generate other output (such as web pages, reports, specialized code templates) based on DataMap information.</P>
@@ -290,21 +195,3 @@
 <SPAN class="code-tag">&lt;/build&gt;</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: websites/staging/cayenne/trunk/content/doc30/maven2-modeler.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/maven2-modeler.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/maven2-modeler.html Tue Oct 30 05:42:47 2012
@@ -1,100 +1,5 @@
+Title: Apache Cayenne &raquo; 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: websites/staging/cayenne/trunk/content/doc30/maven2-plugins.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/maven2-plugins.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/maven2-plugins.html Tue Oct 30 05:42:47 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: websites/staging/cayenne/trunk/content/doc30/migrate-changes-between-model-and-database.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/migrate-changes-between-model-and-database.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/migrate-changes-between-model-and-database.html Tue Oct 30 05:42:47 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: websites/staging/cayenne/trunk/content/doc30/modeler-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/modeler-guide.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/modeler-guide.html Tue Oct 30 05:42:47 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: websites/staging/cayenne/trunk/content/doc30/modeling-database-layer.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc30/modeling-database-layer.html (original)
+++ websites/staging/cayenne/trunk/content/doc30/modeling-database-layer.html Tue Oct 30 05:42:47 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



Mime
View raw message