Author: buildbot
Date: Tue Feb 17 19:24:10 2015
New Revision: 940504
Log:
Staging update by buildbot for mina
Modified:
websites/staging/mina/trunk/content/ (props changed)
websites/staging/mina/trunk/content/mina-project/developper-guide.html
Propchange: websites/staging/mina/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 17 19:24:10 2015
@@ -1 +1 @@
-1637281
+1660469
Modified: websites/staging/mina/trunk/content/mina-project/developper-guide.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/developper-guide.html
(original)
+++ websites/staging/mina/trunk/content/mina-project/developper-guide.html Tue
Feb 17 19:24:10 2015
@@ -150,7 +150,6 @@
<li><a href="#checking-out-the-code">Checking out the code</a></li>
<li><a href="#coding-convention">Coding Convention</a></li>
<li><a href="#class-header">Class header</a></li>
-<li><a href="#working-with-multiple-branches-in-one-eclipse-workspace">Working
with Multiple Branches in One Eclipse Workspace</a></li>
<li><a href="#deploying-snapshots-commiters-only">Deploying Snapshots
(Commiters Only)</a></li>
<li><a href="#releasing-a-point-release-committers-only">Releasing a Point
Release (Committers Only)</a><ul>
<li><a href="#preparing-the-release-for-the-vote">Preparing the release for
the vote</a><ul>
@@ -175,13 +174,12 @@
<li><a href="#step-16-announce-the-new-release">Step 16: Announce the New
Release</a></li>
</ul>
</li>
-<li><a href="#creating-a-new-release-branch">Creating a New Release
Branch</a></li>
</ul>
</li>
</ul>
</div>
<h1 id="checking-out-the-code">Checking out the code</h1>
-<p>You need Git to check out the source code from our source code repository,
and [Maven(http://maven.apache.org/) 2.2.1 to build the source code (Building
with Maven 3.0 will also work). The following example shows how to build <a
href="http://svn.apache.org/viewvc/mina/mina/tags/2.0.7/";>the current stable
branch (2.0.7)</a>.</p>
+<p>You need Git to check out the source code from our source code repository,
and [Maven(http://maven.apache.org/) 2.2.1 to build the source code (Building
with Maven 3.0 will also work). The following example shows how to build the
current stable branch (2.0.9).</p>
<div class="codehilite"><pre>$ <span class="n">git</span> <span
class="n">clone</span> <span class="n">http</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">mina</span><span class="p">.</span><span class="n">git</span> <span
class="n">mina</span>
$ <span class="n">cd</span> <span class="n">mina</span>
$ <span class="n">mvn</span> <span class="o">-</span><span
class="n">Pserial</span> <span class="n">clean</span> <span
class="n">install</span> # <span class="n">Build</span> <span
class="n">packages</span> <span class="p">(</span><span
class="n">JARs</span><span class="p">)</span> <span class="k">for</span> <span
class="n">the</span> <span class="n">core</span> <span class="n">API</span>
<span class="n">and</span> <span class="n">other</span>
@@ -219,23 +217,6 @@ You can declare new variables in Eclipse
<p>The headers revisions tags are removed.</p>
-<h1 id="working-with-multiple-branches-in-one-eclipse-workspace">Working with
Multiple Branches in One Eclipse Workspace</h1>
-<p>Just running <code>mvn -Pserial eclipse:eclipse</code> won't allow you to
import MINA projects from more than one branches into one Eclipse workspace.
You have to rename all project names in the generated <code>.project</code> and
<code>.classpath</code> files to do that. Maven Eclipse plugin should provide
an option that appends the version number to the project name, but <a
href="http://jira.codehaus.org/browse/MECLIPSE-189";>this issue</a> is not being
resolved yet. Until this issue is resolved, please put the attached shell
script files ((mvnroot) and (mvn-eclipse)) to your local path (e.g.
<code>/usr/local/bin</code>) and run <code>mvn-eclipse</code>.</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">mina</span> <span
class="n">mina</span>
-$ <span class="n">cd</span> <span class="n">mina</span><span
class="o">/</span><span class="n">tags</span><span class="o">/</span>2<span
class="p">.</span>0<span class="p">.</span>7
-$ <span class="n">mvn</span><span class="o">-</span><span
class="n">eclipse</span>
-$ <span class="n">cd</span> <span class="p">.</span><span
class="o">./</span>2<span class="p">.</span>0<span class="p">.</span>5
-$ <span class="n">mvn</span><span class="o">-</span><span
class="n">eclipse</span>
-$ <span class="n">cd</span> <span class="p">.</span><span
class="o">./</span><span class="p">.</span><span class="o">./</span><span
class="n">trunk</span>
-$ <span class="n">mvn</span><span class="o">-</span><span
class="n">eclipse</span>
-</pre></div>
-
-
-<p>Then <code>mvn eclipse:eclipse</code> command is executed internally, and
the branch name will be appended to all sub-module project files generated by
Maven Eclipse plugin.</p>
-<DIV class="note" markdown="1">
-Working with Eclipse LUNA allows you to import the pom.xml directly into the
workspace, instead of running mvn eclipse:eclipse, which is quite convenient.
Although you still need to tweak your pom if you want to work with more than
one version of MINA in your workspace.
-</DIV>
-
<h1 id="deploying-snapshots-commiters-only">Deploying Snapshots (Commiters
Only)</h1>
<p>Before running Maven to deploy artifacts, <em>please make sure if your
umask is configured correctly</em>. Unless configured properly, other
committers will experience annoying 'permission denied' errors. If your
default shell is <code>bash</code>, please update your umask setting in the
<code>~/.bashrc</code> file (create one if it doesn't exist.) by adding the
following line:</p>
<div class="codehilite"><pre><span class="n">umask</span> 002
@@ -244,7 +225,7 @@ Working with Eclipse LUNA allows you to
<p>Please note that you have to edit the correct <code>shrc</code> file. If
you use <code>csh</code>, then you will have to edit <code>~/.cshrc</code>
file.</p>
<p>Now you are ready to deploy the artifacts if you configured your umask
correctly.</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">mina</span><span
class="o">/</span><span class="n">tags</span><span class="o">/</span>2<span
class="p">.</span>0<span class="p">.</span>7 <span class="n">mina</span>
+<div class="codehilite"><pre>$ <span class="n">git</span> <span
class="n">clone</span> <span class="n">http</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">mina</span><span class="p">.</span><span class="n">git</span> <span
class="n">mina</span>
$ <span class="n">cd</span> <span class="n">mina</span>
$ <span class="n">mvn</span> <span class="o">-</span><span
class="n">Pserial</span> <span class="n">clean</span> <span
class="n">deploy</span> <span class="n">site</span> <span
class="n">site</span><span class="p">:</span><span class="n">deploy</span> #
<span class="n">Make</span> <span class="n">sure</span> <span
class="n">to</span> <span class="n">run</span> <span
class="s">'clean'</span> <span class="n">goal</span> <span
class="n">first</span> <span class="n">to</span> <span class="n">prevent</span>
<span class="n">side</span> <span class="n">effects</span> <span
class="n">from</span> <span class="n">your</span> <span
class="n">IDE</span><span class="p">.</span>
</pre></div>
@@ -323,7 +304,7 @@ $ <span class="n">type</span> <span clas
<h3 id="step-2-processing-with-a-dry-run">step 2 : Processing with a dry
run</h3>
<p>After having checked out the trunk, and built it (see step 0), </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">mina</span><span
class="o">/</span><span class="n">trunk</span> <span class="n">mina</span>
+<div class="codehilite"><pre>$ <span class="n">git</span> <span
class="n">clone</span> <span class="n">http</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">mina</span><span class="p">.</span><span class="n">git</span> <span
class="n">mina</span>
$ <span class="n">cd</span> <span class="n">mina</span>
$ <span class="n">mvn</span> <span class="n">clean</span> <span
class="n">install</span> <span class="o">-</span><span class="n">Pserial</span>
</pre></div>
@@ -623,9 +604,7 @@ $ <span class="n">scp</span> <span class
<span class="n">https</span><span class="p">:</span><span
class="o">//</span><span class="n">issues</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">jira</span><span class="o">/</span><span
class="n">secure</span><span class="o">/</span><span
class="n">ReleaseNote</span><span class="p">.</span><span
class="n">jspa</span>?<span class="n">projectId</span><span
class="p">=</span>10670<span class="o">&</span><span
class="n">styleName</span><span class="p">=</span><span
class="n">Html</span><span class="o">&</span><span
class="n">version</span><span class="p">=</span>12313702
-<span class="n">A</span> <span class="n">temporary</span> <span
class="n">tag</span> <span class="n">has</span> <span class="n">been</span>
<span class="n">created</span> <span class="p">(</span><span
class="n">it</span> <span class="n">can</span> <span class="n">be</span> <span
class="n">removed</span> <span class="k">if</span> <span class="n">the</span>
<span class="n">vote</span> <span class="n">is</span> <span
class="n">not</span> <span class="n">approved</span><span class="p">):</span>
-<span class="n">http</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">viewvc</span><span class="o">/</span><span
class="n">mina</span><span class="o">/</span><span class="n">tags</span><span
class="o">/</span>2<span class="p">.</span>0<span class="p">.</span>1<span
class="o">/</span>
-<span class="n">The</span> <span class="n">svn</span> <span
class="n">revision</span> <span class="n">is</span> <span
class="p">:</span><span class="n">http</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">viewvc</span>?<span class="n">rev</span><span
class="p">=</span>1026395
+<span class="n">A</span> <span class="n">temporary</span> <span
class="n">tag</span> <span class="n">has</span> <span class="n">been</span>
<span class="n">created</span> <span class="p">(</span><span
class="n">it</span> <span class="n">can</span> <span class="n">be</span> <span
class="n">removed</span> <span class="k">if</span> <span class="n">the</span>
<span class="n">vote</span> <span class="n">is</span> <span
class="n">not</span> <span class="n">approved</span><span class="p">)</span>
<span class="n">The</span> <span class="n">newly</span> <span
class="n">approved</span> <span class="n">Nexus</span> <span
class="n">has</span> <span class="n">been</span> <span class="n">used</span>
<span class="k">for</span> <span class="n">the</span> <span
class="n">preparation</span> <span class="n">of</span> <span
class="n">this</span> <span class="n">release</span> <span class="n">and</span>
<span class="n">all</span> <span class="n">final</span> <span
class="n">artifacts</span> <span class="n">are</span> <span
class="n">stored</span>
<span class="n">in</span> <span class="n">a</span> <span
class="n">staging</span> <span class="n">repository</span><span
class="p">:</span>
@@ -728,28 +707,6 @@ $ <span class="n">vi</span> <span class=
<p>We need to wait until any changes made in the web site and metadata file(s)
go live.</p>
<h3 id="step-16-announce-the-new-release">Step 16: Announce the New
Release</h3>
<p>An announcement message can be sent to [mailto:annou...@apache.org],
[mailto:annou...@apachenews.org], [mailto:us...@mina.apache.org] and
[mailto:d...@mina.apache.org]. Please note that announcement messages are
rejected unless your from-address ends with <code>@apache.org</code>. Plus,
you shouldn't forget to post a news to the MINA site main page.</p>
-<h2 id="creating-a-new-release-branch">Creating a New Release Branch</h2>
-<p>When you create a new branch, you have to make sure the sections that
specifies branch version numbers are configured appropriately in the root
<code>pom.xml</code>.</p>
-<div class="codehilite"><pre>...
-<span class="nt"><version></span>1.1.0-SNAPSHOT<span
class="nt"></version></span>
-...
-<span class="nt"><scm></span>
- <span
class="nt"><connection></span>scm:svn:http://svn.apache.org/repos/asf/mina/mina/branches/2.0<span
class="nt"></connection></span>
- <span
class="nt"><url></span>http://svn.apache.org/viewvc/directory/mina/mina/branches/2.0<span
class="nt"></url></span>
- <span
class="nt"><developerConnection></span>scm:svn:https://svn.apache.org/repos/asf/mina/mina/branches/2.0<span
class="nt"></developerConnection></span>
-<span class="nt"></scm></span>
-...
-<span class="nt"><distributionManagement></span>
- <span class="nt"><site></span>
- <span class="nt"><id></span>apache.websites<span
class="nt"></id></span>
- <span
class="nt"><url></span>scp://people.apache.org/www/mina.apache.org/report/1.1/<span
class="nt"></url></span>
- <span class="nt"></site></span>
-<span class="nt"></distributionManagement></span>
-...
-</pre></div>
-
-
-<p>Please note that the example above is for <code>branches/2.0</code>. For
example, you have to replace <code>branches/2.0</code> with
<code>branches/3.0</code> if the version number of the new branch is 3.0. In
case of <code>trunk</code>, it's just <code>trunk</code> rather than
<code>branches/<version></code>.</p>
