cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r836575 [1/2] - /websites/staging/cayenne/trunk/content/
Date Tue, 30 Oct 2012 09:51:24 GMT
Author: buildbot
Date: Tue Oct 30 09:51:23 2012
New Revision: 836575

Log:
Staging update by buildbot for cayenne

Modified:
    websites/staging/cayenne/trunk/content/   (props changed)
    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/download.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/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/support.html
    websites/staging/cayenne/trunk/content/why-cayenne.html

Propchange: websites/staging/cayenne/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Oct 30 09:51:23 2012
@@ -1 +1 @@
-1403615
+1403645

Modified: websites/staging/cayenne/trunk/content/about.html
==============================================================================
--- websites/staging/cayenne/trunk/content/about.html (original)
+++ websites/staging/cayenne/trunk/content/about.html Tue Oct 30 09:51:23 2012
@@ -85,20 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/building-cayenne.html
==============================================================================
--- websites/staging/cayenne/trunk/content/building-cayenne.html (original)
+++ websites/staging/cayenne/trunk/content/building-cayenne.html Tue Oct 30 09:51:23 2012
@@ -85,86 +85,8 @@
 
 <hr>
 
-<div id="content">
-	<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-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
-
 </div>
 
 </div></div>

Modified: websites/staging/cayenne/trunk/content/cayenne-management-team.html
==============================================================================
--- websites/staging/cayenne/trunk/content/cayenne-management-team.html (original)
+++ websites/staging/cayenne/trunk/content/cayenne-management-team.html Tue Oct 30 09:51:23 2012
@@ -85,49 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/code-repository.html
==============================================================================
--- websites/staging/cayenne/trunk/content/code-repository.html (original)
+++ websites/staging/cayenne/trunk/content/code-repository.html Tue Oct 30 09:51:23 2012
@@ -85,74 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/collaboration.html
==============================================================================
--- websites/staging/cayenne/trunk/content/collaboration.html (original)
+++ websites/staging/cayenne/trunk/content/collaboration.html Tue Oct 30 09:51:23 2012
@@ -85,23 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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="support.html">Support</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-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/commercial-support.html
==============================================================================
--- websites/staging/cayenne/trunk/content/commercial-support.html (original)
+++ websites/staging/cayenne/trunk/content/commercial-support.html Tue Oct 30 09:51:23 2012
@@ -85,15 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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://objectstyle.com/">http://objectstyle.com/</a>. </p>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/contributors.html
==============================================================================
--- websites/staging/cayenne/trunk/content/contributors.html (original)
+++ websites/staging/cayenne/trunk/content/contributors.html Tue Oct 30 09:51:23 2012
@@ -85,224 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/developer-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/developer-guide.html (original)
+++ websites/staging/cayenne/trunk/content/developer-guide.html Tue Oct 30 09:51:23 2012
@@ -85,48 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/documentation-guidelines.html
==============================================================================
--- websites/staging/cayenne/trunk/content/documentation-guidelines.html (original)
+++ websites/staging/cayenne/trunk/content/documentation-guidelines.html Tue Oct 30 09:51:23 2012
@@ -85,46 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/documentation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/documentation.html (original)
+++ websites/staging/cayenne/trunk/content/documentation.html Tue Oct 30 09:51:23 2012
@@ -85,28 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<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="caydoc:documentation.html">Version 3.1 (beta)</a></li>
-<li><a href="caydoc30:documentation.html">Version 3.0 (stable release)</a></li>
-<li><a href="caydoc20:documentation.html">Version 2.0</a></li>
-<li><a href="caydoc12:documentation.html">Version 1.2</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-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/download.html
==============================================================================
--- websites/staging/cayenne/trunk/content/download.html (original)
+++ websites/staging/cayenne/trunk/content/download.html Tue Oct 30 09:51:23 2012
@@ -85,125 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<p><a name="Download-Download"></a></p>
-<h2 id="download">Download</h2>
-<p><em>KEYS file to verify the file signatures can be <a href="http://www.apache.org/dist/cayenne/KEYS">found here</a>
-.</em></p>
-<p><a name="Download-LatestBetaRelease-3.1B1"></a></p>
-<h3 id="latest-beta-release-31b1-beta">Latest Beta Release - 3.1B1 (Beta)</h3>
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.1B1.tar.gz">Cayenne 3.1B1</a>
- binary distribution with cross-platform Java CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.1B1.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.1B1.tar.gz.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.1B1-macosx.dmg">Cayenne 3.1B1</a>
- binary distribution with Mac OS X CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.1B1-macosx.dmg.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.1B1-macosx.dmg.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.1B1-win.zip">Cayenne 3.1B1</a>
- binary distribution with Windows CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.1B1-win.zip.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.1B1-win.zip.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.1B1-src.tar.gz">Cayenne 3.1B1</a>
- source distribution
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.1B1-src.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.1B1-src.tar.gz.md5">md5</a>
-)</li>
-<li><a href="http://svn.apache.org/repos/asf/cayenne/main/tags/3.1B1/docs/doc/src/main/resources/RELEASE-NOTES.txt">Release Notes</a>
-.</li>
-</ul>
-<p><a name="Download-LatestStableRelease-3.0.2"></a></p>
-<h3 id="latest-stable-release-302">Latest Stable Release - 3.0.2</h3>
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.0.2.tar.gz">Cayenne 3.0.2</a>
- binary distribution with cross-platform Java CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.0.2.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.0.2.tar.gz.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.0.2-macosx.dmg">Cayenne 3.0.2</a>
- binary distribution with Mac OS X CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.0.2-macosx.dmg.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.0.2-macosx.dmg.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.0.2-win.zip">Cayenne 3.0.2</a>
- binary distribution with Windows CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.0.2-win.zip.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.0.2-win.zip.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.0.2-src.tar.gz">Cayenne 3.0.2</a>
- source distribution
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.0.2-src.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.0.2-src.tar.gz.md5">md5</a>
-)</li>
-<li><a href="http://svn.apache.org/repos/asf/cayenne/main/tags/3.0.2/docs/doc/src/main/resources/RELEASE-NOTES.txt">Release Notes</a>
-.</li>
-</ul>
-<p><a name="Download-LatestDevMilestoneRelease-3.1M3(Unstable)"></a></p>
-<h3 id="latest-dev-milestone-release-31m3-unstable">Latest Dev Milestone Release - 3.1M3 (Unstable)</h3>
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.1M3.tar.gz">Cayenne 3.1M3</a>
- binary distribution with cross-platform Java CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.1M3.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.1M3.tar.gz.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.1M3-macosx.dmg">Cayenne 3.1M3</a>
- binary distribution with Mac OS X CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.1M3-macosx.dmg.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.1M3-macosx.dmg.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.1M3-win.zip">Cayenne 3.1M3</a>
- binary distribution with Windows CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.1M3-win.zip.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.1M3-win.zip.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-3.1M3-src.tar.gz">Cayenne 3.1M3</a>
- source distribution
-(<a href="http://www.apache.org/dist/cayenne/cayenne-3.1M3-src.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-3.1M3-src.tar.gz.md5">md5</a>
-)</li>
-<li><a href="http://svn.apache.org/repos/asf/cayenne/main/tags/3.1M3/docs/doc/src/main/resources/RELEASE-NOTES.txt">Release Notes</a>
-.</li>
-</ul>
-<p><a name="Download-OlderReleases"></a></p>
-<h3 id="older-releases">Older Releases</h3>
-<ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-2.0.4.tar.gz">Cayenne 2.0.4</a>
- with cross-platform Java CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4.tar.gz.md5">md5</a>
-)</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-2.0.4-macosx.dmg">Cayenne 2.0.4</a>
- with Mac OS X CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4-macosx.dmg.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4-macosx.dmg.md5">md5</a>
-)</li>
-<li>
-<p><a href="http://www.apache.org/dyn/closer.cgi/cayenne/cayenne-2.0.4-win.zip">Cayenne 2.0.4</a>
- with Windows CayenneModeler. 
-(<a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4-win.zip.asc">pgp</a>, <a href="http://www.apache.org/dist/cayenne/cayenne-2.0.4-win.zip.md5">md5</a>
-)</p>
-</li>
-<li>
-<p><a href="http://prdownloads.sourceforge.net/cayenne/cayenne-1.2.4.tar.gz">Cayenne 1.2.4</a>
- with cross-platform Java CayenneModeler.</p>
-</li>
-<li><a href="http://prdownloads.sourceforge.net/cayenne/cayenne-1.2.4-macosx.dmg">Cayenne 1.2.4</a>
- with Mac OS X CayenneModeler.</li>
-<li><a href="http://prdownloads.sourceforge.net/cayenne/cayenne-1.2.4-win.zip">Cayenne 1.2.4</a>
- with Windows CayenneModeler.</li>
-</ul>
-<p><a name="Download-LegacyReleases"></a></p>
-<h3 id="legacy-releases">Legacy Releases</h3>
-<ul>
-<li><a href="http://archive.apache.org/dist/cayenne/">All Apache Cayenne releases</a>
-.</li>
-<li><a href="http://sourceforge.net/project/showfiles.php?group_id=48132">All pre-Apache (SourceForge) Cayenne Releases</a>
-.</li>
-</ul>
-<p><a name="Download-Nightlybuilds"></a></p>
-<h3 id="nightly-builds">Nightly builds</h3>
-<ul>
-<li><a href="http://builds.apache.org/hudson/job/Cayenne-trunk/lastBuild/">Individual Cayenne modules</a>
- are built from the SVN trunk by our continuous integration server.</li>
-<li><a href="http://svn.apache.org/repos/asf/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt">Release Notes</a>
- for the development trunk.</li>
-</ul>
-<p><a name="Download-Maven"></a></p>
-<h3 id="maven">Maven</h3>
-<p>Cayenne artifacts are available from <a href="http://search.maven.org/#search|ga|1|g%3A%22org.apache.cayenne%22">Maven Central</a> for use with Maven, Ivy, Gradle or any other dependency management tool. </p>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/eclipse.html Tue Oct 30 09:51:23 2012
@@ -85,48 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<p><a name="Eclipse-UsingEclipsewithMavenizedCayenne"></a></p>
-<h2 id="using-eclipse-with-mavenized-cayenne">Using Eclipse with Mavenized Cayenne</h2>
-<p><em>(starting with version 3.0)</em></p>
-<ul>
-<li>
-<p>Get code from Subversion and <a href="building-cayenne.html">build it from command line</a>
- to seed the local repository.  <em>Do not use "mvn eclipse:eclipse"</em> -- the
-.project and .classpath files for eclipse are already in svn.</p>
-</li>
-<li>
-<p>Create a workspace outside of the main checkout folder. Make sure the
-default JRE in Eclipse is 1.5.</p>
-</li>
-<li>
-<p>Install <a href="http://m2eclipse.sonatype.org/">Maven2 Eclipse plugin</a></p>
-</li>
-<li>
-<p>Install <a href="http://subclipse.tigris.org/">Subclipse Eclipse plugin</a>
- if you are planning to use SVN.</p>
-</li>
-<li>
-<p>Import modules into the eclipse workspace. You don't have to import all
-modules, only those that you are planning to work on, as the projects do
-not have Eclipse-level dependencies on each other (dependencies are
-resolved via the Maven2 plugin and maven repository jars). Here is the
-modules you might want to have in the workspace:</p>
-</li>
-<li>
-<p><em>framework/cayenne-jdk1.5-unpublished</em></p>
-</li>
-<li><em>framework/cayenne-modeler</em></li>
-<li><em>framework/cayenne-tools</em></li>
-</ul>
-<p>Also possibly</p>
-<ul>
-<li><em>framework/maven-cayenne-plugin</em></li>
-<li><em>framework/maven-cayenne-modeler-plugin</em></li>
-</ul>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/getting-started.html
==============================================================================
--- websites/staging/cayenne/trunk/content/getting-started.html (original)
+++ websites/staging/cayenne/trunk/content/getting-started.html Tue Oct 30 09:51:23 2012
@@ -85,12 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<p><a name="Gettingstarted-Gettingstarted"></a></p>
-<h2 id="getting-started">Getting started</h2>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/how-can-i-help.html
==============================================================================
--- websites/staging/cayenne/trunk/content/how-can-i-help.html (original)
+++ websites/staging/cayenne/trunk/content/how-can-i-help.html Tue Oct 30 09:51:23 2012
@@ -85,30 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<p><a name="HowcanIhelp?-HowCanIHelp?"></a></p>
-<h2 id="how-can-i-help">How Can I Help?</h2>
-<p>Every volunteer project gets its strength from its participants. We invite
-everybody interested to participate in Cayenne. If you are willing to help,
-this can be done in many different ways:</p>
-<ul>
-<li>By contributing code.</li>
-<li>By contributing documentation.</li>
-<li>By testing Cayenne and reporting bugs.</li>
-<li>By using Cayenne and reporting bugs.</li>
-<li>By suggesting your own ideas on the mailing list and contributing code
-implementing them.</li>
-</ul>
-<p>If you want to contribute to Cayenne, first you should probably subscribe
-to developer mailing list to see what issues are discussed and to
-communicate with the project team. Code contributions are made via patches
-submitted via the the bug tracker. For more details read the Developer
-Guide that describes where the source code is, how to build it, etc.</p>
-<p>Read on to understand how to <a href="submit-patch.html">submit a patch</a>
-.</p>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/index.html (original)
+++ websites/staging/cayenne/trunk/content/index.html Tue Oct 30 09:51:23 2012
@@ -85,48 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<p><a name="Index-ObjectRelationalMapping,PersistenceandCachingforJava"></a></p>
-<h2 id="object-relational-mapping-persistence-and-caching-for-java">Object Relational Mapping, Persistence and Caching for Java</h2>
-<p>Apache Cayenne(tm) is an open source persistence framework licensed
-under the Apache License, providing object-relational mapping (ORM) and <a href="caydoc/remote-object-persistence-guide.html">remoting services</a>
-. With a wealth of unique and powerful features, Cayenne can address a wide
-range of persistence needs. Cayenne seamlessly binds one or more database
-schemas directly to Java objects, managing atomic commit and rollbacks, SQL
-generation, joins, sequences, and more. With Cayenne's Remote Object
-Persistence, those Java objects can even be persisted out to clients via
-Web Services.</p>
-<p>Cayenne is designed to be easy to use,  without sacrificing flexibility or
-design. To that end, Cayenne supports database reverse engineering and
-generation, as well as a Velocity-based class generation engine. All of
-these functions can be controlled directly through the CayenneModeler, a
-fully functional GUI tool. No cryptic XML or annotation based configuration
-is required! An entire database schema can be mapped directly to Java
-objects within minutes, all from the comfort of the GUI-based
-CayenneModeler.</p>
-<p>Cayenne supports numerous other features, including caching, a complete
-object query syntax, relationship pre-fetching, on-demand object and
-relationship faulting, object inheritance, database auto-detection, and
-generic persisted objects. Most importantly, Cayenne can scale up or down
-to virtually any project size. With a mature, 100% open source framework,
-an energetic user community, and a track record of solid performance in
-high-volume  environments, Cayenne is an exceptional choice for persistence
-services.</p>
-<p><a name="Index-News"></a></p>
-<h2 id="news">News</h2>
-<p>{blog-posts:4|content=excerpts}</p>
-<p><a name="Index-CayenneModeler"></a></p>
-<h2 id="cayenne-modeler">Cayenne Modeler</h2>
-<p><img alt="Modeler" src="/img/modeler-thumb.png" /> Cayenne is distributed with CayenneModeler
-- a complete GUI mapping tool that supports reverse-engineering of RDBMS
-schemas, working with database mappings and generation of Java source code
-for the persistent objects.</p>
-<p>Persistent Java classes are generated and synchronized with the mapping
-using the Modeler or alternatively with an Ant task. A database SQL schema
-can be generated from the Modeler and also with simple API calls.</p>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/legacy-ant-build.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-build.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-build.html Tue Oct 30 09:51:23 2012
@@ -85,22 +85,8 @@
 
 <hr>
 
-<div id="content">
-	<p>This procedure applies to versions 1.2 and 2.0 that are built with Ant. To
-build Cayenne with Ant, check out the appropriate source code branch from
-Subversion and perform the following command to see available targets:</p>
-<div class="codehilite"><pre><span class="c"># cd cayenne/cayenne-ant</span>
-<span class="c"># ant help</span>
-</pre></div>
 
 
-<p>Required ant version - 1.6.<em> or newer; required JDK version - 1.5.</em> or
-newer. Note that compiled binaries are JDK 1.4 compatible, still JDK 1.5 is
-needed to build a few extensions.</p>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
-
 </div>
 
 </div></div>

Modified: websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html Tue Oct 30 09:51:23 2012
@@ -85,19 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<p>Prior to a release latest documentation is exported from Confluence via a
-web service to a folder under subversion control
-<em>cayenne/cayenne-other/wiki-docs</em>. This can be done with Ant:</p>
-<div class="codehilite"><pre><span class="c1"># cd cayenne/cayenne-ant</span>
-<span class="c1"># ant doc -Dcayenne.confluence.user=username -Dcayenne.confluence.password=secret</span>
-<span class="c1"># cd ../cayenne-other</span>
-<span class="o">...</span> <span class="n">add</span> <span class="k">new</span> <span class="n">pages</span> <span class="o">...</span> <span class="n">remove</span> <span class="n">deleted</span> <span class="n">page</span> <span class="o">...</span>
-<span class="c1"># svn commit -m &quot;documentation export for release X.Y.Z&quot;</span>
-</pre></div>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html Tue Oct 30 09:51:23 2012
@@ -85,103 +85,8 @@
 
 <hr>
 
-<div id="content">
-	<p>Cayenne provides a comprehensive suite of unit tests. To execute unit tests
-you must first <a href="code-repository.html">get Cayenne from SVN</a>
-, install JDK 1.5 and obtain the latest Ant.</p>
-<p><a name="LegacyAntUnitTests-SummaryofBuildProperties"></a></p>
-<h2 id="summary-of-build-properties">Summary of Build Properties</h2>
-<p>These properties can be passed to ant build via <em>-DpropName=value</em>.</p>
-<table>
-<thead>
-<tr>
-<th>Property</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><em>cayenne.test.connection</em></td>
-<td>Named connection source (see below)</td>
-</tr>
-<tr>
-<td><em>test.filter</em></td>
-<td>Running a subset of tests (see below)</td>
-</tr>
-<tr>
-<td><em>cayenne.test.schema.skip</em></td>
-<td>If "true", won't attempt to recreate the test database, i.e. the database must already be present.</td>
-</tr>
-</tbody>
-</table>
-<p><a name="LegacyAntUnitTests-RunningAgainstEmbeddedHSQLDB"></a></p>
-<h2 id="running-against-embedded-hsqldb">Running Against Embedded HSQLDB</h2>
-<p>No extra setup is required. Just run Ant:</p>
-<div class="codehilite"><pre><span class="c"># cd cayenne/cayenne-ant</span>
-<span class="c"># ant test</span>
-</pre></div>
 
 
-<p>Optionally you may run JDK 1.4 tests only (e.g. if you don't have JDK 1.5
-on your machine):</p>
-<div class="codehilite"><pre><span class="c"># cd cayenne/cayenne-ant</span>
-<span class="c"># ant test-1_4</span>
-</pre></div>
-
-
-<p>This will use an embedded HSQLDB. Running tests against your own database
-requires a few extra steps described below.</p>
-<p><a name="LegacyAntUnitTests-RunningAgainstaSpecificDatabase"></a></p>
-<h2 id="running-against-a-specific-database">Running Against a Specific Database</h2>
-<p><a name="LegacyAntUnitTests-Step1:ConfigureOneorMoreDataSources"></a></p>
-<h4 id="step-1-configure-one-or-more-data-sources">Step 1: Configure One or More Data Sources</h4>
-<p>Create a directory <em>$HOME/.cayenne/</em> and place a file called
-<em>connection.properties</em> in this directory. File contents should be
-similar to this example:</p>
-<div class="codehilite"><pre><span class="n">example1</span><span class="o">.</span><span class="n">cayenne</span><span class="o">.</span><span class="n">adapter</span> <span class="o">=</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">cayenne</span><span class="o">.</span><span class="n">dba</span><span class="o">.</span><span class="n">mysql</span><span class="o">.</span><span class="n">MySQLAdapter</span>
-<span class="n">example1</span><span class="o">.</span><span class="n">jdbc</span><span class="o">.</span><span class="n">username</span> <span class="o">=</span> <span class="n">someuser</span>
-<span class="n">example1</span><span class="o">.</span><span class="n">jdbc</span><span class="o">.</span><span class="n">password</span> <span class="o">=</span> <span class="n">somepasswd</span>
-<span class="n">example1</span><span class="o">.</span><span class="n">jdbc</span><span class="o">.</span><span class="n">url</span> <span class="o">=</span> <span class="n">jdbc:someurl1</span>
-<span class="n">example1</span><span class="o">.</span><span class="n">jdbc</span><span class="o">.</span><span class="n">driver</span> <span class="o">=</span> <span class="n">com</span><span class="o">.</span><span class="n">xyz</span><span class="o">.</span><span class="n">MyDriverClass</span>
-
-<span class="n">example2</span><span class="o">.</span><span class="n">cayenne</span><span class="o">.</span><span class="n">adapter</span> <span class="o">=</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">cayenne</span><span class="o">.</span><span class="n">dba</span><span class="o">.</span><span class="n">oracle</span><span class="o">.</span><span class="n">OracleAdapter</span>
-<span class="n">example2</span><span class="o">.</span><span class="n">jdbc</span><span class="o">.</span><span class="n">username</span> <span class="o">=</span> <span class="n">someuser</span>
-<span class="n">example2</span><span class="o">.</span><span class="n">jdbc</span><span class="o">.</span><span class="n">password</span> <span class="o">=</span> <span class="n">somepasswd</span>
-<span class="n">example2</span><span class="o">.</span><span class="n">jdbc</span><span class="o">.</span><span class="n">url</span> <span class="o">=</span> <span class="n">jdbc:someurl2</span>
-<span class="n">example2</span><span class="o">.</span><span class="n">jdbc</span><span class="o">.</span><span class="n">driver</span> <span class="o">=</span> <span class="n">com</span><span class="o">.</span><span class="n">xyz</span><span class="o">.</span><span class="n">MyDriverClass</span>
-</pre></div>
-
-
-<p>Each key starts with an identifier for a datasource. In the file above,
-"example1" and "example2" are such identifiers. They can be arbitrary
-strings without "." (dot) symbols.</p>
-<p><a name="LegacyAntUnitTests-Step2.RunTestsAgainstConfiguredDataSource"></a></p>
-<h4 id="step-2-run-tests-against-configured-data-source">Step 2. Run Tests Against Configured Data Source</h4>
-<div class="codehilite"><pre><span class="c"># cd cayenne/cayenne-ant</span>
-<span class="c"># ant test -Dcayenne.test.connection=example1</span>
-</pre></div>
-
-
-<p>Substitute "example1" with a name of your data source configured in the
-previous step. In case of total success, one of the last messages Ant
-prints on console is BUILD SUCCESSFUL. If build fails, failure report is
-generated in HTML format under
-<em>cayenne/cayenne-ant/build/tests-report-example1/index.html</em> and can be
-viewed using a web browser (again, substitute "example1" in this path with
-the name of data source used).</p>
-<p><a name="LegacyAntUnitTests-FilteringTests"></a></p>
-<h2 id="filtering-tests">Filtering Tests</h2>
-<p>To run only a subset of test cases, Ant-style pattern matching can be used.
-A property called <em>test.filter</em> defines a set of class files to be run.
-For instance to run only tests from the "tools" package, the following
-startup parameters can be used:</p>
-<div class="codehilite"><pre><span class="c"># cd cayenne/cayenne-ant</span>
-<span class="c"># ant test -Dcayenne.test.connection=example1 -Dtest.filter=&quot;**/tools/*Tst.class&quot;</span>
-</pre></div>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
-
 </div>
 
 </div></div>

Modified: websites/staging/cayenne/trunk/content/legacy-eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-eclipse.html Tue Oct 30 09:51:23 2012
@@ -85,75 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<p><a name="LegacyEclipse-UsingEclipsewithAntCayenne"></a></p>
-<h2 id="using-eclipse-with-ant-cayenne">Using Eclipse with Ant Cayenne</h2>
-<p><em>(versions 1.2 and 2.0)</em></p>
-<p><a name="LegacyEclipse-ConfiguringEclipseWorkspaceforCayenne"></a></p>
-<h3 id="configuring-eclipse-workspace-for-cayenne">Configuring Eclipse Workspace for Cayenne</h3>
-<ul>
-<li>Download and install <a href="http://wwww.eclipse.org">Eclipse</a>
-. Eclipse 3.1.1 or newer is recommended, as there are some per-project
-settings in repository that are not understood by older Eclipse.</li>
-<li>Install both JDK1.4 and 1.5. Some Cayenne projects below require JVM
-1.5.x, and others - JVM 1.4.x. It is possible to develop all or parts of
-Cayenne with just 1.5 or just 1.4, but make sure you understand what you
-are doing.</li>
-<li>Set JVM 1.4 as default workspace JVM.</li>
-<li>Define <em>"JRE_LIB_15"</em> Eclipse variable (Preferences -&gt; Java -&gt; Build
-Path -&gt; Classpath Variable) to point to the JRE 1.5 class library (e.g.
-<em>"JRE15_HOME/jre/lib/rt.jar"</em> on Windows and Linux or
-<em>"/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Classes/classes.jar"</em>
-on Mac OS X). Cayenne projects that are compatible with 1.5 rely on this
-variable.</li>
-</ul>
-<p><a name="LegacyEclipse-CheckingOutEclipseProjects"></a></p>
-<h3 id="checking-out-eclipse-projects">Checking Out Eclipse Projects</h3>
-<p>Under <a href="https://svn.apache.org/repos/asf/cayenne/main/branches/STABLE-2.0/cayenne/">cayenne folder</a>
- in Subversion you'll find 4 Eclipse projects that need to be checked out
-to the same workspace. You may skip projects marked as optional if you are
-not planning to use/change them.</p>
-<table>
-<thead>
-<tr>
-<th>Project Folder</th>
-<th>JVM</th>
-<th>Special Setup</th>
-<th>Notes</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><em>/cayenne-java</em></td>
-<td>1.4.x</td>
-<td>n/a</td>
-<td>Eclipse project containing main Cayenne source and library folders. Source and binary compatibility must be set to JDK 1.4.</td>
-</tr>
-<tr>
-<td><em>/cayenne-java-1.5</em></td>
-<td>1.5.x</td>
-<td><em>JRE_LIB_15</em> variable</td>
-<td>Eclipse projectcontaining Cayenne JDK 1.5 specific code. Requires "cayenne-java" project to be present in workspace. Source and binary compatibility must be set to JDK 1.5.</td>
-</tr>
-<tr>
-<td><em>/cayenne-other</em></td>
-<td>1.5.x</td>
-<td><em>JRE_LIB_15</em> variable</td>
-<td>Optional Eclipse project that contains Cayenne documentation, contrib folders and such.</td>
-</tr>
-<tr>
-<td><em>/cayenne-ant</em></td>
-<td>n/a</td>
-<td>n/a</td>
-<td>Eclipse project with Ant build files to build the entire Cayenne workspace. Needed if you are planning to build Cayenne with Ant outside of Eclipse (i.e. to create JAR files or run a test suite).</td>
-</tr>
-</tbody>
-</table>
-<p>There are also various tutorials in "cayenne" folder that are not needed to
-build the framework or the tools.</p>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/privacy-policy.html
==============================================================================
--- websites/staging/cayenne/trunk/content/privacy-policy.html (original)
+++ websites/staging/cayenne/trunk/content/privacy-policy.html Tue Oct 30 09:51:23 2012
@@ -85,30 +85,7 @@
 
 <hr>
 
-<div id="content">
-	<p>Information about your use of this website is collected using server access
-logs and a tracking cookie. The collected information consists of the
-following:</p>
-<ol>
-<li>The IP address from which you access the website;</li>
-<li>The type of browser and operating system you use to access our site;</li>
-<li>The date and time you access our site;</li>
-<li>The pages you visit; and</li>
-<li>The addresses of pages from where you followed a link to our site.</li>
-</ol>
-<p>Part of this information is gathered using a tracking cookie set by the <a href="http://www.google.com/analytics/">Google Analytics</a>
- service and handled by Google as described in their <a href="http://www.google.com/privacy.html">privacy policy</a>.
-See your browser documentation for instructions on how to disable the
-cookie if you prefer not to share this data with Google.</p>
-<p>We use the gathered information to help us make our site more useful to
-visitors and to better understand how and when our site is used. We do not
-track or collect personally identifiable information or associate gathered
-data with any personally identifying information from other sources.</p>
-<p>By using this website, you consent to the collection of this data in the
-manner and for the purpose described above.</p>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
+
 
 </div>
 

Modified: websites/staging/cayenne/trunk/content/release-guide-2.0.html
==============================================================================
--- websites/staging/cayenne/trunk/content/release-guide-2.0.html (original)
+++ websites/staging/cayenne/trunk/content/release-guide-2.0.html Tue Oct 30 09:51:23 2012
@@ -85,139 +85,8 @@
 
 <hr>
 
-<div id="content">
-	<p>Note that this page is of use for committers only. It describes the general
-procedure of building a Cayenne release.</p>
-<p><em>THIS ONLY REFERS TO 2.0.x RELEASE BRANCH</em></p>
-<p><a name="ReleaseGuide2.0-Prerequisites"></a></p>
-<h2 id="prerequisites">Prerequisites</h2>
-<p>Refer to the Prerequisites section of the <a href="release-guide.html">main release guide</a></p>
-<p><a name="ReleaseGuide2.0-PreparingSources"></a></p>
-<h2 id="preparing-sources">Preparing Sources</h2>
-<ul>
-<li>
-<p>Export and commit the latest documentation per <a href="legacy-ant-documentation-export.html">Documentation Guidelines</a>
-.</p>
-</li>
-<li>
-<p>Create a report in Jira listing all issues that are FIXED but not CLOSED,
-paste its contents to RELEASE-NOTES.txt. Bulk-close all involved issues.
-<em>Note that issues that affect multiple releases are usually closed
-immediately when they are fixed, and the note is placed in
-RELEASE-NOTES.txt immediately when this happens.</em></p>
-</li>
-<li>
-<p>Edit UPGRADE-NOTES.txt if there is anything to add there.</p>
-</li>
-<li>
-<p>Check Sources Compliance with ARAT. <a href="http://code.google.com/p/arat/">ARAT</a>
- (A Release Audit Tool) is a Java tool written by Robert Burrell Donkin for
-checking the release files for ASF licensing compliance. To run ARAT, [check it out of SVN|http://arat.googlecode.com/svn/tags/RAT_0_4/]
- <em>(we are using version 0.4)</em>, build with Ant, and run against unpacked
-distro (or the release tag), read the report and fix any issues.</p>
-<p>h2. Building Release Artifacts</p>
-<ul>
-<li>Tag {{cayenne}} directory under the repository trunk (assuming
-{{release_version}} is a version tag identifying the release, such as
-{{"1.2B3"}}):</li>
-</ul>
-</li>
-</ul>
-<p>svn copy https://svn.apache.org/repos/asf/cayenne/main/trunk/cayenne \</p>
-<p>https://svn.apache.org/repos/asf/cayenne/main/tags/release_version/cayenne
--m "tagging B3 release"</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="n">Switch</span> <span class="n">an</span> <span class="n">existing</span> <span class="n">working</span> <span class="n">copy</span> <span class="n">on</span> <span class="n">a</span> <span class="n">build</span> <span class="n">machine</span> <span class="n">to</span> <span class="n">the</span> <span class="n">release</span> <span class="n">tag:</span>
-</pre></div>
 
 
-<p>If you don't have a local copy, do "checkout" instead of "switch". <em>Do not
-forget to switch the local copy back to the appropriate branch in case you
-are using it to make the code changes.</em></p>
-<ul>
-<li>
-<p>Note that all Ant commands now must contain <em>"project.version"</em>
-property corresponding to the release version. The property is passed on
-the command line as <em>"-Dproject.version=2.0.x"</em>. See examples below.</p>
-</li>
-<li>
-<p>Run a test to make sure the checkout is ok:</p>
-<p>Test with all supported databases listed [here|CAYDOC:Database Support]
-, or at least as many as possible.  See [Legacy Ant Unit Tests]
- for more details on how to test each of the various database servers with
-legacy versions of Cayenne.</p>
-<ul>
-<li>Build a release for the target platform:</li>
-</ul>
-</li>
-<li>
-<p>Build Release Maven Bundles for ibiblio upload:</p>
-<ul>
-<li>Signing release</li>
-</ul>
-<p>For more info visit [this page|http://www.apache.org/dev/release-signing.html]
-. Release manager key must be in the project KEYS file. Signing is a manual
-procedure not included in the Ant or Maven script. Here is how it might
-work ("-u" option can be omitted if you have only one GPG key):</p>
-</li>
-</ul>
-<p><a name="ReleaseGuide2.0-Voting"></a></p>
-<h2 id="voting">Voting</h2>
-<p>Refer to the Voting section of the <a href="release-guide.html">main release guide</a></p>
-<p><a name="ReleaseGuide2.0-PublishingtheRelease"></a></p>
-<h2 id="publishing-the-release">Publishing the Release</h2>
-<div class="codehilite"><pre><span class="n">Copy</span> <span class="n">KEYS</span> <span class="n">file</span> <span class="k">if</span> <span class="n">updated</span> <span class="n">to</span> <span class="s">&quot;/www/www.apache.org/dist/cayenne/&quot;</span>
-
-<span class="n">_</span><span class="p">(</span><span class="n">TODO:</span> <span class="n">automate</span> <span class="n">publishing</span> <span class="n">the</span> <span class="nb">keys</span> <span class="o">-</span> <span class="n">maybe</span> <span class="n">create</span> <span class="n">a</span> <span class="s">&quot;dist&quot;</span> <span class="n">site</span>
-</pre></div>
-
-
-<p>project?)_</p>
-<p>chmod 664 /www/www.apache.org/dist/cayenne/*{noformat}</p>
-<p><a name="ReleaseGuide2.0-PublishingMavenArtifacts"></a></p>
-<h3 id="publishing-maven-artifacts">Publishing Maven Artifacts</h3>
-<p><em>(TODO: automate rsync with Ant)</em></p>
-<p>Assuming release version is 2.0.2, on a <em>local machine</em> do </p>
-<div class="codehilite"><pre><span class="n">ant</span> <span class="n">clean</span> <span class="n">mvn</span><span class="o">-</span><span class="n">install</span> <span class="o">-</span><span class="n">Dproject</span><span class="o">.</span><span class="n">version</span><span class="o">=</span><span class="mf">2.0.2</span>
-<span class="n">rsync</span> <span class="o">-</span><span class="n">azv</span> <span class="o">~</span><span class="sr">/.m2/</span><span class="n">repository</span><span class="sr">/org/</span><span class="n">apache</span><span class="sr">/cayenne/c</span><span class="n">ayenne</span><span class="o">-</span><span class="n">nodeps</span><span class="o">/</span><span class="mf">2.0.2</span> <span class="o">\</span>
-</pre></div>
-
-
-<p>people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne-nodeps/</p>
-<div class="codehilite"><pre><span class="n">rsync</span> <span class="o">-</span><span class="n">azv</span> <span class="o">~</span><span class="sr">/.m2/</span><span class="n">repository</span><span class="sr">/org/</span><span class="n">apache</span><span class="sr">/cayenne/c</span><span class="n">ayenne</span><span class="o">/</span><span class="mf">2.0.2</span> <span class="o">\</span>
-</pre></div>
-
-
-<p>people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne/</p>
-<div class="codehilite"><pre><span class="n">rsync</span> <span class="o">-</span><span class="n">azv</span> <span class="o">~</span><span class="sr">/.m2/</span><span class="n">repository</span><span class="sr">/org/</span><span class="n">apache</span><span class="sr">/cayenne/c</span><span class="n">ayenne</span><span class="o">-</span><span class="n">client</span><span class="o">-</span><span class="n">nodeps</span><span class="o">/</span><span class="mf">2.0.2</span>
-</pre></div>
-
-
-<p>\</p>
-<p>people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne-client-nodeps/</p>
-<div class="codehilite"><pre><span class="n">rsync</span> <span class="o">-</span><span class="n">azv</span> <span class="o">~</span><span class="sr">/.m2/</span><span class="n">repository</span><span class="sr">/org/</span><span class="n">apache</span><span class="sr">/cayenne/c</span><span class="n">ayenne</span><span class="o">-</span><span class="n">modeler</span><span class="o">/</span><span class="mf">2.0.2</span> <span class="o">\</span>
-</pre></div>
-
-
-<p>people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/cayenne/cayenne-modeler/</p>
-<p><a name="ReleaseGuide2.0-Aftertherelease"></a></p>
-<h2 id="after-the-release">After the release</h2>
-<ul>
-<li>Update the <a href="http://svn.apache.org/repos/asf/cayenne/site/trunk/tlp-site/src/doap/cayenne.rdf">DOAP file</a>
- (held in the Cayenne svn) which will update
-http://projects.apache.org/projects/cayenne.html automatically</li>
-<li>Update Freshmeat with new release number
-(http://freshmeat.net/projects/cayenne/)</li>
-<li>If the release is significant, consider press releases to relevant news
-sources</li>
-<li>Review the main website pages (front page and why-cayenne especially) to
-add any new features</li>
-<li>Add a news item to the Cayenne web site</li>
-<li>Send an email to the Cayenne user and developer lists</li>
-</ul>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
-
 </div>
 
 </div></div>

Modified: websites/staging/cayenne/trunk/content/release-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/release-guide.html (original)
+++ websites/staging/cayenne/trunk/content/release-guide.html Tue Oct 30 09:51:23 2012
@@ -85,208 +85,8 @@
 
 <hr>
 
-<div id="content">
-	<p>This page describes the steps that a Cayenne Release Manager needs to
-perform to prepare a release. The specifics of Cayenne release process is
-that we are publishing both downloadable assemblies and Maven artifacts, so
-we have to build and publish things twice. Both forms of Cayenne release
-are also available for evaluation during the vote.</p>
-<p><a name="ReleaseGuide-Prerequisites"></a></p>
-<h2 id="prerequisites">Prerequisites</h2>
-<ul>
-<li>
-<p>A release manager must have his public key appended to the KEYS file
-checked in to SVN and the key published on one of the public key servers.
-More info can be found at <a href="http://www.apache.org/dev/release-signing.html">http://www.apache.org/dev/release-signing.html</a></p>
-</li>
-<li>
-<p>Make sure "apache-releases" repository is configured in
-<em>~/.m2/settings.xml</em> and an appropriate password is setup. See <a href="http://www.apache.org/dev/publishing-maven-artifacts.html">this page</a>
- for details.</p>
-</li>
-</ul>
-<p><a name="ReleaseGuide-PreparingSources"></a></p>
-<h2 id="preparing-sources">Preparing Sources</h2>
-<ul>
-<li>
-<p>Export and commit the latest documentation per <a href="documentation-guidelines.html">Documentation Guidelines</a>.</p>
-</li>
-<li>
-<p>Edit UPGRADE-NOTES.txt if there is anything to add there.</p>
-</li>
-<li>
-<p>Check Sources Compliance with ARAT. <a href="http://code.google.com/p/arat/">ARAT</a>
- (A Release Audit Tool) is a Java tool written by Robert Burrell Donkin for
-checking the release files for ASF licensing compliance. To run ARAT,
-download the jar <em>(we are using version 0.5.1)</em>, and run it against
-unpacked distro (or the release tag), read the report and fix any issues.</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">cayenne</span>
-<span class="n">mvn</span> <span class="n">clean</span>
-<span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">rat</span><span class="o">-</span><span class="mf">0.5.1</span><span class="o">.</span><span class="n">jar</span> <span class="sb">`pwd`</span> <span class="o">&gt;</span> <span class="n">report</span><span class="o">.</span><span class="n">txt</span>
-</pre></div>
 
 
-</li>
-</ul>
-<h2 id="tagging-the-repo-and-releasing-maven-artifacts">Tagging the Repo and Releasing Maven Artifacts</h2>
-<ul>
-<li>
-<p>Get a trunk SVN checkout of Cayenne. If you are using <em>git</em> for
-development, SVN checkout is still needed to prepare a release with
-<em>maven-release-plugin</em>. </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="o">/</span><span class="n">trunk</span> <span class="n">cayenne</span>
-</pre></div>
-
-
-</li>
-<li>
-<p>Tag the SVN and Create Maven Staging Repository</p>
-<div class="codehilite"><pre><span class="n">cd</span> <span class="n">cayenne</span>
-<span class="n">mvn</span> <span class="n">release:clean</span>
-<span class="n">mvn</span> <span class="n">release:prepare</span> <span class="o">-</span><span class="n">DpreparationGoals</span><span class="o">=</span><span class="s">&quot;clean install&quot;</span> <span class="o">-</span><span class="n">DautoVersionSubmodules</span><span class="o">=</span><span class="n">true</span> <span class="o">-</span><span class="n">Passembly</span><span class="p">,</span><span class="n">generic</span><span class="p">,</span><span class="n">mac</span><span class="p">,</span><span class="n">windows</span>
-</pre></div>
-
-
-<p>A problem <a href="http://www.apache.org/dev/publishing-maven-artifacts.html#prepare-release">described in the documentation</a>
- consistently occurs here ... if you are in Europe: "If you're located in
-Europe then release:prepare may fail with 'Unable to tag SCM' and ' svn: No
-such revision X '. Wait 10 seconds and run mvn release:prepare again." It
-fails indeed, and requires a re-run and continue:</p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">release:perform</span> <span class="o">-</span><span class="n">P</span> <span class="n">gpg</span> <span class="p">[</span><span class="o">-</span><span class="n">Dgpg</span><span class="o">.</span><span class="n">keyname</span><span class="o">=</span><span class="n">B8AF90BF</span><span class="p">]</span>
-</pre></div>
-
-
-</li>
-<li>
-<p>Close the staging repo. Login to <a href="https://repository.apache.org/">https://repository.apache.org/</a> with
-Apache ID/password, go to "Staging Repositories" page. Select a staging
-repository that was just created during "<em>mvn release:perform</em>", click
-"Close". Take a note of the freshly created staging repository URL. It will
-be used by the people voting on Cayenne. It may look like this:
-<a href="https://repository.apache.org/content/repositories/orgapachecayenne-052/">https://repository.apache.org/content/repositories/orgapachecayenne-052/</a> </p>
-</li>
-</ul>
-<p><a name="ReleaseGuide-ReleasingDownloadableAssemblies"></a></p>
-<h2 id="releasing-downloadable-assemblies">Releasing Downloadable Assemblies</h2>
-<ul>
-<li>
-<p>Switch to the release tag created above in SVN or Git.</p>
-</li>
-<li>
-<p>Build source package (it will be the basis for the binary packages built
-in the next steps) :</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>
-
-
-</li>
-<li>
-<p>Build binary assemblies. Take
-<em>"assembly/target/cayenne-XXX-src.tar.gz"</em>, unpack it somewhere, and
-perform binary builds from the unpacked directory (NOT FROM SVN OR GIT
-CHECKOUT). <em>Release manager may skip running unit tests from here, as shown
-below, although release evaluators should use the src assembly for <a href="running-unit-tests.html">unit testing</a>
- and other kinds of testing.</em> </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> <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>
-
-<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> <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>
-
-<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> <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 further details on a general Cayenne build process check <a href="building-cayenne.html">this page</a>.</p>
-</li>
-<li>
-<p>Signing assemblies</p>
-<p>For more info visit <a href="http://www.apache.org/dev/release-signing.html">this page</a>
-. Release manager key must be in the project KEYS file. Signing is a manual
-procedure not included in the Ant or Maven script. Here is how it might
-work ("-u" option can be omitted if you have only one GPG key):</p>
-<div class="codehilite"><pre><span class="n">gpg</span> <span class="o">--</span><span class="n">armor</span> <span class="o">-</span><span class="n">u</span> <span class="n">B8AF90BF</span> <span class="o">--</span><span class="n">output</span> <span class="n">cayenne</span><span class="o">-</span><span class="n">X</span><span class="o">.</span><span class="n">X</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span> <span class="o">--</span><span class="n">detach</span><span class="o">-</span><span class="n">sig</span> <span class="n">cayenne</span><span class="o">-</span><span class="n">X</span><span class="o">.</span><span class="n">X</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span>
-<span class="n">gpg</span> <span class="o">--</span><span class="k">print</span><span class="o">-</span><span class="n">md</span> <span class="n">MD5</span> <span class="n">cayenne</span><span class="o">-</span><span class="n">X</span><span class="o">.</span><span class="n">X</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span> <span class="o">&gt;</span> <span class="n">cayenne</span><span class="o">-</span><span class="n">X</span><span class="o">.</span><span class="n">X</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">md5</span>
-</pre></div>
-
-
-</li>
-<li>
-<p>Assemblies, signature and checksum files are uploaded to the release
-manager's web directory on <em>people.apache.org</em>.</p>
-</li>
-</ul>
-<p><a name="ReleaseGuide-Voting"></a></p>
-<h2 id="voting">Voting</h2>
-<ul>
-<li>The vote is started on the dev mailing list.</li>
-<li>All committers are encouraged to vote on releases. Committer votes will
-be considered by the PMC (particularly -1 votes will be discussed) when
-making the final decision, but are not binding.</li>
-<li>Each PMC member will do the following before voting on a release:
- a. download the artifacts
- b. satisfy themselves that the source matches the appropriate svn tag.
-This can be done by diffing the source against a recent svn checkout.
- c. satisfy themselves that the Apache licensing requirements are met (this
-will usually be achieved by ensuring that all notices are in place and
-verifying that the source matches SVN since all commits to SVN are possible
-only if the committer has a CLA on file).
- d. satisfy themselves that the binary distribution is sane and passes
-basic usability tests. For example, that the Cayenne modeler runs and the
-main jar passes some basic tests.
- e. satisfy themselves that the source passes agreed unit tests (either by
-running them manually or verifying that Hudson has run those tests against
-the equivalent source). </li>
-</ul>
-<p><a name="ReleaseGuide-PublishingtheRelease"></a></p>
-<h2 id="publishing-the-release">Publishing the Release</h2>
-<ul>
-<li>
-<p>Publish Maven artifacts. Go back to <a href="https://repository.apache.org/">https://repository.apache.org/</a>,
-select the staging repo and click "Release".</p>
-</li>
-<li>
-<p>Publish downloadable assemblies:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">ssh</span> <span class="n">people</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span>
-<span class="nv">%</span> <span class="nv">cp</span> <span class="sr">/path/</span><span class="n">to</span><span class="sr">/release/</span><span class="n">artifacts</span> <span class="sr">/www/</span><span class="n">www</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/dist/c</span><span class="n">ayenne</span><span class="o">/</span><span class="p">{</span><span class="n">noformat</span><span class="p">}</span>
-</pre></div>
-
-
-</li>
-</ul>
-<p><a name="ReleaseGuide-AftertheRelease"></a></p>
-<h2 id="after-the-release">After the release</h2>
-<ul>
-<li><a href="https://issues.apache.org/jira/secure/project/ManageVersions.jspa?pid=12310903">Tell Jira</a>
- that the release has been released. Ensure there is another milestone or
-release target already created for further work, but this was probably
-already done when a branch was created in preparation for release.</li>
-<li>Update the <a href="http://svn.apache.org/repos/asf/cayenne/site/trunk/tlp-site/src/doap/cayenne.rdf">DOAP file</a>
- (held in the Cayenne svn) which will update
-http://projects.apache.org/projects/cayenne.html automatically</li>
-<li>Update Freshmeat with new release number
-(<a href="http://freshmeat.net/projects/cayenne/">http://freshmeat.net/projects/cayenne/</a>)</li>
-<li>If the release is significant, consider press releases to relevant news
-sources</li>
-<li>Review the main website pages (front page and why-cayenne especially) to
-add any new features</li>
-<li>Add a news item to the Cayenne web site</li>
-<li>Send an email to the Cayenne user and developer lists</li>
-<li>Send a notification email to announceATapachenews.org</li>
-<li>Update <a href="http://en.wikipedia.org/wiki/Apache_Cayenne">http://en.wikipedia.org/wiki/Apache_Cayenne</a></li>
-</ul>
-<p><a name="ReleaseGuide-Reference"></a></p>
-<h2 id="reference">Reference:</h2>
-<ul>
-<li>Apache release publishing:
-<a href="http://www.apache.org/dev/release-publishing.html">http://www.apache.org/dev/release-publishing.html</a></li>
-<li>Apache Maven release publishing:
-<a href="http://www.apache.org/dev/publishing-maven-artifacts.html">http://www.apache.org/dev/publishing-maven-artifacts.html</a></li>
-<li>ARAT: <a href="http://code.google.com/p/arat/">http://code.google.com/p/arat/</a></li>
-<li>Signing Releases: <a href="http://www.apache.org/dev/release-signing.html">http://www.apache.org/dev/release-signing.html</a></li>
-</ul>
-	<hr>
-	<p id="footer">Copyright &#169; 2001-2012 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="/privacy-policy.html">Privacy policy.</a></p>
-</div>
-
 </div>
 
 </div></div>



Mime
View raw message