You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by bu...@apache.org on 2014/04/27 10:22:06 UTC
svn commit: r907022 - in /websites/staging/cayenne/trunk/content: ./
about.html dev/code-repository.html dev/eclipse.html
dev/how_development_happens.html dev/release-guide.html
Author: buildbot
Date: Sun Apr 27 08:22:06 2014
New Revision: 907022
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/dev/code-repository.html
websites/staging/cayenne/trunk/content/dev/eclipse.html
websites/staging/cayenne/trunk/content/dev/how_development_happens.html
websites/staging/cayenne/trunk/content/dev/release-guide.html
Propchange: websites/staging/cayenne/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Apr 27 08:22:06 2014
@@ -1 +1 @@
-1570300
+1590356
Modified: websites/staging/cayenne/trunk/content/about.html
==============================================================================
--- websites/staging/cayenne/trunk/content/about.html (original)
+++ websites/staging/cayenne/trunk/content/about.html Sun Apr 27 08:22:06 2014
@@ -98,7 +98,7 @@
<hr>
<div id="content">
<h2 id="about">About</h2>
-<p>Explore the following pages to learn more about what Cayenne is and how it
+<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>
Modified: websites/staging/cayenne/trunk/content/dev/code-repository.html
==============================================================================
--- websites/staging/cayenne/trunk/content/dev/code-repository.html (original)
+++ websites/staging/cayenne/trunk/content/dev/code-repository.html Sun Apr 27 08:22:06 2014
@@ -98,66 +98,36 @@
<hr>
<div id="content">
<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>
-<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>
+<h2 id="git-repository">Git Repository</h2>
+<p>Cayenne uses Git for source control. To clone the code do this:</p>
+<div class="codehilite"><pre> <span class="n">git</span> <span class="n">clone</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">git</span><span class="o">-</span><span class="n">wip</span><span class="o">-</span><span class="n">us</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">cayenne</span><span class="p">.</span><span class="n">git</span>
+</pre></div>
+
+
+<p>To browse it on the we web, go to <a href="https://git-wip-us.apache.org/repos/asf?p=cayenne.git">https://git-wip-us.apache.org/repos/asf?p=cayenne.git</a>.</p>
+<p>TODO: our mirror on GitHub is not yet up to date pending <a href="https://issues.apache.org/jira/browse/INFRA-5936">https://issues.apache.org/jira/browse/INFRA-5936</a></p>
+<h3 id="legacy-subversion-repository">Legacy Subversion Repository</h3>
+<p>Cayenne, up to version 3.2M2, was developed in Subversion. For archival purposes SVN repository is still available
+in a read-only mode (see below). Note that it contains branches and tags for releases prior to 3.0.
+So if you are looking for those older releases, you will have to use SVN.</p>
<table>
<thead>
<tr>
-<th></th>
-<th></th>
+<th>Access Type</th>
+<th>URL</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>
+<td><a href="http://svn.apache.org/repos/asf/cayenne/main/">http://svn.apache.org/repos/asf/cayenne/main/</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>
-<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>
+<td><a href="https://svn.apache.org/repos/asf/cayenne/main/">https://svn.apache.org/repos/asf/cayenne/main/</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="p">:</span><span class="o">//</span><span class="n">git</span><span class="p">.</span><span class="n">apache</span><span class="p">.</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="o">/</span><span class="p">.</span><span class="n">git</span><span class="p">;</span> <span class="n">wget</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">git</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">authors</span><span class="p">.</span><span class="n">txt</span><span class="p">;</span> <span class="n">cd</span> <span class="p">..</span>
-<span class="n">git</span> <span class="n">config</span> <span class="n">svn</span><span class="p">.</span><span class="n">authorsfile</span> "<span class="p">.</span><span class="n">git</span><span class="o">/</span><span class="n">authors</span><span class="p">.</span><span class="n">txt</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="p">=</span><span class="n">origin</span><span class="o">/</span> <span class="o">--</span><span class="n">tags</span><span class="p">=</span><span class="n">tags</span> <span class="o">--</span><span class="n">trunk</span><span class="p">=</span><span class="n">trunk</span> <span class="o">--</span><span class="n">branches</span><span class="p">=</span><span class="n">branches</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">cayenne</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 © 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>.
</div>
Modified: websites/staging/cayenne/trunk/content/dev/eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/dev/eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/dev/eclipse.html Sun Apr 27 08:22:06 2014
@@ -99,7 +99,7 @@
<div id="content">
<h2 id="working-with-cayenne-code-in-eclipse">Working with Cayenne code in Eclipse</h2>
<ul>
-<li>Get code from Subversion and <a href="building-cayenne.html">build it from command line</a>
+<li>Get code from Git and <a href="building-cayenne.html">build it from command line</a>
to seed the local repository.</li>
<li>Create a workspace outside of the main checkout folder.</li>
<li>Install <a href="http://www.sonatype.org/m2eclipse/">Maven2 Eclipse plugin</a></li>
Modified: websites/staging/cayenne/trunk/content/dev/how_development_happens.html
==============================================================================
--- websites/staging/cayenne/trunk/content/dev/how_development_happens.html (original)
+++ websites/staging/cayenne/trunk/content/dev/how_development_happens.html Sun Apr 27 08:22:06 2014
@@ -103,7 +103,7 @@
<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
+<li>Committers have direct access to Git 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
Modified: websites/staging/cayenne/trunk/content/dev/release-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/dev/release-guide.html (original)
+++ websites/staging/cayenne/trunk/content/dev/release-guide.html Sun Apr 27 08:22:06 2014
@@ -105,7 +105,7 @@ are also available for evaluation during
<h2 id="prerequisites">Prerequisites</h2>
<ul>
<li>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.
+checked in to source control 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></li>
<li>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>
@@ -129,45 +129,28 @@ unpacked distro (or the release tag), re
<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="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">cayenne</span><span class="o">/</span><span class="n">main</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>
+<p>Create a Git tag 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</span><span class="p">:</span><span class="n">clean</span>
<span class="n">mvn</span> <span class="n">release</span><span class="p">:</span><span class="n">prepare</span> <span class="o">-</span><span class="n">DpreparationGoals</span><span class="p">=</span>"<span class="n">clean</span> <span class="n">install</span>" <span class="o">-</span><span class="n">DautoVersionSubmodules</span><span class="p">=</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>
+<span class="n">mvn</span> <span class="n">release</span><span class="p">:</span><span class="n">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="p">.</span><span class="n">keyname</span><span class="p">=</span><span class="n">B8AF90BF</span><span class="p">]</span>
</pre></div>
</li>
-</ul>
-<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</span><span class="p">:</span><span class="n">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="p">.</span><span class="n">keyname</span><span class="p">=</span><span class="n">B8AF90BF</span><span class="p">]</span>
-</pre></div>
-
-
-<ul>
-<li>Close the staging repo. Login to <a href="https://repository.apache.org/">https://repository.apache.org/</a> with
+<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> </li>
+<a href="https://repository.apache.org/content/repositories/orgapachecayenne-052/">https://repository.apache.org/content/repositories/orgapachecayenne-052/</a> </p>
+</li>
</ul>
<h2 id="releasing-downloadable-assemblies">Releasing Downloadable Assemblies</h2>
<ul>
<li>
-<p>Switch to the release tag created above in SVN or Git.</p>
+<p>Switch to the release tag created above.</p>
</li>
<li>
<p>Build source package (it will be the basis for the binary packages built