Author: buildbot
Date: Wed May 29 13:46:04 2013
New Revision: 863628
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/development/release-management.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed May 29 13:46:04 2013
@@ -1 +1 @@
-1486631
+1487486
Modified:
websites/staging/sling/trunk/content/documentation/development/release-management.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/development/release-management.html
(original)
+++
websites/staging/sling/trunk/content/documentation/development/release-management.html
Wed May 29 13:46:04 2013
@@ -107,6 +107,7 @@
<li><a href="#related-links">Related Links</a></li>
<li><a
href="#appendix-a-create-and-add-your-key-to-httpwwwapacheorgdistslingkeys">Appendix
A: Create and Add your key to http://www.apache.org/dist/sling/KEYS</a></li>
<li><a href="#appendix-b-preparing-releases-on-mac-os-x">Appendix B: preparing
releases on Mac OS X</a></li>
+<li><a href="#appendix-c-deploy-bundles-on-the-sling-obr">Appendix C: Deploy
bundles on the Sling OBR</a></li>
</ul>
</div>
<h2 id="prerequisites">Prerequisites</h2>
@@ -346,69 +347,66 @@ When gpg asks for comment linked the key
<span class="n">Command</span> <span class="n">output:</span>
<span class="n">svn:</span> <span class="n">Commit</span> <span
class="n">failed</span> <span class="p">(</span><span class="n">details</span>
<span class="n">follow</span><span class="p">):</span>
<span class="n">svn:</span> <span class="n">MKACTIVITY</span> <span
class="n">of</span> <span
class="s">'/repos/asf/!svn/act/4f11ad5d-9161-0410-b4dd-cb727141ea8c'</span><span
class="p">:</span> <span class="n">authorization</span> <span
class="n">failed</span> <span class="p">(</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="p">){</span><span
class="n">code</span><span class="p">}</span>
-
-<span class="n">This</span> <span class="n">is</span> <span
class="n">due</span> <span class="n">to</span> <span class="n">a</span> <span
class="n">bug</span> <span class="n">in</span> <span
class="n">Subversion</span> <span class="n">on</span> <span
class="n">the</span> <span class="n">Mac</span><span class="p">,</span> <span
class="n">as</span> <span class="n">described</span> <span class="n">by</span>
<span class="n">Brett</span> <span class="n">Porter</span> <span
class="n">in</span> <span class="n">his</span> <span class="p">[</span><span
class="n">blog</span><span class="o">|</span><span class="n">http:</span><span
class="sr">//</span><span class="n">blogs</span><span class="o">.</span><span
class="n">exist</span><span class="o">.</span><span class="n">com</span><span
class="sr">/bporter/</span><span class="mi">2008</span><span
class="sr">/02/</span><span class="mi">25</span><span
class="sr">/working-around-non-interactive-problems-in-leopards-subversion/</span><span
c
lass="p">]</span><span class="o">.</span> <span class="n">He</span> <span
class="n">proposes</span> <span class="n">putting</span> <span
class="n">an</span> <span class="s">"svn"</span> <span
class="n">script</span> <span class="n">at</span> <span class="n">the</span>
<span class="n">head</span> <span class="n">of</span> <span
class="n">your</span> <span class="n">path</span> <span class="n">to</span>
<span class="n">fix</span> <span class="n">the</span> <span
class="n">issue</span><span class="o">.</span>
-
-<span class="n">h2</span><span class="o">.</span> <span
class="n">Appendix</span> <span class="n">C:</span> <span
class="n">Deploy</span> <span class="n">bundles</span> <span
class="n">on</span> <span class="n">the</span> <span class="n">Sling</span>
<span class="n">OBR</span>
-
-<span class="n">We</span> <span class="n">are</span> <span
class="n">mainting</span> <span class="n">an</span> <span class="n">OSGi</span>
<span class="n">Bundle</span> <span class="n">Repository</span> <span
class="n">providing</span> <span class="n">all</span> <span
class="n">release</span> <span class="n">of</span> <span class="n">the</span>
<span class="n">Sling</span> <span class="n">Bundles</span><span
class="o">.</span> <span class="n">This</span> <span
class="n">repository</span> <span class="n">is</span> <span
class="n">maintained</span> <span class="n">as</span> <span
class="n">part</span> <span class="n">of</span> <span class="n">the</span>
<span class="n">Apache</span> <span class="n">Sling</span> <span
class="n">site</span> <span class="ow">and</span> <span class="n">is</span>
<span class="n">available</span> <span class="n">at</span> <span
class="p">[</span><span class="n">http:</span><span class="sr">//s</span><span
class="n">ling</span><span class="o">.</span
><span class="n">apache</span><span class="o">.</span><span
>class="n">org</span><span class="sr">/obr/s</span><span
>class="n">ling</span><span class="o">.</span><span class="n">xml</span><span
>class="p">]</span><span class="o">.</span> <span class="n">The</span> <span
>class="n">source</span> <span class="k">for</span> <span
>class="n">this</span> <span class="n">page</span> <span class="n">is</span>
><span class="n">maintained</span> <span class="n">in</span> <span
>class="n">the</span> <span class="n">SVN</span> <span
>class="n">repository</span> <span class="n">below</span> <span
>class="n">the</span> <span class="n">_site_</span><span class="p">,</span>
><span class="n">that</span> <span class="n">is</span> <span
>class="n">at</span> <span class="p">[</span><span class="n">http:</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">/sling/si</span><span class="n">te</span><span
class="o">/</span><span class="p">]</span><span class="o">.</span> <span
class="n">To</span> <span class="n">update</span> <span class="n">the</span>
<span class="n">Sling</span> <span class="n">OBR</span> <span
class="n">repository</span> <span class="n">you</span> <span
class="n">must</span> <span class="n">be</span> <span class="n">an</span> <span
class="n">Apache</span> <span class="n">Sling</span> <span
class="n">Committer</span> <span class="n">since</span> <span
class="n">this</span> <span class="n">requires</span> <span
class="n">SVN</span> <span class="nb">write</span> <span
class="n">access</span><span class="o">.</span>
-
-<span class="n">To</span> <span class="n">update</span> <span
class="n">the</span> <span class="n">OBR</span> <span class="n">you</span>
<span class="n">may</span> <span class="k">use</span> <span
class="n">the</span> <span class="n">Apache</span> <span class="n">Felix</span>
<span class="n">Maven</span> <span class="n">Bundle</span> <span
class="n">Plugin</span> <span class="n">which</span> <span
class="n">prepares</span> <span class="n">the</span> <span
class="n">bundle</span> <span class="n">descriptor</span> <span
class="n">to</span> <span class="n">be</span> <span class="n">added</span>
<span class="n">to</span> <span class="n">the</span> <span class="n">OBR</span>
<span class="n">file</span><span class="o">.</span> <span
class="n">Follow</span> <span class="n">these</span> <span
class="n">steps</span> <span class="n">to</span> <span class="n">update</span>
<span class="n">the</span> <span class="n">OBR:</span>
-
-<span class="o">*</span><span class="mi">1</span><span class="o">.</span>
<span class="n">Checkout</span> <span class="ow">or</span> <span
class="n">update</span> <span class="n">the</span> <span class="n">Site</span>
<span class="n">Source</span><span class="o">*</span>
-</pre></div>
-
-
-<p>$ svn checkout https://svn.apache.org/repos/asf/sling/site</p>
-<div class="codehilite"><pre><span class="n">Note</span><span
class="p">,</span> <span class="n">that</span> <span class="n">you</span> <span
class="n">have</span> <span class="n">to</span> <span class="n">checkout</span>
<span class="n">the</span> <span class="n">site</span> <span
class="n">using</span> <span class="n">the</span> <span
class="n">URL</span><span class="p">,</span> <span class="n">otherwise</span>
<span class="n">you</span> <span class="n">will</span> <span
class="ow">not</span> <span class="n">be</span> <span class="n">able</span>
<span class="n">to</span> <span class="n">commit</span> <span
class="n">the</span> <span class="n">changes</span> <span
class="n">later</span><span class="o">.</span>
-
-<span class="o">*</span><span class="mi">2</span><span class="o">.</span>
<span class="n">Deploy</span> <span class="n">the</span> <span
class="n">Descriptor</span><span class="o">*</span>
-
-<span class="n">To</span> <span class="n">deploy</span> <span
class="n">the</span> <span class="n">project</span> <span
class="n">descriptor</span><span class="p">,</span> <span
class="n">checkout</span> <span class="n">the</span> <span class="n">tag</span>
<span class="n">of</span> <span class="n">the</span> <span
class="n">bundle</span> <span class="n">to</span> <span class="n">deploy</span>
<span class="ow">and</span> <span class="n">run</span> <span
class="n">maven</span>
</pre></div>
+<p>This is due to a bug in Subversion on the Mac, as described by Brett Porter
in his
[blog|http://blogs.exist.com/bporter/2008/02/25/working-around-non-interactive-problems-in-leopards-subversion/].
He proposes putting an "svn" script at the head of your path to fix the
issue.</p>
+<h2 id="appendix-c-deploy-bundles-on-the-sling-obr">Appendix C: Deploy bundles
on the Sling OBR</h2>
+<p>We are mainting an OSGi Bundle Repository providing all release of the
Sling Bundles. This repository is maintained as part of the Apache Sling site
and is available at [http://sling.apache.org/obr/sling.xml]. The source for
this page is maintained in the SVN repository below the <em>site</em>, that is
at [http://svn.apache.org/repos/asf/sling/site/]. To update the Sling OBR
repository you must be an Apache Sling Committer since this requires SVN write
access.</p>
+<p>To update the OBR you may use the Apache Felix Maven Bundle Plugin which
prepares the bundle descriptor to be added to the OBR file. Follow these steps
to update the OBR:</p>
+<ol>
+<li>
+<p>Checkout or update the Site Source</p>
+<p>$ svn checkout https://svn.apache.org/repos/asf/sling/site </p>
+</li>
+</ol>
+<p>Note, that you have to checkout the site using the URL, otherwise you will
not be able to commit the changes later.</p>
+<ol>
+<li>
+<p>Deploy the Descriptor</p>
+<p>To deploy the project descriptor, checkout the tag of the bundle to deploy
and run maven</p>
<p>$ svn checkout
http://svn.apache.org/repos/asf/sling/tags/the<em>module</em>tag
$ mvn clean install \
org.apache.felix:maven-bundle-plugin:deploy \
-DprefixUrl=http://repo1.maven.org/maven2 \
-DremoteOBR=sling.xml \
-DaltDeploymentRepository=apache.releases::default::file:///path<em>to</em>site_checkout/obr</p>
-<div class="codehilite"><pre><span class="n">This</span> <span
class="n">generates</span> <span class="n">the</span> <span
class="n">bundle</span> <span class="n">descriptor</span> <span
class="ow">and</span> <span class="n">adds</span> <span class="n">it</span>
<span class="n">to</span> <span class="n">the</span> <span
class="n">file</span> <span class="n">of</span> <span class="n">your</span>
<span class="n">site</span> <span class="n">checkout</span><span
class="o">.</span>
-
-<span class="o">*</span><span class="mi">2</span><span class="n">a</span><span
class="o">.</span> <span class="n">Variant:</span> <span class="n">Refer</span>
<span class="n">to</span> <span class="n">Maven</span> <span
class="n">Repository</span><span class="o">*</span>
-
-<span class="n">Instead</span> <span class="n">of</span> <span
class="n">checking</span> <span class="n">out</span> <span
class="ow">and</span> <span class="n">building</span> <span
class="n">the</span> <span class="n">project</span> <span
class="n">locally</span><span class="p">,</span> <span class="n">you</span>
<span class="n">may</span> <span class="n">also</span> <span
class="k">use</span> <span class="n">the</span> <span class="n">goal</span>
<span class="n">of</span> <span class="n">the</span> <span
class="n">Maven</span> <span class="n">Bundle</span> <span
class="n">Plugin:</span>
+</li>
+</ol>
+<p>This generates the bundle descriptor and adds it to the file of your site
checkout.</p>
+<p>2a. Variant: Refer to Maven Repository</p>
+<p>Instead of checking out and building the project locally, you may also use
the goal of the Maven Bundle Plugin:</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span
class="nv">wget</span> <span class="n">http:</span><span
class="sr">//</span><span class="n">repo1</span><span class="o">.</span><span
class="n">maven</span><span class="o">.</span><span class="n">org</span><span
class="sr">/maven2/o</span><span class="n">rg</span><span
class="sr">/apache/s</span><span class="n">ling</span><span
class="sr">/the*module/</span><span class="n">version</span><span
class="o">/</span><span class="n">the</span><span class="o">*</span><span
class="n">module</span><span class="o">-</span><span
class="n">version</span><span class="o">.</span><span class="n">jar</span>
+<span class="nv">$</span> <span class="nv">wget</span> <span
class="n">http:</span><span class="sr">//</span><span
class="n">repo1</span><span class="o">.</span><span class="n">maven</span><span
class="o">.</span><span class="n">org</span><span
class="sr">/maven2/o</span><span class="n">rg</span><span
class="sr">/apache/s</span><span class="n">ling</span><span
class="sr">/the*module/</span><span class="n">version</span><span
class="o">/</span><span class="n">the</span><span class="o">*</span><span
class="n">module</span><span class="o">-</span><span
class="n">version</span><span class="o">.</span><span class="n">pom</span>
+<span class="nv">$</span> <span class="nv">mvn</span> <span
class="n">org</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">felix:maven</span><span
class="o">-</span><span class="n">bundle</span><span class="o">-</span><span
class="n">plugin:deploy</span><span class="o">-</span><span
class="n">file</span> <span class="o">\</span>
+ <span class="o">-</span><span class="n">Dfile</span><span
class="o">=</span><span class="n">the</span><span class="o">*</span><span
class="n">module</span><span class="o">-</span><span
class="n">version</span><span class="o">.</span><span class="n">jar</span>
<span class="o">-</span><span class="n">DpomFile</span><span
class="o">=</span><span class="n">the</span><span class="o">*</span><span
class="n">module</span><span class="o">-</span><span
class="n">version</span><span class="o">.</span><span class="n">pom</span>
<span class="o">\</span>
+ <span class="o">-</span><span class="n">DbundleUrl</span><span
class="o">=</span><span class="n">http:</span><span class="sr">//</span><span
class="n">repo1</span><span class="o">.</span><span class="n">maven</span><span
class="o">.</span><span class="n">org</span><span
class="sr">/maven2/o</span><span class="n">rg</span><span
class="sr">/apache/s</span><span class="n">ling</span><span
class="sr">/the*module/</span><span class="n">version</span><span
class="o">/</span><span class="n">the</span><span class="o">*</span><span
class="n">module</span><span class="o">-</span><span
class="n">version</span><span class="o">.</span><span class="n">jar</span>
<span class="o">\</span>
+ <span class="o">-</span><span class="n">Durl</span><span
class="o">=</span><span class="n">file:</span><span
class="sr">///path*to*site_checkout/o</span><span class="n">br</span> <span
class="o">\</span>
+ <span class="o">-</span><span class="n">DprefixUrl</span><span
class="o">=</span><span class="n">http:</span><span class="sr">//</span><span
class="n">repo1</span><span class="o">.</span><span class="n">maven</span><span
class="o">.</span><span class="n">org</span><span class="o">/</span><span
class="n">maven2</span> <span class="o">\</span>
+ <span class="o">-</span><span class="n">DremoteOBR</span><span
class="o">=</span><span class="n">sling</span><span class="o">.</span><span
class="n">xml</span>
+<span class="nv">$</span> <span class="nv">rm</span> <span
class="n">the</span><span class="o">*</span><span class="n">module</span><span
class="o">-</span><span class="n">version</span><span class="o">.</span><span
class="n">jar</span> <span class="n">the</span><span class="o">*</span><span
class="n">module</span><span class="o">-</span><span
class="n">version</span><span class="o">.</span><span class="n">pom</span>
</pre></div>
-<p>$ wget
http://repo1.maven.org/maven2/org/apache/sling/the<em>module/version/the</em>module-version.jar
-$ wget
http://repo1.maven.org/maven2/org/apache/sling/the<em>module/version/the</em>module-version.pom
-$ mvn org.apache.felix:maven-bundle-plugin:deploy-file \
- -Dfile=the<em>module-version.jar -DpomFile=the</em>module-version.pom \
-
-DbundleUrl=http://repo1.maven.org/maven2/org/apache/sling/the<em>module/version/the</em>module-version.jar
\
- -Durl=file:///path<em>to</em>site_checkout/obr \
- -DprefixUrl=http://repo1.maven.org/maven2 \
- -DremoteOBR=sling.xml
-$ rm the<em>module-version.jar the</em>module-version.pom</p>
-<div class="codehilite"><pre><span class="o">*</span><span
class="mi">3</span><span class="o">.</span> <span class="n">Commite</span>
<span class="n">the</span> <span class="n">Site</span> <span
class="n">Changes</span><span class="o">*</span>
-
-<span class="n">In</span> <span class="n">the</span> <span
class="n">Site</span> <span class="n">checkout</span> <span
class="n">folder</span> <span class="n">commit</span> <span
class="n">the</span> <span class="n">changes</span> <span class="n">to</span>
<span class="n">the</span> <span class="n">files</span> <span
class="p">(</span><span class="n">you</span> <span class="n">may</span> <span
class="n">also</span> <span class="n">review</span> <span class="n">the</span>
<span class="n">changes</span> <span class="n">using</span> <span
class="n">the</span> <span class="n">command</span><span
class="p">)</span><span class="o">.</span>
+<ol>
+<li>Commite the Site Changes</li>
+</ol>
+<p>In the Site checkout folder commit the changes to the files (you may also
review the changes using the command).</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span
class="nv">svn</span> <span class="n">commit</span> <span
class="o">-</span><span class="n">m</span><span class="s">"Add Bundle ABC
Version X.Y.Z"</span> <span class="n">obr</span><span
class="o">/</span><span class="n">sling</span><span class="o">.</span><span
class="n">xml</span>
</pre></div>
-<p>$ svn commit -m"Add Bundle ABC Version X.Y.Z" obr/sling.xml</p>
-<div class="codehilite"><pre><span class="o">*</span><span
class="mi">4</span><span class="o">.</span> <span class="n">Update</span> <span
class="n">the</span> <span class="n">Site</span> <span class="n">on</span><span
class="o">*</span> <span class="p">}</span>
-
-<span class="n">After</span> <span class="n">committing</span> <span
class="n">the</span> <span class="n">changes</span><span class="p">,</span>
<span class="n">you</span> <span class="n">have</span> <span
class="n">to</span> <span class="n">update</span> <span class="n">the</span>
<span class="n">site</span> <span class="n">source</span><span
class="p">,</span> <span class="n">which</span> <span class="n">is</span> <span
class="n">getting</span> <span class="n">mirrored</span> <span
class="n">to</span> <span class="n">the</span> <span class="n">web</span> <span
class="n">servers</span> <span class="n">on</span>
+<ol>
+<li>Update the Site on* </li>
+</ol>
+<p>After committing the changes, you have to update the site source, which is
getting mirrored to the web servers on </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="n">svn</span> <span class="n">update</span>
<span class="sr">/x1/</span><span class="n">www</span><span
class="sr">/sling.apache.org/o</span><span class="n">br</span><span
class="o">/</span><span class="n">sling</span><span class="o">.</span><span
class="n">xml</span>
</pre></div>
-<p>$ ssh people.apache.org svn update
/x1/www/sling.apache.org/obr/sling.xml</p>
-<div class="codehilite"><pre><span class="n">After</span> <span
class="n">updating</span> <span class="n">the</span> <span
class="n">site</span> <span class="n">source</span> <span class="n">it</span>
<span class="n">will</span> <span class="n">generally</span> <span
class="n">take</span> <span class="n">an</span> <span class="n">hour</span>
<span class="ow">or</span> <span class="n">two</span> <span
class="k">until</span> <span class="n">the</span> <span
class="n">changes</span> <span class="n">are</span> <span
class="n">visible</span> <span class="n">on</span> <span class="n">the</span>
<span class="n">web</span><span class="o">.</span>
-</pre></div>
+<p>After updating the site source it will generally take an hour or two until
the changes are visible on the web.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1486624 by bdelacretaz on Mon, 27 May 2013 13:49:15 +0000
+ Rev. 1487486 by dklco on Wed, 29 May 2013 13:45:54 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
