directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r991621 - in /websites/staging/directory/trunk/content: ./ apacheds/developer-guide.html api/developer-guide.html
Date Tue, 28 Jun 2016 16:28:34 GMT
Author: buildbot
Date: Tue Jun 28 16:28:34 2016
New Revision: 991621

Log:
Staging update by buildbot for directory

Modified:
    websites/staging/directory/trunk/content/   (props changed)
    websites/staging/directory/trunk/content/apacheds/developer-guide.html
    websites/staging/directory/trunk/content/api/developer-guide.html

Propchange: websites/staging/directory/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 28 16:28:34 2016
@@ -1 +1 @@
-1750479
+1750544

Modified: websites/staging/directory/trunk/content/apacheds/developer-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/apacheds/developer-guide.html (original)
+++ websites/staging/directory/trunk/content/apacheds/developer-guide.html Tue Jun 28 16:28:34 2016
@@ -202,64 +202,64 @@ h2:hover > .headerlink, h3:hover > .head
 <p>First, you need to have a recent version of Maven (we are using 3.0.4) and a recent version of the JDK (1.7 is ok, it should also build with 1.6).</p>
 <h3 id="maven-settings">Maven Settings<a class="headerlink" href="#maven-settings" title="Permanent link">&para;</a></h3>
 <p>You'll need a settings section for the <strong>Nexus</strong> and <strong>people.apache.org</strong> servers with a password or a path to the SSH key used. Here's what my <strong>settings.xml</strong> file in <strong>~/.m2</strong> looks like:</p>
-<div class="codehilite"><pre><span class="nt">&lt;settings&gt;</span>
+<div class="codehilite"><pre>&lt;settings&gt;
 
-  <span class="nt">&lt;servers&gt;</span>
-    <span class="c">&lt;!-- To publish a snapshot of some part of Maven --&gt;</span>
-    <span class="nt">&lt;server&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache.snapshots.https<span class="nt">&lt;/id&gt;</span>
-      <span class="nt">&lt;username&gt;</span>username<span class="nt">&lt;/username&gt;</span>
-      <span class="nt">&lt;password&gt;</span>********<span class="nt">&lt;/password&gt;</span>
-    <span class="nt">&lt;/server&gt;</span>
-
-    <span class="c">&lt;!-- To publish a website using Maven --&gt;</span>
-    <span class="nt">&lt;server&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache.directory<span class="nt">&lt;/id&gt;</span>
-      <span class="nt">&lt;username&gt;</span>username<span class="nt">&lt;/username&gt;</span>
-      <span class="nt">&lt;privateKey&gt;</span>/Users/username/.ssh/id_rsa<span class="nt">&lt;/privateKey&gt;</span>
-      <span class="nt">&lt;filePermissions&gt;</span>664<span class="nt">&lt;/filePermissions&gt;</span>
-      <span class="nt">&lt;directoryPermissions&gt;</span>775<span class="nt">&lt;/directoryPermissions&gt;</span>
-    <span class="nt">&lt;/server&gt;</span>
-
-    <span class="c">&lt;!-- To stage a release of some part of Maven --&gt;</span>
-    <span class="nt">&lt;server&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache.releases.https<span class="nt">&lt;/id&gt;</span>
-      <span class="nt">&lt;username&gt;</span>username<span class="nt">&lt;/username&gt;</span>
-      <span class="nt">&lt;password&gt;</span>********<span class="nt">&lt;/password&gt;</span>
-    <span class="nt">&lt;/server&gt;</span>
-
-    <span class="c">&lt;!-- To stage a website of some part of Maven --&gt;</span>
-    <span class="nt">&lt;server&gt;</span>
-      <span class="nt">&lt;id&gt;</span>stagingSite<span class="nt">&lt;/id&gt;</span> <span class="c">&lt;!-- must match hard-coded repository identifier in site:stage-deploy --&gt;</span>
-      <span class="nt">&lt;username&gt;</span>elecharny<span class="nt">&lt;/username&gt;</span>
-      <span class="nt">&lt;filePermissions&gt;</span>664<span class="nt">&lt;/filePermissions&gt;</span>
-      <span class="nt">&lt;directoryPermissions&gt;</span>775<span class="nt">&lt;/directoryPermissions&gt;</span>
-    <span class="nt">&lt;/server&gt;</span>
-
-  <span class="nt">&lt;/servers&gt;</span>
-
-  <span class="nt">&lt;profiles&gt;</span>
-    <span class="nt">&lt;profile&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache-public<span class="nt">&lt;/id&gt;</span>
-      <span class="nt">&lt;pluginRepositories&gt;</span>
-        <span class="nt">&lt;pluginRepository&gt;</span>
-          <span class="nt">&lt;id&gt;</span>apache.public<span class="nt">&lt;/id&gt;</span>
-          <span class="nt">&lt;url&gt;</span>https://repository.apache.org/content/groups/public/<span class="nt">&lt;/url&gt;</span>
-        <span class="nt">&lt;/pluginRepository&gt;</span>
-      <span class="nt">&lt;/pluginRepositories&gt;</span>
-    <span class="nt">&lt;/profile&gt;</span>
-
-    <span class="nt">&lt;profile&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache-release<span class="nt">&lt;/id&gt;</span>
-      <span class="c">&lt;!-- Configuration for artifacts signature --&gt;</span>
-      <span class="nt">&lt;properties&gt;</span>
-        <span class="nt">&lt;gpg.passphrase&gt;</span>********<span class="nt">&lt;/gpg.passphrase&gt;</span>
-        <span class="nt">&lt;gpg.keyname&gt;</span>elecharny@apache.org<span class="nt">&lt;/gpg.keyname&gt;</span>
-      <span class="nt">&lt;/properties&gt;</span>
-    <span class="nt">&lt;/profile&gt;</span>
-  <span class="nt">&lt;/profiles&gt;</span>
+  &lt;servers&gt;
+    &lt;!-- To publish a snapshot of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.snapshots.https&lt;/id&gt;
+      &lt;username&gt;username&lt;/username&gt;
+      &lt;password&gt;********&lt;/password&gt;
+    &lt;/server&gt;
+
+    &lt;!-- To publish a website using Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.directory&lt;/id&gt;
+      &lt;username&gt;username&lt;/username&gt;
+      &lt;privateKey&gt;/Users/username/.ssh/id_rsa&lt;/privateKey&gt;
+      &lt;filePermissions&gt;664&lt;/filePermissions&gt;
+      &lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
+    &lt;/server&gt;
+
+    &lt;!-- To stage a release of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.releases.https&lt;/id&gt;
+      &lt;username&gt;username&lt;/username&gt;
+      &lt;password&gt;********&lt;/password&gt;
+    &lt;/server&gt;
+
+    &lt;!-- To stage a website of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;stagingSite&lt;/id&gt; &lt;!-- must match hard-coded repository identifier in site:stage-deploy --&gt;
+      &lt;username&gt;elecharny&lt;/username&gt;
+      &lt;filePermissions&gt;664&lt;/filePermissions&gt;
+      &lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
+    &lt;/server&gt;
+
+  &lt;/servers&gt;
+
+  &lt;profiles&gt;
+    &lt;profile&gt;
+      &lt;id&gt;apache-public&lt;/id&gt;
+      &lt;pluginRepositories&gt;
+        &lt;pluginRepository&gt;
+          &lt;id&gt;apache.public&lt;/id&gt;
+          &lt;url&gt;https://repository.apache.org/content/groups/public/&lt;/url&gt;
+        &lt;/pluginRepository&gt;
+      &lt;/pluginRepositories&gt;
+    &lt;/profile&gt;
+
+    &lt;profile&gt;
+      &lt;id&gt;apache-release&lt;/id&gt;
+      &lt;!-- Configuration for artifacts signature --&gt;
+      &lt;properties&gt;
+        &lt;gpg.passphrase&gt;********&lt;/gpg.passphrase&gt;
+        &lt;gpg.keyname&gt;elecharny@apache.org&lt;/gpg.keyname&gt;
+      &lt;/properties&gt;
+    &lt;/profile&gt;
+  &lt;/profiles&gt;
 
-<span class="nt">&lt;/settings&gt;</span>
+&lt;/settings&gt;
 </pre></div>
 
 
@@ -271,9 +271,9 @@ You'll need to provide the passphrase in
 <h3 id="gpg-key">GPG Key<a class="headerlink" href="#gpg-key" title="Permanent link">&para;</a></h3>
 <p>All subprojects are configured to deploy signatures for the artifacts uploaded to the repository. The <strong>gpg</strong> plugin will check use the default gpg key for the user deploying the project with the release:perform directive of the release plugin. This will prompt you for the passphrase for the default key. If you do not have one setup the build will fail.</p>
 <p>You can generate and upload a PGP key to a PGP keyserver using the following commands:</p>
-<div class="codehilite"><pre><span class="n">gpg</span> <span class="o">--</span><span class="n">gen</span><span class="o">-</span><span class="n">key</span>
-<span class="n">gpg</span> <span class="o">--</span><span class="n">fingerprint</span>
-<span class="n">gpg</span> <span class="o">--</span><span class="n">keyserver</span> <span class="n">subkeys</span><span class="p">.</span><span class="n">pgp</span><span class="p">.</span><span class="n">net</span> <span class="o">--</span><span class="n">send</span><span class="o">-</span><span class="n">keys</span> <span class="o">&lt;</span><span class="n">your</span> <span class="n">key</span><span class="o">&#39;</span><span class="n">s</span> <span class="n">id</span> <span class="n">from</span> <span class="n">last</span> <span class="n">command</span><span class="o">&gt;</span>
+<div class="codehilite"><pre>gpg --gen-key
+gpg --fingerprint
+gpg --keyserver subkeys.pgp.net --send-keys &lt;your key&#39;s id from last command&gt;
 </pre></div>
 
 
@@ -293,20 +293,20 @@ See also http://people.apache.org/~henkp
 <h4 id="release-process">Release process<a class="headerlink" href="#release-process" title="Permanent link">&para;</a></h4>
 <p>Since we are using Nexus for releases the release process is as follows (see also <a href="http://www.apache.org/dev/publishing-maven-artifacts.html#staging-maven">Publishing maven artifacts</a>.</p>
 <h5 id="test-the-project">Test the Project<a class="headerlink" href="#test-the-project" title="Permanent link">&para;</a></h5>
-<div class="codehilite"><pre>$ <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">DdryRun</span><span class="p">=</span><span class="n">true</span>
+<div class="codehilite"><pre>$ mvn release:prepare -DdryRun=true
 </pre></div>
 
 
 <p>Replace the version by the new version. Be careful, and remove the 'apacheds-parent-' which is proposed for the new tag. We should just use the version number.</p>
 <h5 id="deploy-a-snapshot">Deploy a Snapshot<a class="headerlink" href="#deploy-a-snapshot" title="Permanent link">&para;</a></h5>
-<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">deploy</span>
+<div class="codehilite"><pre>$ mvn deploy
 </pre></div>
 
 
 <p>This is useful to verify your settings in ~/.m2/settings.xml (Nexus password and GPG key)</p>
 <h5 id="prepare-the-release">Prepare the Release<a class="headerlink" href="#prepare-the-release" title="Permanent link">&para;</a></h5>
-<div class="codehilite"><pre>$ <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>
+<div class="codehilite"><pre>$ mvn release:clean
+$ mvn release:prepare
 </pre></div>
 
 
@@ -319,16 +319,16 @@ $ <span class="n">mvn</span> <span class
 <p>This deploys the release to a staging repository. Go to <a href="https://repository.apache.org/index.html#stagingRepositories">Staging Repositories</a> and close the staging repository.</p>
 <h5 id="build-the-site">Build the Site<a class="headerlink" href="#build-the-site" title="Permanent link">&para;</a></h5>
 <p>In order to generate the site, you have to comment some modules in the apacheds <em>pom.xml</em> file :</p>
-<div class="codehilite"><pre><span class="c">&lt;!--module&gt;all&lt;/module--&gt;</span>
+<div class="codehilite"><pre>&lt;!--module&gt;all&lt;/module--&gt;
 ...
-<span class="c">&lt;!--module&gt;installers-maven-plugin&lt;/module--&gt;</span>
-<span class="c">&lt;!--module&gt;installers&lt;/module--&gt;</span>
+&lt;!--module&gt;installers-maven-plugin&lt;/module--&gt;
+&lt;!--module&gt;installers&lt;/module--&gt;
 </pre></div>
 
 
 <p>Then you can start the maven command :</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="n">target</span><span class="o">/</span><span class="n">checkout</span>
-$ <span class="n">mvn</span> <span class="n">site</span>
+<div class="codehilite"><pre>$ cd target/checkout
+$ mvn site
 </pre></div>
 
 
@@ -340,118 +340,72 @@ Use your PGP key ID (the pub key, 4096R/
 </DIV>
 
 <p>You can get the keys by typing :</p>
-<div class="codehilite"><pre><span class="n">gpg</span> <span class="o">--</span><span class="n">list</span><span class="o">-</span><span class="n">keys</span>
+<div class="codehilite"><pre>gpg --list-keys
 </pre></div>
 
 
 <p>You can use this small script that does the job (copy-paste this code in a file named <em>sign.sh</em> in your path) :</p>
-<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47</pre></div></td><td class="code"><div class="codehilite"><pre><span class="c">#!/bin/sh</span>
+<div class="codehilite"><pre>#!/bin/sh
 
-<span class="nb">echo</span> <span class="s2">&quot;PGP Key ID: &quot;</span>
-<span class="nb">read </span>DEFAULT_KEY
+echo &quot;PGP Key ID: &quot;
+read DEFAULT_KEY
 
-<span class="nb">echo</span> <span class="s2">&quot;PGP Key Password: &quot;</span>
+echo &quot;PGP Key Password: &quot;
 stty -echo
-<span class="nb">read </span>PASSWORD
-stty <span class="nb">echo</span>
-<span class="nb">echo</span> <span class="s2">&quot;&quot;</span>
-
-<span class="k">for </span>FILE in <span class="k">$(</span>find . -maxdepth 1 -not <span class="s1">&#39;(&#39;</span> -name <span class="s2">&quot;sign.sh&quot;</span> -or -name <span class="s2">&quot;.*&quot;</span> -or -name <span class="s2">&quot;*.md5&quot;</span> -or -name <span class="s2">&quot;*.sha1&quot;</span> -or -name <span class="s2">&quot;*.asc&quot;</span> <span class="s1">&#39;)&#39;</span> -and -type f<span class="k">)</span> ; <span class="k">do</span>
-
-<span class="k">    if</span> <span class="o">[</span> -f <span class="s2">&quot;$FILE.asc&quot;</span> <span class="o">]</span>; <span class="k">then</span>
-<span class="k">        </span><span class="nb">echo</span> <span class="s2">&quot;Skipping: $FILE&quot;</span>
-        <span class="k">continue</span>
-<span class="k">    fi</span>
-
-<span class="k">    </span><span class="nb">echo</span> -n <span class="s2">&quot;Signing: $FILE ... &quot;</span>
-
-    <span class="c"># MD5</span>
-    <span class="k">if</span> <span class="o">[</span> ! -f <span class="s2">&quot;$FILE.md5&quot;</span> <span class="o">]</span>;
-    <span class="k">then</span>
-<span class="k">        </span>openssl md5 &lt; <span class="s2">&quot;$FILE&quot;</span> | cut <span class="s2">&quot;-d &quot;</span> -f2 &gt; <span class="s2">&quot;$FILE.md5&quot;</span>
-        <span class="nb">echo</span> <span class="s2">&quot;  - Generated &#39;$FILE.md5&#39;&quot;</span>
-    <span class="k">else</span>
-<span class="k">        </span><span class="nb">echo</span> <span class="s2">&quot;  - Skipped &#39;$FILE.md5&#39; (file already existing)&quot;</span>
-    <span class="k">fi</span>
-
-    <span class="c"># SHA1</span>
-    <span class="k">if</span> <span class="o">[</span> ! -f <span class="s2">&quot;$FILE.sha1&quot;</span> <span class="o">]</span>;
-    <span class="k">then</span>
-<span class="k">        </span>gpg -v --default-key <span class="s2">&quot;$DEFAULT_KEY&quot;</span> --print-md SHA1 <span class="s2">&quot;$FILE&quot;</span> &gt; <span class="s2">&quot;$FILE&quot;</span>.sha1
-        <span class="nb">echo</span> <span class="s2">&quot;  - Generated &#39;$FILE.sha1&#39;&quot;</span>
-    <span class="k">else</span>
-<span class="k">        </span><span class="nb">echo</span> <span class="s2">&quot;  - Skipped &#39;$FILE.sha1&#39; (file already existing)&quot;</span>
-    <span class="k">fi</span>
-
-    <span class="c"># ASC</span>
-    <span class="k">if</span> <span class="o">[</span> ! -f <span class="s2">&quot;$FILE.asc&quot;</span> <span class="o">]</span>;
-    <span class="k">then</span>
-<span class="k">        </span><span class="nb">echo</span> <span class="s2">&quot;$PASSWORD&quot;</span> | gpg --default-key <span class="s2">&quot;$DEFAULT_KEY&quot;</span> --detach-sign --armor --no-tty --yes --passphrase-fd 0 <span class="s2">&quot;$FILE&quot;</span>
-        <span class="nb">echo</span> <span class="s2">&quot;  - Generated &#39;$FILE.asc&#39;&quot;</span>
-    <span class="k">else</span>
-<span class="k">        </span><span class="nb">echo</span> <span class="s2">&quot;  - Skipped &#39;$FILE.asc&#39; (file already existing)&quot;</span>
-    <span class="k">fi</span>
-<span class="k">done</span>
+read PASSWORD
+stty echo
+echo &quot;&quot;
+
+for FILE in $(find . -maxdepth 1 -not &#39;(&#39; -name &quot;sign.sh&quot; -or -name &quot;.*&quot; -or -name &quot;*.md5&quot; -or -name &quot;*.sha1&quot; -or -name &quot;*.asc&quot; &#39;)&#39; -and -type f) ; do
+
+    if [ -f &quot;$FILE.asc&quot; ]; then
+        echo &quot;Skipping: $FILE&quot;
+        continue
+    fi
+
+    echo -n &quot;Signing: $FILE ... &quot;
+
+    # MD5
+    if [ ! -f &quot;$FILE.md5&quot; ];
+    then
+        openssl md5 &lt; &quot;$FILE&quot; | cut &quot;-d &quot; -f2 &gt; &quot;$FILE.md5&quot;
+        echo &quot;  - Generated &#39;$FILE.md5&#39;&quot;
+    else
+        echo &quot;  - Skipped &#39;$FILE.md5&#39; (file already existing)&quot;
+    fi
+
+    # SHA1
+    if [ ! -f &quot;$FILE.sha1&quot; ];
+    then
+        gpg -v --default-key &quot;$DEFAULT_KEY&quot; --print-md SHA1 &quot;$FILE&quot; &gt; &quot;$FILE&quot;.sha1
+        echo &quot;  - Generated &#39;$FILE.sha1&#39;&quot;
+    else
+        echo &quot;  - Skipped &#39;$FILE.sha1&#39; (file already existing)&quot;
+    fi
+
+    # ASC
+    if [ ! -f &quot;$FILE.asc&quot; ];
+    then
+        echo &quot;$PASSWORD&quot; | gpg --default-key &quot;$DEFAULT_KEY&quot; --detach-sign --armor --no-tty --yes --passphrase-fd 0 &quot;$FILE&quot;
+        echo &quot;  - Generated &#39;$FILE.asc&#39;&quot;
+    else
+        echo &quot;  - Skipped &#39;$FILE.asc&#39; (file already existing)&quot;
+    fi
+done
 </pre></div>
-</td></tr></table>
+
 
 <p>Then to sign the packages :</p>
-<div class="codehilite"><pre>$ <span class="nb">sign</span><span class="p">.</span><span class="n">sh</span>
-<span class="n">PGP</span> <span class="n">Key</span> <span class="n">ID</span><span class="p">:</span> 
-<span class="o">&lt;</span><span class="n">your</span> <span class="n">PGP</span> <span class="n">key</span><span class="o">&gt;</span>
-<span class="n">PGP</span> <span class="n">Key</span> <span class="n">Password</span><span class="p">:</span> 
-<span class="o">&lt;</span><span class="n">Your</span> <span class="n">password</span><span class="o">&gt;</span>
-
-<span class="o">-</span><span class="n">n</span> <span class="n">Signing</span><span class="p">:</span> <span class="o">./</span><span class="n">apacheds</span><span class="o">-</span><span class="n">parent</span><span class="o">-&lt;</span><span class="n">version</span><span class="o">&gt;-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">zip</span> <span class="p">...</span> 
-<span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apacheds-parent-&lt;version&gt;-source-release.zip.md5&#39;</span>
-<span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apacheds-parent-&lt;version&gt;-source-release.zip.sha1&#39;</span>
-<span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apacheds-parent-&lt;version&gt;-source-release.zip.asc&#39;</span>
+<div class="codehilite"><pre>$ sign.sh
+PGP Key ID: 
+&lt;your PGP key&gt;
+PGP Key Password: 
+&lt;Your password&gt;
+
+-n Signing: ./apacheds-parent-&lt;version&gt;-source-release.zip ... 
+- Generated &#39;./apacheds-parent-&lt;version&gt;-source-release.zip.md5&#39;
+- Generated &#39;./apacheds-parent-&lt;version&gt;-source-release.zip.sha1&#39;
+- Generated &#39;./apacheds-parent-&lt;version&gt;-source-release.zip.asc&#39;
 $
 </pre></div>
 
@@ -562,30 +516,30 @@ $
 <p><em>Staging or Production?</em></p>
 <p>Those files will be stored on the production server only !!! And some extra caution must be taken not to delete them when we will publish the staging site too...</p>
 <p>First of all, you must checkout the two CMS store for the site : staging and revision.</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="o">~/</span><span class="n">apacheds</span>
-$ <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">infra</span><span class="o">/</span><span class="n">websites</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">directory</span><span class="o">/</span><span class="n">trunk</span> <span class="n">staging</span>
-<span class="p">...</span>
-$ <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">infra</span><span class="o">/</span><span class="n">websites</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">directory</span> <span class="n">production</span>
-<span class="p">...</span>
+<div class="codehilite"><pre>$ cd ~/apacheds
+$ svn co https://svn.apache.org/repos/infra/websites/production/directory/trunk staging
+...
+$ svn co https://svn.apache.org/repos/infra/websites/production/directory production
+...
 </pre></div>
 
 
 <p>Now, you will first add the directory for the newly generated version :</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span>
-$ <span class="n">mkdir</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;</span>
+<div class="codehilite"><pre>$ cd ~/apacheds/production/content/apacheds/gen-docs
+$ mkdir &lt;version&gt;
 </pre></div>
 
 
 <p>Then copy the generated docs :</p>
-<div class="codehilite"><pre>$ <span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">trunks</span><span class="o">/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">checkout</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">site</span><span class="o">/</span><span class="n">apidocs</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span><span class="o">/&lt;</span><span class="n">version</span><span class="o">&gt;</span>
-$ <span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">trunks</span><span class="o">/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">checkout</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">site</span><span class="o">/</span><span class="n">xref</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span><span class="o">/&lt;</span><span class="n">version</span><span class="o">&gt;</span>
+<div class="codehilite"><pre>$ cp -r ~/apacheds/trunks/apacheds/target/checkout/target/site/apidocs ~/apacheds/production/content/apacheds/gen-docs/&lt;version&gt;
+$ cp -r ~/apacheds/trunks/apacheds/target/checkout/target/site/xref ~/apacheds/production/content/apacheds/gen-docs/&lt;version&gt;
 $
 </pre></div>
 
 
 <p>You have to check in those directories :</p>
-<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">add</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;</span>
-$ <span class="n">svn</span> <span class="n">ci</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;</span> <span class="o">-</span><span class="n">m</span> &quot;<span class="n">Injected</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;</span> <span class="n">javadocs</span>&quot;
+<div class="codehilite"><pre>$ svn add &lt;version&gt;
+$ svn ci &lt;version&gt; -m &quot;Injected &lt;version&gt; javadocs&quot;
 </pre></div>
 
 
@@ -595,23 +549,23 @@ $ <span class="n">svn</span> <span class
 
 
 <p>This file list the file on the production site that will not be overriden by the publication of the staging site. It has to be updated</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">staging</span><span class="o">/</span><span class="n">content</span><span class="o">/</span>
-$ <span class="n">vi</span> <span class="n">extpaths</span><span class="p">.</span><span class="n">txt</span>
+<div class="codehilite"><pre>$ cd ~/apacheds/staging/content/
+$ vi extpaths.txt
 </pre></div>
 
 
 <p>Add the following line :</p>
-<div class="codehilite"><pre><span class="p">...</span>
-# <span class="n">Apacheds</span>
-<span class="n">apacheds</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span><span class="o">/&lt;</span><span class="n">version</span><span class="o">&gt;</span>
-<span class="p">...</span>
+<div class="codehilite"><pre>...
+# Apacheds
+apacheds/gen-docs/&lt;version&gt;
+...
 </pre></div>
 
 
 <p>then save and check in the file <em>.htaccess</em></p>
 <p>We also have to update this file :</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">staging</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span>
-$ <span class="n">vi</span> <span class="p">.</span><span class="n">htaccess</span>
+<div class="codehilite"><pre>$ cd ~/apacheds/staging/content/apacheds/gen-docs
+$ vi .htaccess
 </pre></div>
 
 
@@ -624,11 +578,13 @@ $ <span class="n">vi</span> <span class=
 <p>Save and commit the file.</p>
 <h5 id="update-the-web-site">Update the web site<a class="headerlink" href="#update-the-web-site" title="Permanent link">&para;</a></h5>
 <p>You can now update the site, add a news on the front page, and publish the site.</p>
-<p>There are a few places to modify :
-- /lib/path.pm : update the $version_apacheds variable with the new version.
-- /content/index.mdtext : same here, update the <!-- ApacheDS project --> section, which contains the version.
-- /content/apacheds/news.mdtext : add the news on top of thise page
-- /content/apacheds/download-old-versions.mdtext : add a new line on top of the array, which refers to the latest version before the new one</p>
+<p>There are a few places to modify :</p>
+<ul>
+<li>/lib/path.pm : update the $version_apacheds variable with the new version.</li>
+<li>/content/index.mdtext : same here, update the <!-- ApacheDS project --> section, which contains the version.</li>
+<li>/content/apacheds/news.mdtext : add the news on top of thise page</li>
+<li>/content/apacheds/download-old-versions.mdtext : add a new line on top of the array, which refers to the latest version before the new one</li>
+</ul>
 <p>Commit the changes, and publish the web site, you are done !</p>
 <h5 id="inform-the-world">Inform the world !<a class="headerlink" href="#inform-the-world" title="Permanent link">&para;</a></h5>
 <p>After 24h, you can now inform the world about the release.</p>

Modified: websites/staging/directory/trunk/content/api/developer-guide.html
==============================================================================
--- websites/staging/directory/trunk/content/api/developer-guide.html (original)
+++ websites/staging/directory/trunk/content/api/developer-guide.html Tue Jun 28 16:28:34 2016
@@ -207,64 +207,64 @@ h2:hover > .headerlink, h3:hover > .head
 <p>First, you need to have a recent version of Maven (we are using 3.0.4) and a recent version of the JDK (1.7 is ok, it should also build with 1.6).</p>
 <h3 id="maven-settings">Maven Settings<a class="headerlink" href="#maven-settings" title="Permanent link">&para;</a></h3>
 <p>You'll need a settings section for the <strong>Nexus</strong> and <strong>people.apache.org</strong> servers with a password or a path to the SSH key used. Here's what my <strong>settings.xml</strong> file in <strong>~/.m2</strong> looks like:</p>
-<div class="codehilite"><pre><span class="nt">&lt;settings&gt;</span>
+<div class="codehilite"><pre>&lt;settings&gt;
 
-  <span class="nt">&lt;servers&gt;</span>
-    <span class="c">&lt;!-- To publish a snapshot of some part of Maven --&gt;</span>
-    <span class="nt">&lt;server&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache.snapshots.https<span class="nt">&lt;/id&gt;</span>
-      <span class="nt">&lt;username&gt;</span>username<span class="nt">&lt;/username&gt;</span>
-      <span class="nt">&lt;password&gt;</span>********<span class="nt">&lt;/password&gt;</span>
-    <span class="nt">&lt;/server&gt;</span>
-
-    <span class="c">&lt;!-- To publish a website using Maven --&gt;</span>
-    <span class="nt">&lt;server&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache.directory<span class="nt">&lt;/id&gt;</span>
-      <span class="nt">&lt;username&gt;</span>username<span class="nt">&lt;/username&gt;</span>
-      <span class="nt">&lt;privateKey&gt;</span>/Users/username/.ssh/id_rsa<span class="nt">&lt;/privateKey&gt;</span>
-      <span class="nt">&lt;filePermissions&gt;</span>664<span class="nt">&lt;/filePermissions&gt;</span>
-      <span class="nt">&lt;directoryPermissions&gt;</span>775<span class="nt">&lt;/directoryPermissions&gt;</span>
-    <span class="nt">&lt;/server&gt;</span>
-
-    <span class="c">&lt;!-- To stage a release of some part of Maven --&gt;</span>
-    <span class="nt">&lt;server&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache.releases.https<span class="nt">&lt;/id&gt;</span>
-      <span class="nt">&lt;username&gt;</span>username<span class="nt">&lt;/username&gt;</span>
-      <span class="nt">&lt;password&gt;</span>********<span class="nt">&lt;/password&gt;</span>
-    <span class="nt">&lt;/server&gt;</span>
-
-    <span class="c">&lt;!-- To stage a website of some part of Maven --&gt;</span>
-    <span class="nt">&lt;server&gt;</span>
-      <span class="nt">&lt;id&gt;</span>stagingSite<span class="nt">&lt;/id&gt;</span> <span class="c">&lt;!-- must match hard-coded repository identifier in site:stage-deploy --&gt;</span>
-      <span class="nt">&lt;username&gt;</span>elecharny<span class="nt">&lt;/username&gt;</span>
-      <span class="nt">&lt;filePermissions&gt;</span>664<span class="nt">&lt;/filePermissions&gt;</span>
-      <span class="nt">&lt;directoryPermissions&gt;</span>775<span class="nt">&lt;/directoryPermissions&gt;</span>
-    <span class="nt">&lt;/server&gt;</span>
-
-  <span class="nt">&lt;/servers&gt;</span>
-
-  <span class="nt">&lt;profiles&gt;</span>
-    <span class="nt">&lt;profile&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache-public<span class="nt">&lt;/id&gt;</span>
-      <span class="nt">&lt;pluginRepositories&gt;</span>
-        <span class="nt">&lt;pluginRepository&gt;</span>
-          <span class="nt">&lt;id&gt;</span>apache.public<span class="nt">&lt;/id&gt;</span>
-          <span class="nt">&lt;url&gt;</span>https://repository.apache.org/content/groups/public/<span class="nt">&lt;/url&gt;</span>
-        <span class="nt">&lt;/pluginRepository&gt;</span>
-      <span class="nt">&lt;/pluginRepositories&gt;</span>
-    <span class="nt">&lt;/profile&gt;</span>
-
-    <span class="nt">&lt;profile&gt;</span>
-      <span class="nt">&lt;id&gt;</span>apache-release<span class="nt">&lt;/id&gt;</span>
-      <span class="c">&lt;!-- Configuration for artifacts signature --&gt;</span>
-      <span class="nt">&lt;properties&gt;</span>
-        <span class="nt">&lt;gpg.passphrase&gt;</span>********<span class="nt">&lt;/gpg.passphrase&gt;</span>
-        <span class="nt">&lt;gpg.keyname&gt;</span>elecharny@apache.org<span class="nt">&lt;/gpg.keyname&gt;</span>
-      <span class="nt">&lt;/properties&gt;</span>
-    <span class="nt">&lt;/profile&gt;</span>
-  <span class="nt">&lt;/profiles&gt;</span>
+  &lt;servers&gt;
+    &lt;!-- To publish a snapshot of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.snapshots.https&lt;/id&gt;
+      &lt;username&gt;username&lt;/username&gt;
+      &lt;password&gt;********&lt;/password&gt;
+    &lt;/server&gt;
+
+    &lt;!-- To publish a website using Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.directory&lt;/id&gt;
+      &lt;username&gt;username&lt;/username&gt;
+      &lt;privateKey&gt;/Users/username/.ssh/id_rsa&lt;/privateKey&gt;
+      &lt;filePermissions&gt;664&lt;/filePermissions&gt;
+      &lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
+    &lt;/server&gt;
+
+    &lt;!-- To stage a release of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.releases.https&lt;/id&gt;
+      &lt;username&gt;username&lt;/username&gt;
+      &lt;password&gt;********&lt;/password&gt;
+    &lt;/server&gt;
+
+    &lt;!-- To stage a website of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;stagingSite&lt;/id&gt; &lt;!-- must match hard-coded repository identifier in site:stage-deploy --&gt;
+      &lt;username&gt;elecharny&lt;/username&gt;
+      &lt;filePermissions&gt;664&lt;/filePermissions&gt;
+      &lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
+    &lt;/server&gt;
+
+  &lt;/servers&gt;
+
+  &lt;profiles&gt;
+    &lt;profile&gt;
+      &lt;id&gt;apache-public&lt;/id&gt;
+      &lt;pluginRepositories&gt;
+        &lt;pluginRepository&gt;
+          &lt;id&gt;apache.public&lt;/id&gt;
+          &lt;url&gt;https://repository.apache.org/content/groups/public/&lt;/url&gt;
+        &lt;/pluginRepository&gt;
+      &lt;/pluginRepositories&gt;
+    &lt;/profile&gt;
+
+    &lt;profile&gt;
+      &lt;id&gt;apache-release&lt;/id&gt;
+      &lt;!-- Configuration for artifacts signature --&gt;
+      &lt;properties&gt;
+        &lt;gpg.passphrase&gt;********&lt;/gpg.passphrase&gt;
+        &lt;gpg.keyname&gt;elecharny@apache.org&lt;/gpg.keyname&gt;
+      &lt;/properties&gt;
+    &lt;/profile&gt;
+  &lt;/profiles&gt;
 
-<span class="nt">&lt;/settings&gt;</span>
+&lt;/settings&gt;
 </pre></div>
 
 
@@ -276,9 +276,9 @@ You'll need to provide the passphrase in
 <h3 id="gpg-key">GPG Key<a class="headerlink" href="#gpg-key" title="Permanent link">&para;</a></h3>
 <p>All subprojects are configured to deploy signatures for the artifacts uploaded to the repository. The <strong>gpg</strong> plugin will check use the default gpg key for the user deploying the project with the release:perform directive of the release plugin. This will prompt you for the passphrase for the default key. If you do not have one setup the build will fail.</p>
 <p>You can generate and upload a PGP key to a PGP keyserver using the following commands:</p>
-<div class="codehilite"><pre><span class="n">gpg</span> <span class="o">--</span><span class="n">gen</span><span class="o">-</span><span class="n">key</span>
-<span class="n">gpg</span> <span class="o">--</span><span class="n">fingerprint</span>
-<span class="n">gpg</span> <span class="o">--</span><span class="n">keyserver</span> <span class="n">subkeys</span><span class="p">.</span><span class="n">pgp</span><span class="p">.</span><span class="n">net</span> <span class="o">--</span><span class="n">send</span><span class="o">-</span><span class="n">keys</span> <span class="o">&lt;</span><span class="n">your</span> <span class="n">key</span><span class="o">&#39;</span><span class="n">s</span> <span class="n">id</span> <span class="n">from</span> <span class="n">last</span> <span class="n">command</span><span class="o">&gt;</span>
+<div class="codehilite"><pre>gpg --gen-key
+gpg --fingerprint
+gpg --keyserver subkeys.pgp.net --send-keys &lt;your key&#39;s id from last command&gt;
 </pre></div>
 
 
@@ -290,45 +290,45 @@ See also http://people.apache.org/~henkp
 <h2 id="release-process">Release process<a class="headerlink" href="#release-process" title="Permanent link">&para;</a></h2>
 <p>Since we are using Nexus for releases the release process is as follows (see also <a href="http://www.apache.org/dev/publishing-maven-artifacts.html#staging-maven">Publishing maven artifacts</a>).</p>
 <h3 id="test-the-project">Test the Project<a class="headerlink" href="#test-the-project" title="Permanent link">&para;</a></h3>
-<div class="codehilite"><pre>$ <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">DdryRun</span><span class="p">=</span><span class="n">true</span>
+<div class="codehilite"><pre>$ mvn release:prepare -DdryRun=true
 </pre></div>
 
 
 <p>Be aware that this phase will ask you about the next version, and most important, for the next SCM tag :</p>
-<div class="codehilite"><pre><span class="p">...</span>
-<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Checking</span> <span class="n">dependencies</span> <span class="n">and</span> <span class="n">plugins</span> <span class="k">for</span> <span class="n">snapshots</span> <span class="p">...</span>
-<span class="n">What</span> <span class="n">is</span> <span class="n">the</span> <span class="n">release</span> <span class="n">version</span> <span class="k">for</span> &quot;<span class="n">Apache</span> <span class="n">Directory</span> <span class="n">LDAP</span> <span class="n">API</span>&quot;? <span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">directory</span><span class="p">.</span><span class="n">api</span><span class="p">:</span><span class="n">api</span><span class="o">-</span><span class="n">parent</span><span class="p">)</span> 1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M16</span><span class="p">:</span> <span class="p">:</span> 
-<span class="n">What</span> <span class="n">is</span> <span class="n">the</span> <span class="n">release</span> <span class="n">version</span> <span class="k">for</span> &quot;<span class="n">Apache</span> <span class="n">Directory</span> <span class="n">LDAP</span> <span class="n">API</span> <span class="n">I18n</span>&quot;? <span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">directory</span><span class="p">.</span><span class="n">api</span><span class="p">:</span><span class="n">api</span><span class="o">-</span><span class="n">i18n</span><span class="p">)</span> 1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M16</span><span class="p">:</span> <span class="p">:</span> 
-<span class="n">What</span> <span class="n">is</span> <span class="n">the</span> <span class="n">release</span> <span class="n">version</span> <span class="k">for</span> &quot;<span class="n">Apache</span> <span class="n">Directory</span> <span class="n">LDAP</span> <span class="n">API</span> <span class="n">Utilities</span>&quot;? <span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">directory</span><span class="p">.</span><span class="n">api</span><span class="p">:</span><span class="n">api</span><span class="o">-</span><span class="n">util</span><span class="p">)</span> 1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M16</span><span class="p">:</span> <span class="p">:</span> 
-<span class="p">...</span>
-<span class="n">What</span> <span class="n">is</span> <span class="n">SCM</span> <span class="n">release</span> <span class="n">tag</span> <span class="n">or</span> <span class="n">label</span> <span class="k">for</span> &quot;<span class="n">Apache</span> <span class="n">Directory</span> <span class="n">LDAP</span> <span class="n">API</span>&quot;? <span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">directory</span><span class="p">.</span><span class="n">api</span><span class="p">:</span><span class="n">api</span><span class="o">-</span><span class="n">parent</span><span class="p">)</span> 1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M16</span><span class="p">:</span> <span class="p">:</span>
-<span class="p">...</span>
+<div class="codehilite"><pre>...
+[INFO] Checking dependencies and plugins for snapshots ...
+What is the release version for &quot;Apache Directory LDAP API&quot;? (org.apache.directory.api:api-parent) 1.0.0-M16: : 
+What is the release version for &quot;Apache Directory LDAP API I18n&quot;? (org.apache.directory.api:api-i18n) 1.0.0-M16: : 
+What is the release version for &quot;Apache Directory LDAP API Utilities&quot;? (org.apache.directory.api:api-util) 1.0.0-M16: : 
+...
+What is SCM release tag or label for &quot;Apache Directory LDAP API&quot;? (org.apache.directory.api:api-parent) 1.0.0-M16: :
+...
 </pre></div>
 
 
 <h3 id="deploy-a-snapshot">Deploy a Snapshot<a class="headerlink" href="#deploy-a-snapshot" title="Permanent link">&para;</a></h3>
-<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">deploy</span>
+<div class="codehilite"><pre>$ mvn deploy
 </pre></div>
 
 
 <p>This is useful to verify your settings in ~/.m2/settings.xml (Nexus password and GPG key)</p>
 <h3 id="prepare-the-release">Prepare the Release<a class="headerlink" href="#prepare-the-release" title="Permanent link">&para;</a></h3>
-<div class="codehilite"><pre>$ <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>
+<div class="codehilite"><pre>$ mvn release:clean
+$ mvn release:prepare
 </pre></div>
 
 
 <p>This creates a tag <a href="http://svn.apache.org/viewvc/directory/shared/tags/">here</a></p>
 <h3 id="stage-the-release">Stage the Release<a class="headerlink" href="#stage-the-release" title="Permanent link">&para;</a></h3>
-<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">release</span><span class="p">:</span><span class="n">perform</span>
+<div class="codehilite"><pre>$ mvn release:perform
 </pre></div>
 
 
 <p>This deploys the release to a staging repository.</p>
 <p>Go to <a href="https://repository.apache.org/index.html#stagingRepositories">the nexus server</a> and close the staging repository.</p>
 <h3 id="build-the-site">Build the Site<a class="headerlink" href="#build-the-site" title="Permanent link">&para;</a></h3>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="n">target</span><span class="o">/</span><span class="n">checkout</span>
-$ <span class="n">mvn</span> <span class="n">site</span>
+<div class="codehilite"><pre>$ cd target/checkout
+$ mvn site
 </pre></div>
 
 
@@ -342,25 +342,23 @@ $ <span class="n">mvn</span> <span class
 
 
 <p>The produced packages already have .asc signature that you will need to remove :</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="n">target</span><span class="o">/</span><span class="n">checkout</span><span class="o">/</span><span class="n">distribution</span><span class="o">/</span><span class="n">target</span>
-$ <span class="n">rm</span> <span class="o">*</span><span class="p">.</span><span class="n">asc</span>
-$ <span class="o">~/</span><span class="nb">sign</span><span class="p">.</span><span class="n">sh</span>
-<span class="n">PGP</span> <span class="n">Key</span> <span class="n">ID</span><span class="p">:</span> 
-<span class="o">&lt;</span><span class="n">You</span> <span class="n">public</span> <span class="n">key</span><span class="o">&gt;</span>
-<span class="n">PGP</span> <span class="n">Key</span> <span class="n">Password</span><span class="p">:</span> 
-<span class="o">&lt;</span><span class="n">Your</span> <span class="n">password</span><span class="o">&gt;</span>
-<span class="o">-</span><span class="n">n</span> <span class="n">Signing</span><span class="p">:</span> <span class="o">./</span><span class="n">apache</span><span class="o">-</span><span class="n">ldap</span><span class="o">-</span><span class="n">api</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M25</span><span class="o">-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span> <span class="p">...</span> 
-  <span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apache-ldap-api-1.0.0-M25-bin.tar.gz.md5&#39;</span>
-  <span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apache-ldap-api-1.0.0-M25-bin.tar.gz.sha1&#39;</span>
-  <span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apache-ldap-api-1.0.0-M25-bin.tar.gz.asc&#39;</span>
-<span class="o">-</span><span class="n">n</span> <span class="n">Signing</span><span class="p">:</span> <span class="o">./</span><span class="n">apache</span><span class="o">-</span><span class="n">ldap</span><span class="o">-</span><span class="n">api</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">M25</span><span class="o">-</span><span class="n">bin</span><span class="p">.</span><span class="n">zip</span> <span class="p">...</span> 
-  <span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apache-ldap-api-1.0.0-M25-bin.zip.md5&#39;</span>
-  <span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apache-ldap-api-1.0.0-M25-bin.zip.sha1&#39;</span>
-  <span class="o">-</span> <span class="n">Generated</span> <span class="s">&#39;./apache-ldap-api-1.0.0-M25-bin.zip.asc&#39;</span>
-<span class="p">...</span>
-</pre></div>
-
-
+<p>:::text
+   $ cd target/checkout/distribution/target
+    $ rm *.asc
+    $ ~/sign.sh
+    PGP Key ID: 
+    <You public key>
+    PGP Key Password: 
+    <Your password>
+    -n Signing: ./apache-ldap-api-1.0.0-M25-bin.tar.gz ... 
+      - Generated './apache-ldap-api-1.0.0-M25-bin.tar.gz.md5'
+      - Generated './apache-ldap-api-1.0.0-M25-bin.tar.gz.sha1'
+      - Generated './apache-ldap-api-1.0.0-M25-bin.tar.gz.asc'
+    -n Signing: ./apache-ldap-api-1.0.0-M25-bin.zip ... 
+      - Generated './apache-ldap-api-1.0.0-M25-bin.zip.md5'
+      - Generated './apache-ldap-api-1.0.0-M25-bin.zip.sha1'
+      - Generated './apache-ldap-api-1.0.0-M25-bin.zip.asc'
+    ...</p>
 <p>You are done with the signature.</p>
 <p>For the record, here is the script shell you can use to sign the packages. Name it sign.sh, and put it into your home directory (on a unix based computer) :</p>
 <table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
@@ -484,8 +482,8 @@ $ cp apache-ldap-api-&lt;version&gt;-* ~
 
 
 <p>Last, not least, commit your changes</p>
-<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">add</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">directory</span><span class="o">/</span><span class="n">api</span><span class="o">/</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">RC1</span>
-$ <span class="n">svn</span> <span class="n">ci</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">directory</span><span class="o">/</span><span class="n">api</span><span class="o">/</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">RC1</span> <span class="o">-</span><span class="n">m</span> &quot;<span class="n">Apache</span> <span class="n">LDAP</span> <span class="n">API</span> 1<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">RC1</span> <span class="n">packages</span>&quot;
+<div class="codehilite"><pre>$ svn add ~/apacheds/dist/dev/directory/api/1.0.0-RC1
+$ svn ci ~/apacheds/dist/dev/directory/api/1.0.0-RC1 -m &quot;Apache LDAP API 1.0.0-RC1 packages&quot;
 </pre></div>
 
 
@@ -499,7 +497,7 @@ $ <span class="n">svn</span> <span class
 <h3 id="release">Release<a class="headerlink" href="#release" title="Permanent link">&para;</a></h3>
 <p>If the vote succeeds LDAP API project can be released.</p>
 <p>Go to <a href="https://repository.apache.org/index.html#stagingRepositories">https://repository.apache.org/index.html#stagingRepositories</a> and release the staging repository so all artifacts are published to Maven central.</p>
-<p>The sources, binaries and their signatures, have to be pushed in a place where they can be downloaded by usersWe use the <a href="https://dist.apache.org/repos/dist/release/directory">distribution</a> space for that purpose.</p>
+<p>The sources, binaries and their signatures, have to be pushed in a place where they can be downloaded by users. We use the <a href="https://dist.apache.org/repos/dist/release/directory">distribution</a> space for that purpose.</p>
 <p>Move the distribution packages (sources and binaries) to the dist SVN repository: https://dist.apache.org/repos/dist/release/directory/api/dist/$(version)</p>
 <p>If you haven't checked out this space, do it now :</p>
 <div class="codehilite"><pre>$ mkdir -p ~/apacheds/dist/release/directory
@@ -544,59 +542,59 @@ Those files will be stored on the produc
 </DIV>
 
 <p>First of all, you must checkout the two CMS store for the site : staging and production.</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="o">~/</span><span class="n">apacheds</span>
-$ <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">infra</span><span class="o">/</span><span class="n">websites</span><span class="o">/</span><span class="n">staging</span><span class="o">/</span><span class="n">directory</span><span class="o">/</span><span class="n">trunk</span> <span class="n">staging</span>
-<span class="p">...</span>
-$ <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">infra</span><span class="o">/</span><span class="n">websites</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">directory</span> <span class="n">production</span>
-<span class="p">...</span>
+<div class="codehilite"><pre>$ cd ~/apacheds
+$ svn co https://svn.apache.org/repos/infra/websites/staging/directory/trunk staging
+...
+$ svn co https://svn.apache.org/repos/infra/websites/production/directory production
+...
 </pre></div>
 
 
 <p>Now, you will first add the directory for the newly generated version :</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">api</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span>
-$ <span class="n">mkdir</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;</span>
-$ <span class="n">svn</span> <span class="n">add</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;</span>
+<div class="codehilite"><pre>$ cd ~/apacheds/production/content/api/gen-docs
+$ mkdir &lt;version&gt;
+$ svn add &lt;version&gt;
 </pre></div>
 
 
 <p>Then copy the generated docs :</p>
-<div class="codehilite"><pre>$ <span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">trunks</span><span class="o">/</span><span class="n">shared</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">checkout</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">site</span><span class="o">/</span><span class="n">apidocs</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">api</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span><span class="o">/&lt;</span><span class="n">version</span><span class="o">&gt;</span>
-$ <span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">trunks</span><span class="o">/</span><span class="n">shared</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">checkout</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">site</span><span class="o">/</span><span class="n">xref</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">api</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span><span class="o">/&lt;</span><span class="n">version</span><span class="o">&gt;</span>
+<div class="codehilite"><pre>$ cp -r ~/apacheds/trunks/shared/target/checkout/target/site/apidocs ~/apacheds/production/content/api/gen-docs/&lt;version&gt;
+$ cp -r ~/apacheds/trunks/shared/target/checkout/target/site/xref ~/apacheds/production/content/api/gen-docs/&lt;version&gt;
 $
 </pre></div>
 
 
 <p>You have to check in those directories :</p>
-<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">add</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;/*</span>
-$ <span class="n">svn</span> <span class="n">ci</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;</span> <span class="o">-</span><span class="n">m</span> &quot;<span class="n">Injected</span> <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;</span> <span class="n">javadocs</span>&quot;
+<div class="codehilite"><pre>$ svn add &lt;version&gt;/*
+$ svn ci &lt;version&gt; -m &quot;Injected &lt;version&gt; javadocs&quot;
 </pre></div>
 
 
 <p>Now, you have to update the staging site <em>extpaths.txt</em></p>
 <p>This file list the file on the production site that will not be overriden by the publication of the staging site. It has to be updated</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">staging</span><span class="o">/</span><span class="n">content</span><span class="o">/</span>
-$ <span class="n">vi</span> <span class="n">extpaths</span><span class="p">.</span><span class="n">txt</span>
+<div class="codehilite"><pre>$ cd ~/apacheds/staging/content/
+$ vi extpaths.txt
 </pre></div>
 
 
 <p>Add the following line :</p>
-<div class="codehilite"><pre><span class="p">...</span>
-# <span class="n">API</span>
-<span class="n">api</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span><span class="o">/&lt;</span><span class="n">version</span><span class="o">&gt;</span>
-<span class="p">...</span>
+<div class="codehilite"><pre>...
+# API
+api/gen-docs/&lt;version&gt;
+...
 </pre></div>
 
 
 <p>then save and check in the file <em>extpaths.txt</em></p>
 <p>We also have to update the <em>.htaccess</em> file :</p>
-<div class="codehilite"><pre>$ <span class="n">cd</span> <span class="o">~/</span><span class="n">apacheds</span><span class="o">/</span><span class="n">staging</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">api</span><span class="o">/</span><span class="n">gen</span><span class="o">-</span><span class="n">docs</span>
-$ <span class="n">vi</span> <span class="p">.</span><span class="n">htaccess</span>
+<div class="codehilite"><pre>$ cd ~/apacheds/staging/content/api/gen-docs
+$ vi .htaccess
 </pre></div>
 
 
 <p>And update the two last lines to refer to the version you've just released :</p>
-<div class="codehilite"><pre><span class="n">RewriteRule</span> ^<span class="n">latest</span>$ <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;/</span>
-<span class="n">RewriteRule</span> ^<span class="n">latest</span><span class="o">/</span><span class="p">(</span><span class="o">.*</span><span class="p">)</span>$ <span class="o">&lt;</span><span class="n">version</span><span class="o">&gt;/</span>$1
+<div class="codehilite"><pre>RewriteRule ^latest$ &lt;version&gt;/
+RewriteRule ^latest/(.*)$ &lt;version&gt;/$1
 </pre></div>
 
 



Mime
View raw message