cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r835315 [1/3] - /websites/staging/cayenne/trunk/content/
Date Wed, 17 Oct 2012 07:31:38 GMT
Author: buildbot
Date: Wed Oct 17 07:31:37 2012
New Revision: 835315

Log:
Staging update by buildbot for cayenne

Added:
    websites/staging/cayenne/trunk/content/about.html
    websites/staging/cayenne/trunk/content/building-cayenne.html
    websites/staging/cayenne/trunk/content/cayenne-management-team.html
    websites/staging/cayenne/trunk/content/code-repository.html
    websites/staging/cayenne/trunk/content/collaboration.html
    websites/staging/cayenne/trunk/content/commercial-support.html
    websites/staging/cayenne/trunk/content/contributors.html
    websites/staging/cayenne/trunk/content/developer-guide.html
    websites/staging/cayenne/trunk/content/documentation-guidelines.html
    websites/staging/cayenne/trunk/content/documentation.html
    websites/staging/cayenne/trunk/content/eclipse.html
    websites/staging/cayenne/trunk/content/getting-started.html
    websites/staging/cayenne/trunk/content/how-can-i-help.html
    websites/staging/cayenne/trunk/content/index.html
    websites/staging/cayenne/trunk/content/legacy-ant-build.html
    websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html
    websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html
    websites/staging/cayenne/trunk/content/legacy-eclipse.html
    websites/staging/cayenne/trunk/content/mailing-lists.html
    websites/staging/cayenne/trunk/content/privacy-policy.html
    websites/staging/cayenne/trunk/content/release-guide-2.0.html
    websites/staging/cayenne/trunk/content/release-guide.html
    websites/staging/cayenne/trunk/content/running-unit-tests.html
    websites/staging/cayenne/trunk/content/submit-patch.html
    websites/staging/cayenne/trunk/content/success-stories.html
    websites/staging/cayenne/trunk/content/why-cayenne.html
Modified:
    websites/staging/cayenne/trunk/content/   (props changed)
    websites/staging/cayenne/trunk/content/download.html

Propchange: websites/staging/cayenne/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Oct 17 07:31:37 2012
@@ -1 +1 @@
-1399130
+1399137

Added: websites/staging/cayenne/trunk/content/about.html
==============================================================================
--- websites/staging/cayenne/trunk/content/about.html (added)
+++ websites/staging/cayenne/trunk/content/about.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,123 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; About</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="About-About"></a></p>
+<h2 id="about">About</h2>
+<p>Explore the following pages to learn more about what Cayenne is and how it
+can help your project.</p>
+<ul>
+<li><a href="why-cayenne?.html">Why Cayenne?</a></li>
+<li><a href="download.html">Download</a></li>
+<li><a href="success-stories.html">Success Stories</a></li>
+<li><a href="commercial-support.html">Commercial Support</a></li>
+</ul>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/building-cayenne.html
==============================================================================
--- websites/staging/cayenne/trunk/content/building-cayenne.html (added)
+++ websites/staging/cayenne/trunk/content/building-cayenne.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,188 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Building Cayenne</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="BuildingCayenne-BuildingCayenne"></a></p>
+<h2 id="building-cayenne">Building Cayenne</h2>
+<p><a name="BuildingCayenne-Prerequisites"></a></p>
+<h3 id="prerequisites">Prerequisites</h3>
+<ul>
+<li><a href="http://maven.apache.org/">Download Maven2</a>.</li>
+<li>
+<p>Check out the repository trunk (or another appropriate branch). eg:</p>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/cayenne/m</span><span class="n">ain</span><span class="sr">/trunk/</span> <span class="n">cayenne</span>
+<span class="n">cd</span> <span class="n">cayenne</span><span class="o">/</span>
+</pre></div>
+
+
+<blockquote>
+<p>All examples below assume the user is in <em>"cayenne"</em> folder.</p>
+</blockquote>
+</li>
+</ul>
+<p><a name="BuildingCayenne-BuildingwithMaven"></a></p>
+<h3 id="building-with-maven">Building with Maven</h3>
+<p>Depending on what you want to do, there are various flavors of the builds
+discussed below.</p>
+<p>Building the framework and installing it to the local repository (the most
+common flavor) :</p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span>
+</pre></div>
+
+
+<p>In order to skip the unit tests (to speed up the build process or because
+some tests are failing), add <em>"-Dmaven.test.skip=true"</em> to any build
+flavor:</p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">Dmaven</span><span class="o">.</span><span class="n">test</span><span class="o">.</span><span class="n">skip</span><span class="o">=</span><span class="n">true</span>
+</pre></div>
+
+
+<p>For the build to produce a release-like assembly, activate "assembly"
+profile. Additionally activate a profile specific for the target platform
+of a given assembly (otherwise assembly profile won't produce anything). </p>
+<p>Source assembly: </p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">Passembly</span><span class="p">,</span><span class="n">src</span>
+</pre></div>
+
+
+<p>Cross-platform assembly:</p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">Passembly</span><span class="p">,</span><span class="n">generic</span>
+</pre></div>
+
+
+<p>Windows assembly:</p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">Passembly</span><span class="p">,</span><span class="n">windows</span>
+</pre></div>
+
+
+<p>Mac OS X assembly:</p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">Passembly</span><span class="p">,</span><span class="n">mac</span>
+</pre></div>
+
+
+<p>Multiple assemblies built at once:
+    mvn clean install -Passembly,src,generic,mac</p>
+<p>To pull the latest docs from Confluence Wiki, a build must be done with
+"wiki-docs" profile activated. Note that unlike the examples above, you
+will need to change to the doc module directory:</p>
+<div class="codehilite"><pre><span class="c"># cd docs/doc</span>
+<span class="c"># mvn -P wiki-docs clean install -Dconfluence.userName=username -Dconfluence.password=password</span>
+<span class="c"># svn ci -m &quot;docs updated&quot;</span>
+</pre></div>
+
+
+<p>If you have a custom keystore under ~/.keystore, you will need to
+explicitly specify a JVM shared keystore to avoid build errors related to
+HTTPS access:</p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="o">-</span><span class="n">P</span> <span class="n">wiki</span><span class="o">-</span><span class="n">docs</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">Dconfluence</span><span class="o">.</span><span class="n">userName</span><span class="o">=</span><span class="n">username</span> <span class="o">-</span><span class="n">Dconfluence</span><span class="o">.</span><span class="n">password</span><span class="o">=</span><span class="n">password</span> <span class="o">\</span>
+   <span class="o">-</span><span class="n">Djavax</span><span class="o">.</span><span class="n">net</span><span class="o">.</span><span class="n">ssl</span><span class="o">.</span><span class="n">trustStore</span><span class="o">=</span><span class="sr">&lt;JAVA_HOME&gt;/lib/s</span><span class="n">ecurity</span><span class="o">/</span><span class="n">cacerts</span>
+</pre></div>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/cayenne-management-team.html
==============================================================================
--- websites/staging/cayenne/trunk/content/cayenne-management-team.html (added)
+++ websites/staging/cayenne/trunk/content/cayenne-management-team.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,152 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Cayenne management team</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p>There are several levels of access to the Cayenne project and source.</p>
+<ol>
+<li>Documentation only access. Access to the Confluence system for creating
+documentation means that these users are able to edit and create content
+which then available on this web site and bundled with the download.</li>
+<li>Committers have direct access to SVN and are able to make changes to the
+entire source repository.</li>
+<li>Project Management Committee (PMC) members have further responsibility
+for the project as a whole and for ensuring that releases meet all the
+appropriate standards.</li>
+<li>PMC Chair. This person has a leadership role in the project and has a
+special responsibility to the Apache board.</li>
+</ol>
+<p>For further details consult the official <a href="http://www.apache.org/foundation/how-it-works.html#roles">Apache handbook</a>
+.</p>
+<p>In addition to the general Apache responsibilities, this is what is
+expected of everyone with privileges within the Cayenne project.</p>
+<p><a name="Cayennemanagementteam-Contribution"></a></p>
+<h3 id="contribution">Contribution</h3>
+<p>Contribution to the project can take many forms. Updating documentation and
+helping users on the mailing lists are just as important as writing code.
+Everyone here is a volunteer, so quantity of effort is not the most
+important factor. Help when you can, but let the rest of the community know
+if you will be out of action for an extended period.</p>
+<p><a name="Cayennemanagementteam-Mailinglists"></a></p>
+<h3 id="mailing-lists">Mailing lists</h3>
+<p>Cayenne takes special pride in the support we give to users of the
+software. That means being helpful to end users where you have the time and
+the answers. Just as importantly, users look to the committers and PMC
+members to set the tone of the mailing lists; keeping them friendly and
+pleasant places to be for all users regardless of their English language
+skills or technical experience. When things might go off the rails, a
+gentle nudge back in the right direction is all that is needed.</p>
+<p><a name="Cayennemanagementteam-Voting"></a></p>
+<h3 id="voting">Voting</h3>
+<p>Each release should be voted on by the committers and PMC members. Even
+though committer votes cannot count officially by Apache rules, they will
+be given serious consideration by the PMC members. Further voting details
+are in the release pages of this site.</p>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/code-repository.html
==============================================================================
--- websites/staging/cayenne/trunk/content/code-repository.html (added)
+++ websites/staging/cayenne/trunk/content/code-repository.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,183 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Code Repository</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="CodeRepository-SourceCodeAccess"></a></p>
+<h2 id="source-code-access">Source Code Access</h2>
+<p>Cayenne's source code is officially hosted in Subversion by the Apache
+Software Foundation.  Read-only git is also supported for those looking for
+a distributed SCM.</p>
+<p><a name="CodeRepository-SubversionRepository"></a></p>
+<h3 id="subversion-repository">Subversion Repository</h3>
+<p>Cayenne's code is held in a Subversion repository which can be accessed
+without login.</p>
+<ul>
+<li>If you use Eclipse, see <a href="eclipse.html">Eclipse</a>
+ page for instructions on checking out multiple Cayenne projects. </li>
+<li>More information on Apache subversion is available from <a href="http://www.apache.org/dev/version-control.html">here</a></li>
+</ul>
+<p>Code is located here:</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Anonymous Access</td>
+<td><a href="http://svn.apache.org/repos/asf/cayenne/main/trunk/">http://svn.apache.org/repos/asf/cayenne/main/trunk/</a></td>
+</tr>
+<tr>
+<td>Committer Access</td>
+<td><a href="https://svn.apache.org/repos/asf/cayenne/main/trunk/">https://svn.apache.org/repos/asf/cayenne/main/trunk/</a></td>
+</tr>
+</tbody>
+</table>
+<p><a name="CodeRepository-GitRepository"></a></p>
+<h3 id="git-repository">Git Repository</h3>
+<p>A read-only git mirror is also available for Cayenne.  Committers can use
+the git mirror to commit to the official Subversion server through the use
+of git-svn.</p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>git Clone URL</td>
+<td><a href="git://git.apache.org/cayenne.git.html">git://git.apache.org/cayenne.git</a></td>
+</tr>
+<tr>
+<td>HTTP Clone URL</td>
+<td><a href="http://git.apache.org/cayenne.git">http://git.apache.org/cayenne.git</a></td>
+</tr>
+</tbody>
+</table>
+<p>Once you clone the repository, you'll want to configure it to stay
+synchronized with the ASF Subversion server:</p>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">clone</span> <span class="n">git:</span><span class="sr">//gi</span><span class="n">t</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">cayenne</span>
+<span class="n">cd</span> <span class="n">cayenne</span><span class="sr">/.git; wget http://git.apache.org/</span><span class="n">authors</span><span class="o">.</span><span class="n">txt</span><span class="p">;</span> <span class="n">cd</span> <span class="o">..</span>
+<span class="n">git</span> <span class="n">config</span> <span class="n">svn</span><span class="o">.</span><span class="n">authorsfile</span> <span class="s">&quot;.git/authors.txt&quot;</span>
+<span class="n">git</span> <span class="n">svn</span> <span class="n">init</span> <span class="o">--</span><span class="n">prefix</span><span class="o">=</span><span class="n">origin</span><span class="sr">/ --tags=tags --trunk=trunk --branches=branches https://svn.apache.org/</span><span class="n">repos</span><span class="sr">/asf/c</span><span class="n">ayenne</span><span class="o">/</span><span class="n">main</span>
+<span class="n">git</span> <span class="n">svn</span> <span class="n">rebase</span>
+</pre></div>
+
+
+<p><a name="CodeRepository-WebAccess"></a></p>
+<h3 id="web-access">Web Access</h3>
+<p>For a graphical overview of the code repository and change history:</p>
+<p><a href="http://fisheye6.atlassian.com/browse/cayenne.html">Fisheye web interface </a></p>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/collaboration.html
==============================================================================
--- websites/staging/cayenne/trunk/content/collaboration.html (added)
+++ websites/staging/cayenne/trunk/content/collaboration.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Collaboration</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="Collaboration-Collaboration"></a></p>
+<h2 id="collaboration">Collaboration</h2>
+<p>Cayenne is the result of collaboration of many skilled people. This is a
+set of links to access Cayenne collaboration resources and information.</p>
+<ul>
+<li><a href="http://issues.apache.org/cayenne/">Bug/Feature Tracker</a></li>
+<li><a href="mailing-lists.html">Mailing Lists</a></li>
+<li><a href="cay:index.html">Wiki</a></li>
+<li><a href="code-repository.html">Code Repository</a></li>
+<li><a href="developer-guide.html">Developer Guide</a></li>
+<li><a href="how-can-i-help?.html">How Can I Help?</a></li>
+<li><a href="contributors.html">Contributors</a></li>
+</ul>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/commercial-support.html
==============================================================================
--- websites/staging/cayenne/trunk/content/commercial-support.html (added)
+++ websites/staging/cayenne/trunk/content/commercial-support.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,118 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Commercial Support</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="CommercialSupport-CommercialSupportAndConsulting"></a></p>
+<h2 id="commercial-support-and-consulting">Commercial Support And Consulting</h2>
+<p>Cayenne commercial support, consulting services, and training are available
+from the company started by two of its original authors:
+<a href="http://objectsyle.com/">http://objectstyle.com/</a>. </p>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/contributors.html
==============================================================================
--- websites/staging/cayenne/trunk/content/contributors.html (added)
+++ websites/staging/cayenne/trunk/content/contributors.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,327 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Contributors</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="Contributors-Contributors"></a></p>
+<h2 id="contributors">Contributors</h2>
+<p><a name="Contributors-CommittersandProjectManagementCommittee"></a></p>
+<h3 id="committers-and-project-management-committee">Committers and Project Management Committee</h3>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Role</th>
+<th>Email</th>
+<th>Website</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Andrus Adamchik</td>
+<td>PMC, Chair</td>
+<td>aadamchik at apache dot org</td>
+<td><a href="http://adamchik.org">http://adamchik.org</a>(personal) <a href="http://objectstyle.com">http://objectstyle.com</a> (business)</td>
+</tr>
+<tr>
+<td>Cris Daniluk</td>
+<td>Committer</td>
+<td>cdaniluk at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Bill Dudney</td>
+<td>PMC</td>
+<td>bdudney at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Malcolm Edgar</td>
+<td>Committer</td>
+<td>medgar at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Michael Gentry</td>
+<td>PMC</td>
+<td>mgentry at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Tore Halset</td>
+<td>PMC</td>
+<td>torehalset at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Dzmitry Kazimirchyk</td>
+<td>Committer</td>
+<td>dkazimirchyk at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Xenia Khailenka</td>
+<td>Committer</td>
+<td>kseniak at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Mike Kienenberger</td>
+<td>PMC</td>
+<td>mkienenb at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Kevin Menard</td>
+<td>PMC</td>
+<td>kmenard at apache dot org</td>
+<td><a href="http://www.servprise.com/">http://www.servprise.com/</a></td>
+</tr>
+<tr>
+<td>Aristedes Maniatis</td>
+<td>PMC</td>
+<td>amaniatis at apache dot org</td>
+<td><a href="http://www.ish.com.au">http://www.ish.com.au</a></td>
+</tr>
+<tr>
+<td>Andrey Razumovsky</td>
+<td>PMC</td>
+<td>andrey at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Andriy Shapochka</td>
+<td>Committer</td>
+<td>ashapochka at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Olga Tkachova (Ольга Ткачева)</td>
+<td>Committer</td>
+<td>oltka at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Robert Zeigler</td>
+<td>Committer</td>
+<td>robertdzeigler at apache dot org</td>
+<td></td>
+</tr>
+<tr>
+<td>Evgeny Ryabitskiy</td>
+<td>Committer</td>
+<td>evgeny at apache dot org</td>
+<td><a href="http://www.diasoft.ru/">http://www.diasoft.ru/</a></td>
+</tr>
+</tbody>
+</table>
+<p><a name="Contributors-EmeritusCommitters"></a></p>
+<h3 id="emeritus-committers">Emeritus Committers</h3>
+<p>Committers who are no longer active in the community. We wish them well and
+hope to see them return.</p>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Email</th>
+<th>Website</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Holger Hoffstaette</td>
+<td>holger at wizards dot de</td>
+<td></td>
+</tr>
+<tr>
+<td>Craig Miskell</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>Michael Shengaout</td>
+<td>mshenga at pobox dot org</td>
+<td><a href="http://reusablesoftwarecomponents.com">http://reusablesoftwarecomponents.com</a></td>
+</tr>
+<tr>
+<td>Eric Schneider</td>
+<td>eric at centralparksoftware dot com</td>
+<td><a href="http://www.centralparksoftware.com/">http://www.centralparksoftware.com/</a></td>
+</tr>
+</tbody>
+</table>
+<p><a name="Contributors-OtherContributors"></a></p>
+<h3 id="other-contributors">Other Contributors</h3>
+<p>These is a possibly incomplete list of people who helped in many different
+ways, including graphic design, testing, providing bug fix patches, etc. We
+really appreciate your help (if you think this page is missing a name that
+should be mentioned, please send a note to the dev list):</p>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Email</th>
+<th>Website</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Arndt Brenschede</td>
+<td>Arndt dot Brenschede at diamos dot com</td>
+<td></td>
+</tr>
+<tr>
+<td>Anna Drapeza</td>
+<td>anna at ipm dot by</td>
+<td></td>
+</tr>
+<tr>
+<td>Scott Finnery</td>
+<td>scott at codefuey dot com</td>
+<td></td>
+</tr>
+<tr>
+<td>Nataliya Kholodna</td>
+<td>nkholodna at mail dot ru</td>
+<td></td>
+</tr>
+<tr>
+<td>Dirk Olmes</td>
+<td>dirk dot olmes at gmx dot de</td>
+<td></td>
+</tr>
+<tr>
+<td>Anton Apolit</td>
+<td>anton at logical dash process dot com</td>
+<td></td>
+</tr>
+<tr>
+<td>Fabricio Voznika</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>David Cooper</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>Garry Watkins</td>
+<td></td>
+<td></td>
+</tr>
+<tr>
+<td>Bruce Martin</td>
+<td></td>
+<td><a href="http://brucemartin.net/">http://brucemartin.net/</a></td>
+</tr>
+</tbody>
+</table>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/developer-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/developer-guide.html (added)
+++ websites/staging/cayenne/trunk/content/developer-guide.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,151 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Developer 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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="DeveloperGuide-DeveloperGuide"></a></p>
+<h2 id="developer-guide">Developer Guide</h2>
+<p>This is the most up-to-date document explaining internal Cayenne
+development procedures, e.g. how to obtain the latest source code, compile
+it, run unit tests, etc. "Developers" in this context are people who
+contribute code to Cayenne. If you downloaded Cayenne to use it in a Java
+application and do not intend to submit patches or extension, this
+information is probably of no use to you. You may want to check out the <a href="caydoc:documentation.html">User Guide</a>
+ instead. </p>
+<p><a name="DeveloperGuide-Howdevelopmenthappens"></a></p>
+<h3 id="how-development-happens">How development happens</h3>
+<ul>
+<li><a href="cayenne-management-team.html">Cayenne management team</a></li>
+<li>How do I join?</li>
+</ul>
+<p><a name="DeveloperGuide-Gettingstarted"></a></p>
+<h3 id="getting-started">Getting started</h3>
+<ul>
+<li><a href="code-repository.html">Source Code Access</a></li>
+<li><a href="documentation-guidelines.html">Documentation Guidelines</a></li>
+</ul>
+<p><a name="DeveloperGuide-Workingwiththelatestversion(Cayenne3.*)"></a></p>
+<h3 id="working-with-the-latest-version-cayenne-3">Working with the latest version (Cayenne 3.*)</h3>
+<ul>
+<li><a href="eclipse.html">Working in Eclipse</a></li>
+<li><a href="building-cayenne.html">Building Cayenne</a></li>
+<li><a href="release-guide.html">Creating a Release</a></li>
+<li><a href="running-unit-tests.html">Running Unit Tests</a></li>
+</ul>
+<p><a name="DeveloperGuide-WorkingwithlegacyCayenne(Cayenne2.0.xand1.2.x)"></a></p>
+<h3 id="working-with-legacy-cayenne-cayenne-20x-and-12x">Working with legacy Cayenne (Cayenne 2.0.x and 1.2.x)</h3>
+<ul>
+<li><a href="legacy-ant-build.html">Building with Ant</a></li>
+<li><a href="legacy-eclipse.html">Working in Eclipse</a></li>
+<li><a href="release-guide-2.0.html">Creating a Release</a></li>
+<li><a href="legacy-ant-unit-tests.html">Running Unit Tests</a></li>
+<li><a href="legacy-ant-documentation-export.html">Updating Documentation</a></li>
+</ul>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/documentation-guidelines.html
==============================================================================
--- websites/staging/cayenne/trunk/content/documentation-guidelines.html (added)
+++ websites/staging/cayenne/trunk/content/documentation-guidelines.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,149 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Documentation Guidelines</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="DocumentationGuidelines-DocumentationGuidelines"></a></p>
+<h2 id="documentation-guidelines">Documentation Guidelines</h2>
+<p>Versioned Cayenne documentation is maintained on this site. Documentation
+corresponding to the release currently under development is placed in <a href="caydoc:index.html">CAYDOC</a>
+ space. </p>
+<p><a name="DocumentationGuidelines-AuthoringTips"></a></p>
+<h3 id="authoring-tips">Authoring Tips</h3>
+<ul>
+<li>Links to other spaces must be entered as full URLs, otherwise they'll
+come across as plain text on export.</li>
+<li>Multiple levels of sub-chapters are supported.</li>
+<li>Use Confluence "parent page" functionality to build the hierarchy of
+pages</li>
+<li>To order child pages within the parent, and to build a sort of local
+table of contents, use an "excerpt" macro on the parent page, listing
+children in the expected order in the bottom of the page:</li>
+</ul>
+<p><code></p>
+<blockquote>
+<p>...<br />
+   h3. Sections<br />
+   {excerpt}<br />
+   # [Chapter 1]<br />
+   # [Chapter 2]<br />
+   # [Chapter 3]<br />
+   {excerpt}<br />
+</code></p>
+</blockquote>
+<h3 id="versioning">Versioning</h3>
+<p>Once a stable release is branched, documentation is also branched to a
+space with name like CAYDOC_X_X. Making a space copy is a manual process
+that requires exporting the space, manually changing the name, and
+reimporting as a different space name:
+<a href="http://confluence.atlassian.com/pages/viewpage.action?pageId=169578">http://confluence.atlassian.com/pages/viewpage.action?pageId=169578</a>.</p>
+<h3 id="refreshing-documentation-from-wiki">Refreshing Documentation from Wiki</h3>
+<p>See [Building Cayenne] chapter.</p>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Added: websites/staging/cayenne/trunk/content/documentation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/documentation.html (added)
+++ websites/staging/cayenne/trunk/content/documentation.html Wed Oct 17 07:31:37 2012
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Documentation</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/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="/">Home</a></span>
+          <ul>
+             <li><a href="$confluenceUri/pages/editpage.action?pageId=$page.id">edit page</a></li>
+             <li><a href="$confluenceUri/pages/createpage.action?spaceKey=$page.spaceKey&fromPageId=$page.id">new page</a></li>
+          </ul>
+        </div>
+	<p><a name="Documentation-Documentation"></a></p>
+<h2 id="documentation">Documentation</h2>
+<p>Documentation, the JavaDoc API, examples and articles can all be found
+here.</p>
+<ul>
+<li><a href="caydoc30:tutorial.html">Getting Started</a></li>
+<li><a href="caydoc30:documentation.html">Version 3.0 (release candidate)</a></li>
+<li><a href="caydoc20:documentation.html">Version 2.0 (stable)</a></li>
+<li><a href="caydoc12:documentation.html">Version 1.2 (stable)</a></li>
+</ul>
+<p><a name="Documentation-ExternalDocumentation"></a></p>
+<h2 id="external-documentation">External Documentation</h2>
+<p>This section lists documentation and reference materials that are
+maintained outside of Cayenne project.</p>
+<ul>
+<li><a href="http://sourceforge.net/projects/tapcaycrud">TapCayCrud</a> - a Tapestry/Cayenne/Maven2 tutorial.</li>
+</ul>
+	<hr>
+	<p id="footer">Copyright &#169; 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>

Modified: websites/staging/cayenne/trunk/content/download.html
==============================================================================
--- websites/staging/cayenne/trunk/content/download.html (original)
+++ websites/staging/cayenne/trunk/content/download.html Wed Oct 17 07:31:37 2012
@@ -25,7 +25,6 @@
 	<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>
@@ -228,4 +227,4 @@ var pageTracker = _gat._getTracker("UA-7
 pageTracker._trackPageview();
 } catch(err) {}</script>
 </body>
-</html>
\ No newline at end of file
+</html>



Mime
View raw message