You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2012/04/22 19:09:58 UTC

svn commit: r813969 [8/11] - /websites/staging/sling/trunk/content/

Modified: websites/staging/sling/trunk/content/project-license.html
==============================================================================
--- websites/staging/sling/trunk/content/project-license.html (original)
+++ websites/staging/sling/trunk/content/project-license.html Sun Apr 22 17:09:56 2012
@@ -79,231 +79,10 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-		(TODO: breadcrumb here)
+<a href="/">Home</a>
       </div>
-      <h1 class="title">Project License</h1>
-      <div>
-	    <div class="codehilite"><pre>                 <span class="n">Apache</span> <span class="n">License</span>
-               <span class="n">Version</span> <span class="mf">2.0</span><span class="p">,</span> <span class="n">January</span> <span class="mi">2004</span>
-            <span class="n">http:</span><span class="sr">//</span><span class="n">www</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/licenses/</span>
+   <!--   <h1 class="title">Project License</h1> -->
 
-   <span class="n">TERMS</span> <span class="n">AND</span> <span class="n">CONDITIONS</span> <span class="n">FOR</span> <span class="n">USE</span><span class="p">,</span> <span class="n">REPRODUCTION</span><span class="p">,</span> <span class="n">AND</span> <span class="n">DISTRIBUTION</span>
-
-   <span class="mi">1</span><span class="o">.</span> <span class="n">Definitions</span><span class="o">.</span>
-
-      <span class="s">&quot;License&quot;</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">the</span> <span class="n">terms</span> <span class="ow">and</span> <span class="n">conditions</span> <span class="k">for</span> <span class="k">use</span><span class="p">,</span> <span class="n">reproduction</span><span class="p">,</span>
-      <span class="ow">and</span> <span class="n">distribution</span> <span class="n">as</span> <span class="nb">defined</span> <span class="n">by</span> <span class="n">Sections</span> <span class="mi">1</span> <span class="n">through</span> <span class="mi">9</span> <span class="n">of</span> <span class="n">this</span> <span class="n">document</span><span class="o">.</span>
-
-      <span class="s">&quot;Licensor&quot;</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">the</span> <span class="n">copyright</span> <span class="n">owner</span> <span class="ow">or</span> <span class="n">entity</span> <span class="n">authorized</span> <span class="n">by</span>
-      <span class="n">the</span> <span class="n">copyright</span> <span class="n">owner</span> <span class="n">that</span> <span class="n">is</span> <span class="n">granting</span> <span class="n">the</span> <span class="n">License</span><span class="o">.</span>
-
-      <span class="s">&quot;Legal Entity&quot;</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">the</span> <span class="n">union</span> <span class="n">of</span> <span class="n">the</span> <span class="n">acting</span> <span class="n">entity</span> <span class="ow">and</span> <span class="n">all</span>
-      <span class="n">other</span> <span class="n">entities</span> <span class="n">that</span> <span class="n">control</span><span class="p">,</span> <span class="n">are</span> <span class="n">controlled</span> <span class="n">by</span><span class="p">,</span> <span class="ow">or</span> <span class="n">are</span> <span class="n">under</span> <span class="n">common</span>
-      <span class="n">control</span> <span class="n">with</span> <span class="n">that</span> <span class="n">entity</span><span class="o">.</span> <span class="n">For</span> <span class="n">the</span> <span class="n">purposes</span> <span class="n">of</span> <span class="n">this</span> <span class="n">definition</span><span class="p">,</span>
-      <span class="s">&quot;control&quot;</span> <span class="n">means</span> <span class="p">(</span><span class="n">i</span><span class="p">)</span> <span class="n">the</span> <span class="n">power</span><span class="p">,</span> <span class="n">direct</span> <span class="ow">or</span> <span class="n">indirect</span><span class="p">,</span> <span class="n">to</span> <span class="n">cause</span> <span class="n">the</span>
-      <span class="n">direction</span> <span class="ow">or</span> <span class="n">management</span> <span class="n">of</span> <span class="n">such</span> <span class="n">entity</span><span class="p">,</span> <span class="n">whether</span> <span class="n">by</span> <span class="n">contract</span> <span class="ow">or</span>
-      <span class="n">otherwise</span><span class="p">,</span> <span class="ow">or</span> <span class="p">(</span><span class="n">ii</span><span class="p">)</span> <span class="n">ownership</span> <span class="n">of</span> <span class="n">fifty</span> <span class="n">percent</span> <span class="p">(</span><span class="mi">50</span><span class="nv">%</span><span class="p">)</span> <span class="ow">or</span> <span class="n">more</span> <span class="n">of</span> <span class="n">the</span>
-      <span class="n">outstanding</span> <span class="n">shares</span><span class="p">,</span> <span class="ow">or</span> <span class="p">(</span><span class="n">iii</span><span class="p">)</span> <span class="n">beneficial</span> <span class="n">ownership</span> <span class="n">of</span> <span class="n">such</span> <span class="n">entity</span><span class="o">.</span>
-
-      <span class="s">&quot;You&quot;</span> <span class="p">(</span><span class="ow">or</span> <span class="s">&quot;Your&quot;</span><span class="p">)</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">an</span> <span class="n">individual</span> <span class="ow">or</span> <span class="n">Legal</span> <span class="n">Entity</span>
-      <span class="n">exercising</span> <span class="n">permissions</span> <span class="n">granted</span> <span class="n">by</span> <span class="n">this</span> <span class="n">License</span><span class="o">.</span>
-
-      <span class="s">&quot;Source&quot;</span> <span class="n">form</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">the</span> <span class="n">preferred</span> <span class="n">form</span> <span class="k">for</span> <span class="n">making</span> <span class="n">modifications</span><span class="p">,</span>
-      <span class="n">including</span> <span class="n">but</span> <span class="ow">not</span> <span class="n">limited</span> <span class="n">to</span> <span class="n">software</span> <span class="n">source</span> <span class="n">code</span><span class="p">,</span> <span class="n">documentation</span>
-      <span class="n">source</span><span class="p">,</span> <span class="ow">and</span> <span class="n">configuration</span> <span class="n">files</span><span class="o">.</span>
-
-      <span class="s">&quot;Object&quot;</span> <span class="n">form</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">any</span> <span class="n">form</span> <span class="n">resulting</span> <span class="n">from</span> <span class="n">mechanical</span>
-      <span class="n">transformation</span> <span class="ow">or</span> <span class="n">translation</span> <span class="n">of</span> <span class="n">a</span> <span class="n">Source</span> <span class="n">form</span><span class="p">,</span> <span class="n">including</span> <span class="n">but</span>
-      <span class="ow">not</span> <span class="n">limited</span> <span class="n">to</span> <span class="n">compiled</span> <span class="n">object</span> <span class="n">code</span><span class="p">,</span> <span class="n">generated</span> <span class="n">documentation</span><span class="p">,</span>
-      <span class="ow">and</span> <span class="n">conversions</span> <span class="n">to</span> <span class="n">other</span> <span class="n">media</span> <span class="n">types</span><span class="o">.</span>
-
-      <span class="s">&quot;Work&quot;</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">the</span> <span class="n">work</span> <span class="n">of</span> <span class="n">authorship</span><span class="p">,</span> <span class="n">whether</span> <span class="n">in</span> <span class="n">Source</span> <span class="ow">or</span>
-      <span class="n">Object</span> <span class="n">form</span><span class="p">,</span> <span class="n">made</span> <span class="n">available</span> <span class="n">under</span> <span class="n">the</span> <span class="n">License</span><span class="p">,</span> <span class="n">as</span> <span class="n">indicated</span> <span class="n">by</span> <span class="n">a</span>
-      <span class="n">copyright</span> <span class="n">notice</span> <span class="n">that</span> <span class="n">is</span> <span class="n">included</span> <span class="n">in</span> <span class="ow">or</span> <span class="n">attached</span> <span class="n">to</span> <span class="n">the</span> <span class="n">work</span>
-      <span class="p">(</span><span class="n">an</span> <span class="n">example</span> <span class="n">is</span> <span class="n">provided</span> <span class="n">in</span> <span class="n">the</span> <span class="n">Appendix</span> <span class="n">below</span><span class="p">)</span><span class="o">.</span>
-
-      <span class="s">&quot;Derivative Works&quot;</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">any</span> <span class="n">work</span><span class="p">,</span> <span class="n">whether</span> <span class="n">in</span> <span class="n">Source</span> <span class="ow">or</span> <span class="n">Object</span>
-      <span class="n">form</span><span class="p">,</span> <span class="n">that</span> <span class="n">is</span> <span class="n">based</span> <span class="n">on</span> <span class="p">(</span><span class="ow">or</span> <span class="n">derived</span> <span class="n">from</span><span class="p">)</span> <span class="n">the</span> <span class="n">Work</span> <span class="ow">and</span> <span class="k">for</span> <span class="n">which</span> <span class="n">the</span>
-      <span class="n">editorial</span> <span class="n">revisions</span><span class="p">,</span> <span class="n">annotations</span><span class="p">,</span> <span class="n">elaborations</span><span class="p">,</span> <span class="ow">or</span> <span class="n">other</span>
-</pre></div>
-
-
-<p>modifications
-          represent, as a whole, an original work of authorship. For the
-purposes
-          of this License, Derivative Works shall not include works that remain
-          separable from, or merely link (or bind by name) to the interfaces
-of,
-          the Work and Derivative Works thereof.</p>
-<div class="codehilite"><pre>      <span class="s">&quot;Contribution&quot;</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">any</span> <span class="n">work</span> <span class="n">of</span> <span class="n">authorship</span><span class="p">,</span> <span class="n">including</span>
-      <span class="n">the</span> <span class="n">original</span> <span class="n">version</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Work</span> <span class="ow">and</span> <span class="n">any</span> <span class="n">modifications</span> <span class="ow">or</span> <span class="n">additions</span>
-      <span class="n">to</span> <span class="n">that</span> <span class="n">Work</span> <span class="ow">or</span> <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">thereof</span><span class="p">,</span> <span class="n">that</span> <span class="n">is</span> <span class="n">intentionally</span>
-      <span class="n">submitted</span> <span class="n">to</span> <span class="n">Licensor</span> <span class="k">for</span> <span class="n">inclusion</span> <span class="n">in</span> <span class="n">the</span> <span class="n">Work</span> <span class="n">by</span> <span class="n">the</span> <span class="n">copyright</span>
-</pre></div>
-
-
-<p>owner
-          or by an individual or Legal Entity authorized to submit on behalf of
-          the copyright owner. For the purposes of this definition, "submitted"
-          means any form of electronic, verbal, or written communication sent
-          to the Licensor or its representatives, including but not limited to
-          communication on electronic mailing lists, source code control
-systems,
-          and issue tracking systems that are managed by, or on behalf of, the
-          Licensor for the purpose of discussing and improving the Work, but
-          excluding communication that is conspicuously marked or otherwise
-          designated in writing by the copyright owner as "Not a Contribution."</p>
-<div class="codehilite"><pre>      <span class="s">&quot;Contributor&quot;</span> <span class="n">shall</span> <span class="n">mean</span> <span class="n">Licensor</span> <span class="ow">and</span> <span class="n">any</span> <span class="n">individual</span> <span class="ow">or</span> <span class="n">Legal</span> <span class="n">Entity</span>
-      <span class="n">on</span> <span class="n">behalf</span> <span class="n">of</span> <span class="n">whom</span> <span class="n">a</span> <span class="n">Contribution</span> <span class="n">has</span> <span class="n">been</span> <span class="n">received</span> <span class="n">by</span> <span class="n">Licensor</span> <span class="ow">and</span>
-      <span class="n">subsequently</span> <span class="n">incorporated</span> <span class="n">within</span> <span class="n">the</span> <span class="n">Work</span><span class="o">.</span>
-
-   <span class="mi">2</span><span class="o">.</span> <span class="n">Grant</span> <span class="n">of</span> <span class="n">Copyright</span> <span class="n">License</span><span class="o">.</span> <span class="n">Subject</span> <span class="n">to</span> <span class="n">the</span> <span class="n">terms</span> <span class="ow">and</span> <span class="n">conditions</span> <span class="n">of</span>
-      <span class="n">this</span> <span class="n">License</span><span class="p">,</span> <span class="nb">each</span> <span class="n">Contributor</span> <span class="n">hereby</span> <span class="n">grants</span> <span class="n">to</span> <span class="n">You</span> <span class="n">a</span> <span class="n">perpetual</span><span class="p">,</span>
-      <span class="n">worldwide</span><span class="p">,</span> <span class="n">non</span><span class="o">-</span><span class="n">exclusive</span><span class="p">,</span> <span class="nb">no</span><span class="o">-</span><span class="n">charge</span><span class="p">,</span> <span class="n">royalty</span><span class="o">-</span><span class="n">free</span><span class="p">,</span> <span class="n">irrevocable</span>
-      <span class="n">copyright</span> <span class="n">license</span> <span class="n">to</span> <span class="n">reproduce</span><span class="p">,</span> <span class="n">prepare</span> <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">of</span><span class="p">,</span>
-      <span class="n">publicly</span> <span class="n">display</span><span class="p">,</span> <span class="n">publicly</span> <span class="n">perform</span><span class="p">,</span> <span class="n">sublicense</span><span class="p">,</span> <span class="ow">and</span> <span class="n">distribute</span> <span class="n">the</span>
-      <span class="n">Work</span> <span class="ow">and</span> <span class="n">such</span> <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">in</span> <span class="n">Source</span> <span class="ow">or</span> <span class="n">Object</span> <span class="n">form</span><span class="o">.</span>
-
-   <span class="mi">3</span><span class="o">.</span> <span class="n">Grant</span> <span class="n">of</span> <span class="n">Patent</span> <span class="n">License</span><span class="o">.</span> <span class="n">Subject</span> <span class="n">to</span> <span class="n">the</span> <span class="n">terms</span> <span class="ow">and</span> <span class="n">conditions</span> <span class="n">of</span>
-      <span class="n">this</span> <span class="n">License</span><span class="p">,</span> <span class="nb">each</span> <span class="n">Contributor</span> <span class="n">hereby</span> <span class="n">grants</span> <span class="n">to</span> <span class="n">You</span> <span class="n">a</span> <span class="n">perpetual</span><span class="p">,</span>
-      <span class="n">worldwide</span><span class="p">,</span> <span class="n">non</span><span class="o">-</span><span class="n">exclusive</span><span class="p">,</span> <span class="nb">no</span><span class="o">-</span><span class="n">charge</span><span class="p">,</span> <span class="n">royalty</span><span class="o">-</span><span class="n">free</span><span class="p">,</span> <span class="n">irrevocable</span>
-      <span class="p">(</span><span class="n">except</span> <span class="n">as</span> <span class="n">stated</span> <span class="n">in</span> <span class="n">this</span> <span class="n">section</span><span class="p">)</span> <span class="n">patent</span> <span class="n">license</span> <span class="n">to</span> <span class="n">make</span><span class="p">,</span> <span class="n">have</span> <span class="n">made</span><span class="p">,</span>
-      <span class="k">use</span><span class="p">,</span> <span class="n">offer</span> <span class="n">to</span> <span class="n">sell</span><span class="p">,</span> <span class="n">sell</span><span class="p">,</span> <span class="nb">import</span><span class="p">,</span> <span class="ow">and</span> <span class="n">otherwise</span> <span class="n">transfer</span> <span class="n">the</span> <span class="n">Work</span><span class="p">,</span>
-      <span class="n">where</span> <span class="n">such</span> <span class="n">license</span> <span class="n">applies</span> <span class="n">only</span> <span class="n">to</span> <span class="n">those</span> <span class="n">patent</span> <span class="n">claims</span> <span class="n">licensable</span>
-      <span class="n">by</span> <span class="n">such</span> <span class="n">Contributor</span> <span class="n">that</span> <span class="n">are</span> <span class="n">necessarily</span> <span class="n">infringed</span> <span class="n">by</span> <span class="n">their</span>
-      <span class="n">Contribution</span><span class="p">(</span><span class="n">s</span><span class="p">)</span> <span class="n">alone</span> <span class="ow">or</span> <span class="n">by</span> <span class="n">combination</span> <span class="n">of</span> <span class="n">their</span> <span class="n">Contribution</span><span class="p">(</span><span class="n">s</span><span class="p">)</span>
-      <span class="n">with</span> <span class="n">the</span> <span class="n">Work</span> <span class="n">to</span> <span class="n">which</span> <span class="n">such</span> <span class="n">Contribution</span><span class="p">(</span><span class="n">s</span><span class="p">)</span> <span class="n">was</span> <span class="n">submitted</span><span class="o">.</span> <span class="n">If</span> <span class="n">You</span>
-      <span class="n">institute</span> <span class="n">patent</span> <span class="n">litigation</span> <span class="n">against</span> <span class="n">any</span> <span class="n">entity</span> <span class="p">(</span><span class="n">including</span> <span class="n">a</span>
-      <span class="n">cross</span><span class="o">-</span><span class="n">claim</span> <span class="ow">or</span> <span class="n">counterclaim</span> <span class="n">in</span> <span class="n">a</span> <span class="n">lawsuit</span><span class="p">)</span> <span class="n">alleging</span> <span class="n">that</span> <span class="n">the</span> <span class="n">Work</span>
-      <span class="ow">or</span> <span class="n">a</span> <span class="n">Contribution</span> <span class="n">incorporated</span> <span class="n">within</span> <span class="n">the</span> <span class="n">Work</span> <span class="n">constitutes</span> <span class="n">direct</span>
-      <span class="ow">or</span> <span class="n">contributory</span> <span class="n">patent</span> <span class="n">infringement</span><span class="p">,</span> <span class="k">then</span> <span class="n">any</span> <span class="n">patent</span> <span class="n">licenses</span>
-      <span class="n">granted</span> <span class="n">to</span> <span class="n">You</span> <span class="n">under</span> <span class="n">this</span> <span class="n">License</span> <span class="k">for</span> <span class="n">that</span> <span class="n">Work</span> <span class="n">shall</span> <span class="n">terminate</span>
-      <span class="n">as</span> <span class="n">of</span> <span class="n">the</span> <span class="n">date</span> <span class="n">such</span> <span class="n">litigation</span> <span class="n">is</span> <span class="n">filed</span><span class="o">.</span>
-
-   <span class="mi">4</span><span class="o">.</span> <span class="n">Redistribution</span><span class="o">.</span> <span class="n">You</span> <span class="n">may</span> <span class="n">reproduce</span> <span class="ow">and</span> <span class="n">distribute</span> <span class="n">copies</span> <span class="n">of</span> <span class="n">the</span>
-      <span class="n">Work</span> <span class="ow">or</span> <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">thereof</span> <span class="n">in</span> <span class="n">any</span> <span class="n">medium</span><span class="p">,</span> <span class="n">with</span> <span class="ow">or</span> <span class="n">without</span>
-      <span class="n">modifications</span><span class="p">,</span> <span class="ow">and</span> <span class="n">in</span> <span class="n">Source</span> <span class="ow">or</span> <span class="n">Object</span> <span class="n">form</span><span class="p">,</span> <span class="n">provided</span> <span class="n">that</span> <span class="n">You</span>
-      <span class="n">meet</span> <span class="n">the</span> <span class="n">following</span> <span class="n">conditions:</span>
-
-      <span class="p">(</span><span class="n">a</span><span class="p">)</span> <span class="n">You</span> <span class="n">must</span> <span class="n">give</span> <span class="n">any</span> <span class="n">other</span> <span class="n">recipients</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Work</span> <span class="ow">or</span>
-      <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">a</span> <span class="n">copy</span> <span class="n">of</span> <span class="n">this</span> <span class="n">License</span><span class="p">;</span> <span class="ow">and</span>
-
-      <span class="p">(</span><span class="n">b</span><span class="p">)</span> <span class="n">You</span> <span class="n">must</span> <span class="n">cause</span> <span class="n">any</span> <span class="n">modified</span> <span class="n">files</span> <span class="n">to</span> <span class="n">carry</span> <span class="n">prominent</span> <span class="n">notices</span>
-      <span class="n">stating</span> <span class="n">that</span> <span class="n">You</span> <span class="n">changed</span> <span class="n">the</span> <span class="n">files</span><span class="p">;</span> <span class="ow">and</span>
-
-      <span class="p">(</span><span class="n">c</span><span class="p">)</span> <span class="n">You</span> <span class="n">must</span> <span class="n">retain</span><span class="p">,</span> <span class="n">in</span> <span class="n">the</span> <span class="n">Source</span> <span class="n">form</span> <span class="n">of</span> <span class="n">any</span> <span class="n">Derivative</span> <span class="n">Works</span>
-      <span class="n">that</span> <span class="n">You</span> <span class="n">distribute</span><span class="p">,</span> <span class="n">all</span> <span class="n">copyright</span><span class="p">,</span> <span class="n">patent</span><span class="p">,</span> <span class="n">trademark</span><span class="p">,</span> <span class="ow">and</span>
-      <span class="n">attribution</span> <span class="n">notices</span> <span class="n">from</span> <span class="n">the</span> <span class="n">Source</span> <span class="n">form</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Work</span><span class="p">,</span>
-      <span class="n">excluding</span> <span class="n">those</span> <span class="n">notices</span> <span class="n">that</span> <span class="k">do</span> <span class="ow">not</span> <span class="n">pertain</span> <span class="n">to</span> <span class="n">any</span> <span class="n">part</span> <span class="n">of</span>
-      <span class="n">the</span> <span class="n">Derivative</span> <span class="n">Works</span><span class="p">;</span> <span class="ow">and</span>
-
-      <span class="p">(</span><span class="n">d</span><span class="p">)</span> <span class="n">If</span> <span class="n">the</span> <span class="n">Work</span> <span class="n">includes</span> <span class="n">a</span> <span class="s">&quot;NOTICE&quot;</span> <span class="n">text</span> <span class="n">file</span> <span class="n">as</span> <span class="n">part</span> <span class="n">of</span> <span class="n">its</span>
-      <span class="n">distribution</span><span class="p">,</span> <span class="k">then</span> <span class="n">any</span> <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">that</span> <span class="n">You</span> <span class="n">distribute</span> <span class="n">must</span>
-      <span class="n">include</span> <span class="n">a</span> <span class="n">readable</span> <span class="n">copy</span> <span class="n">of</span> <span class="n">the</span> <span class="n">attribution</span> <span class="n">notices</span> <span class="n">contained</span>
-      <span class="n">within</span> <span class="n">such</span> <span class="n">NOTICE</span> <span class="n">file</span><span class="p">,</span> <span class="n">excluding</span> <span class="n">those</span> <span class="n">notices</span> <span class="n">that</span> <span class="k">do</span> <span class="ow">not</span>
-      <span class="n">pertain</span> <span class="n">to</span> <span class="n">any</span> <span class="n">part</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Derivative</span> <span class="n">Works</span><span class="p">,</span> <span class="n">in</span> <span class="n">at</span> <span class="n">least</span> <span class="n">one</span>
-      <span class="n">of</span> <span class="n">the</span> <span class="n">following</span> <span class="n">places:</span> <span class="n">within</span> <span class="n">a</span> <span class="n">NOTICE</span> <span class="n">text</span> <span class="n">file</span> <span class="n">distributed</span>
-      <span class="n">as</span> <span class="n">part</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Derivative</span> <span class="n">Works</span><span class="p">;</span> <span class="n">within</span> <span class="n">the</span> <span class="n">Source</span> <span class="n">form</span> <span class="ow">or</span>
-      <span class="n">documentation</span><span class="p">,</span> <span class="k">if</span> <span class="n">provided</span> <span class="n">along</span> <span class="n">with</span> <span class="n">the</span> <span class="n">Derivative</span> <span class="n">Works</span><span class="p">;</span> <span class="ow">or</span><span class="p">,</span>
-      <span class="n">within</span> <span class="n">a</span> <span class="n">display</span> <span class="n">generated</span> <span class="n">by</span> <span class="n">the</span> <span class="n">Derivative</span> <span class="n">Works</span><span class="p">,</span> <span class="k">if</span> <span class="ow">and</span>
-      <span class="n">wherever</span> <span class="n">such</span> <span class="n">third</span><span class="o">-</span><span class="n">party</span> <span class="n">notices</span> <span class="n">normally</span> <span class="n">appear</span><span class="o">.</span> <span class="n">The</span> <span class="n">contents</span>
-      <span class="n">of</span> <span class="n">the</span> <span class="n">NOTICE</span> <span class="n">file</span> <span class="n">are</span> <span class="k">for</span> <span class="n">informational</span> <span class="n">purposes</span> <span class="n">only</span> <span class="ow">and</span>
-      <span class="k">do</span> <span class="ow">not</span> <span class="n">modify</span> <span class="n">the</span> <span class="n">License</span><span class="o">.</span> <span class="n">You</span> <span class="n">may</span> <span class="n">add</span> <span class="n">Your</span> <span class="n">own</span> <span class="n">attribution</span>
-      <span class="n">notices</span> <span class="n">within</span> <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">that</span> <span class="n">You</span> <span class="n">distribute</span><span class="p">,</span> <span class="n">alongside</span>
-      <span class="ow">or</span> <span class="n">as</span> <span class="n">an</span> <span class="n">addendum</span> <span class="n">to</span> <span class="n">the</span> <span class="n">NOTICE</span> <span class="n">text</span> <span class="n">from</span> <span class="n">the</span> <span class="n">Work</span><span class="p">,</span> <span class="n">provided</span>
-      <span class="n">that</span> <span class="n">such</span> <span class="n">additional</span> <span class="n">attribution</span> <span class="n">notices</span> <span class="n">cannot</span> <span class="n">be</span> <span class="n">construed</span>
-      <span class="n">as</span> <span class="n">modifying</span> <span class="n">the</span> <span class="n">License</span><span class="o">.</span>
-
-      <span class="n">You</span> <span class="n">may</span> <span class="n">add</span> <span class="n">Your</span> <span class="n">own</span> <span class="n">copyright</span> <span class="n">statement</span> <span class="n">to</span> <span class="n">Your</span> <span class="n">modifications</span> <span class="ow">and</span>
-      <span class="n">may</span> <span class="n">provide</span> <span class="n">additional</span> <span class="ow">or</span> <span class="n">different</span> <span class="n">license</span> <span class="n">terms</span> <span class="ow">and</span> <span class="n">conditions</span>
-      <span class="k">for</span> <span class="k">use</span><span class="p">,</span> <span class="n">reproduction</span><span class="p">,</span> <span class="ow">or</span> <span class="n">distribution</span> <span class="n">of</span> <span class="n">Your</span> <span class="n">modifications</span><span class="p">,</span> <span class="ow">or</span>
-      <span class="k">for</span> <span class="n">any</span> <span class="n">such</span> <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">as</span> <span class="n">a</span> <span class="n">whole</span><span class="p">,</span> <span class="n">provided</span> <span class="n">Your</span> <span class="k">use</span><span class="p">,</span>
-      <span class="n">reproduction</span><span class="p">,</span> <span class="ow">and</span> <span class="n">distribution</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Work</span> <span class="n">otherwise</span> <span class="n">complies</span> <span class="n">with</span>
-      <span class="n">the</span> <span class="n">conditions</span> <span class="n">stated</span> <span class="n">in</span> <span class="n">this</span> <span class="n">License</span><span class="o">.</span>
-
-   <span class="mi">5</span><span class="o">.</span> <span class="n">Submission</span> <span class="n">of</span> <span class="n">Contributions</span><span class="o">.</span> <span class="n">Unless</span> <span class="n">You</span> <span class="n">explicitly</span> <span class="n">state</span> <span class="n">otherwise</span><span class="p">,</span>
-      <span class="n">any</span> <span class="n">Contribution</span> <span class="n">intentionally</span> <span class="n">submitted</span> <span class="k">for</span> <span class="n">inclusion</span> <span class="n">in</span> <span class="n">the</span> <span class="n">Work</span>
-      <span class="n">by</span> <span class="n">You</span> <span class="n">to</span> <span class="n">the</span> <span class="n">Licensor</span> <span class="n">shall</span> <span class="n">be</span> <span class="n">under</span> <span class="n">the</span> <span class="n">terms</span> <span class="ow">and</span> <span class="n">conditions</span> <span class="n">of</span>
-      <span class="n">this</span> <span class="n">License</span><span class="p">,</span> <span class="n">without</span> <span class="n">any</span> <span class="n">additional</span> <span class="n">terms</span> <span class="ow">or</span> <span class="n">conditions</span><span class="o">.</span>
-      <span class="n">Notwithstanding</span> <span class="n">the</span> <span class="n">above</span><span class="p">,</span> <span class="n">nothing</span> <span class="n">herein</span> <span class="n">shall</span> <span class="n">supersede</span> <span class="ow">or</span> <span class="n">modify</span>
-      <span class="n">the</span> <span class="n">terms</span> <span class="n">of</span> <span class="n">any</span> <span class="n">separate</span> <span class="n">license</span> <span class="n">agreement</span> <span class="n">you</span> <span class="n">may</span> <span class="n">have</span> <span class="n">executed</span>
-      <span class="n">with</span> <span class="n">Licensor</span> <span class="n">regarding</span> <span class="n">such</span> <span class="n">Contributions</span><span class="o">.</span>
-
-   <span class="mi">6</span><span class="o">.</span> <span class="n">Trademarks</span><span class="o">.</span> <span class="n">This</span> <span class="n">License</span> <span class="n">does</span> <span class="ow">not</span> <span class="n">grant</span> <span class="n">permission</span> <span class="n">to</span> <span class="k">use</span> <span class="n">the</span> <span class="n">trade</span>
-      <span class="n">names</span><span class="p">,</span> <span class="n">trademarks</span><span class="p">,</span> <span class="n">service</span> <span class="n">marks</span><span class="p">,</span> <span class="ow">or</span> <span class="n">product</span> <span class="n">names</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Licensor</span><span class="p">,</span>
-      <span class="n">except</span> <span class="n">as</span> <span class="n">required</span> <span class="k">for</span> <span class="n">reasonable</span> <span class="ow">and</span> <span class="n">customary</span> <span class="k">use</span> <span class="n">in</span> <span class="n">describing</span> <span class="n">the</span>
-      <span class="n">origin</span> <span class="n">of</span> <span class="n">the</span> <span class="n">Work</span> <span class="ow">and</span> <span class="n">reproducing</span> <span class="n">the</span> <span class="n">content</span> <span class="n">of</span> <span class="n">the</span> <span class="n">NOTICE</span> <span class="n">file</span><span class="o">.</span>
-
-   <span class="mi">7</span><span class="o">.</span> <span class="n">Disclaimer</span> <span class="n">of</span> <span class="n">Warranty</span><span class="o">.</span> <span class="n">Unless</span> <span class="n">required</span> <span class="n">by</span> <span class="n">applicable</span> <span class="n">law</span> <span class="ow">or</span>
-      <span class="n">agreed</span> <span class="n">to</span> <span class="n">in</span> <span class="n">writing</span><span class="p">,</span> <span class="n">Licensor</span> <span class="n">provides</span> <span class="n">the</span> <span class="n">Work</span> <span class="p">(</span><span class="ow">and</span> <span class="nb">each</span>
-      <span class="n">Contributor</span> <span class="n">provides</span> <span class="n">its</span> <span class="n">Contributions</span><span class="p">)</span> <span class="n">on</span> <span class="n">an</span> <span class="s">&quot;AS IS&quot;</span> <span class="n">BASIS</span><span class="p">,</span>
-      <span class="n">WITHOUT</span> <span class="n">WARRANTIES</span> <span class="n">OR</span> <span class="n">CONDITIONS</span> <span class="n">OF</span> <span class="n">ANY</span> <span class="n">KIND</span><span class="p">,</span> <span class="n">either</span> <span class="n">express</span> <span class="ow">or</span>
-      <span class="n">implied</span><span class="p">,</span> <span class="n">including</span><span class="p">,</span> <span class="n">without</span> <span class="n">limitation</span><span class="p">,</span> <span class="n">any</span> <span class="n">warranties</span> <span class="ow">or</span> <span class="n">conditions</span>
-      <span class="n">of</span> <span class="n">TITLE</span><span class="p">,</span> <span class="n">NON</span><span class="o">-</span><span class="n">INFRINGEMENT</span><span class="p">,</span> <span class="n">MERCHANTABILITY</span><span class="p">,</span> <span class="ow">or</span> <span class="n">FITNESS</span> <span class="n">FOR</span> <span class="n">A</span>
-      <span class="n">PARTICULAR</span> <span class="n">PURPOSE</span><span class="o">.</span> <span class="n">You</span> <span class="n">are</span> <span class="n">solely</span> <span class="n">responsible</span> <span class="k">for</span> <span class="n">determining</span> <span class="n">the</span>
-      <span class="n">appropriateness</span> <span class="n">of</span> <span class="n">using</span> <span class="ow">or</span> <span class="n">redistributing</span> <span class="n">the</span> <span class="n">Work</span> <span class="ow">and</span> <span class="n">assume</span> <span class="n">any</span>
-      <span class="n">risks</span> <span class="n">associated</span> <span class="n">with</span> <span class="n">Your</span> <span class="n">exercise</span> <span class="n">of</span> <span class="n">permissions</span> <span class="n">under</span> <span class="n">this</span>
-</pre></div>
-
-
-<p>License.</p>
-<div class="codehilite"><pre>   <span class="mi">8</span><span class="o">.</span> <span class="n">Limitation</span> <span class="n">of</span> <span class="n">Liability</span><span class="o">.</span> <span class="n">In</span> <span class="nb">no</span> <span class="n">event</span> <span class="ow">and</span> <span class="n">under</span> <span class="nb">no</span> <span class="n">legal</span> <span class="n">theory</span><span class="p">,</span>
-      <span class="n">whether</span> <span class="n">in</span> <span class="n">tort</span> <span class="p">(</span><span class="n">including</span> <span class="n">negligence</span><span class="p">),</span> <span class="n">contract</span><span class="p">,</span> <span class="ow">or</span> <span class="n">otherwise</span><span class="p">,</span>
-      <span class="k">unless</span> <span class="n">required</span> <span class="n">by</span> <span class="n">applicable</span> <span class="n">law</span> <span class="p">(</span><span class="n">such</span> <span class="n">as</span> <span class="n">deliberate</span> <span class="ow">and</span> <span class="n">grossly</span>
-      <span class="n">negligent</span> <span class="n">acts</span><span class="p">)</span> <span class="ow">or</span> <span class="n">agreed</span> <span class="n">to</span> <span class="n">in</span> <span class="n">writing</span><span class="p">,</span> <span class="n">shall</span> <span class="n">any</span> <span class="n">Contributor</span> <span class="n">be</span>
-      <span class="n">liable</span> <span class="n">to</span> <span class="n">You</span> <span class="k">for</span> <span class="n">damages</span><span class="p">,</span> <span class="n">including</span> <span class="n">any</span> <span class="n">direct</span><span class="p">,</span> <span class="n">indirect</span><span class="p">,</span> <span class="n">special</span><span class="p">,</span>
-      <span class="n">incidental</span><span class="p">,</span> <span class="ow">or</span> <span class="n">consequential</span> <span class="n">damages</span> <span class="n">of</span> <span class="n">any</span> <span class="n">character</span> <span class="n">arising</span> <span class="n">as</span> <span class="n">a</span>
-      <span class="n">result</span> <span class="n">of</span> <span class="n">this</span> <span class="n">License</span> <span class="ow">or</span> <span class="n">out</span> <span class="n">of</span> <span class="n">the</span> <span class="k">use</span> <span class="ow">or</span> <span class="n">inability</span> <span class="n">to</span> <span class="k">use</span> <span class="n">the</span>
-      <span class="n">Work</span> <span class="p">(</span><span class="n">including</span> <span class="n">but</span> <span class="ow">not</span> <span class="n">limited</span> <span class="n">to</span> <span class="n">damages</span> <span class="k">for</span> <span class="n">loss</span> <span class="n">of</span> <span class="n">goodwill</span><span class="p">,</span>
-      <span class="n">work</span> <span class="n">stoppage</span><span class="p">,</span> <span class="n">computer</span> <span class="n">failure</span> <span class="ow">or</span> <span class="n">malfunction</span><span class="p">,</span> <span class="ow">or</span> <span class="n">any</span> <span class="ow">and</span> <span class="n">all</span>
-      <span class="n">other</span> <span class="n">commercial</span> <span class="n">damages</span> <span class="ow">or</span> <span class="n">losses</span><span class="p">),</span> <span class="n">even</span> <span class="k">if</span> <span class="n">such</span> <span class="n">Contributor</span>
-      <span class="n">has</span> <span class="n">been</span> <span class="n">advised</span> <span class="n">of</span> <span class="n">the</span> <span class="n">possibility</span> <span class="n">of</span> <span class="n">such</span> <span class="n">damages</span><span class="o">.</span>
-
-   <span class="mi">9</span><span class="o">.</span> <span class="n">Accepting</span> <span class="n">Warranty</span> <span class="ow">or</span> <span class="n">Additional</span> <span class="n">Liability</span><span class="o">.</span> <span class="n">While</span> <span class="n">redistributing</span>
-      <span class="n">the</span> <span class="n">Work</span> <span class="ow">or</span> <span class="n">Derivative</span> <span class="n">Works</span> <span class="n">thereof</span><span class="p">,</span> <span class="n">You</span> <span class="n">may</span> <span class="n">choose</span> <span class="n">to</span> <span class="n">offer</span><span class="p">,</span>
-      <span class="ow">and</span> <span class="n">charge</span> <span class="n">a</span> <span class="n">fee</span> <span class="k">for</span><span class="p">,</span> <span class="n">acceptance</span> <span class="n">of</span> <span class="n">support</span><span class="p">,</span> <span class="n">warranty</span><span class="p">,</span> <span class="n">indemnity</span><span class="p">,</span>
-      <span class="ow">or</span> <span class="n">other</span> <span class="n">liability</span> <span class="n">obligations</span> <span class="ow">and</span><span class="o">/</span><span class="ow">or</span> <span class="n">rights</span> <span class="n">consistent</span> <span class="n">with</span> <span class="n">this</span>
-      <span class="n">License</span><span class="o">.</span> <span class="n">However</span><span class="p">,</span> <span class="n">in</span> <span class="n">accepting</span> <span class="n">such</span> <span class="n">obligations</span><span class="p">,</span> <span class="n">You</span> <span class="n">may</span> <span class="n">act</span> <span class="n">only</span>
-      <span class="n">on</span> <span class="n">Your</span> <span class="n">own</span> <span class="n">behalf</span> <span class="ow">and</span> <span class="n">on</span> <span class="n">Your</span> <span class="n">sole</span> <span class="n">responsibility</span><span class="p">,</span> <span class="ow">not</span> <span class="n">on</span> <span class="n">behalf</span>
-      <span class="n">of</span> <span class="n">any</span> <span class="n">other</span> <span class="n">Contributor</span><span class="p">,</span> <span class="ow">and</span> <span class="n">only</span> <span class="k">if</span> <span class="n">You</span> <span class="n">agree</span> <span class="n">to</span> <span class="n">indemnify</span><span class="p">,</span>
-      <span class="n">defend</span><span class="p">,</span> <span class="ow">and</span> <span class="n">hold</span> <span class="nb">each</span> <span class="n">Contributor</span> <span class="n">harmless</span> <span class="k">for</span> <span class="n">any</span> <span class="n">liability</span>
-      <span class="n">incurred</span> <span class="n">by</span><span class="p">,</span> <span class="ow">or</span> <span class="n">claims</span> <span class="n">asserted</span> <span class="n">against</span><span class="p">,</span> <span class="n">such</span> <span class="n">Contributor</span> <span class="n">by</span> <span class="n">reason</span>
-      <span class="n">of</span> <span class="n">your</span> <span class="n">accepting</span> <span class="n">any</span> <span class="n">such</span> <span class="n">warranty</span> <span class="ow">or</span> <span class="n">additional</span> <span class="n">liability</span><span class="o">.</span>
-
-   <span class="k">END</span> <span class="n">OF</span> <span class="n">TERMS</span> <span class="n">AND</span> <span class="n">CONDITIONS</span>
-
-   <span class="n">APPENDIX:</span> <span class="n">How</span> <span class="n">to</span> <span class="n">apply</span> <span class="n">the</span> <span class="n">Apache</span> <span class="n">License</span> <span class="n">to</span> <span class="n">your</span> <span class="n">work</span><span class="o">.</span>
-
-      <span class="n">To</span> <span class="n">apply</span> <span class="n">the</span> <span class="n">Apache</span> <span class="n">License</span> <span class="n">to</span> <span class="n">your</span> <span class="n">work</span><span class="p">,</span> <span class="n">attach</span> <span class="n">the</span> <span class="n">following</span>
-      <span class="n">boilerplate</span> <span class="n">notice</span><span class="p">,</span> <span class="n">with</span> <span class="n">the</span> <span class="n">fields</span> <span class="n">enclosed</span> <span class="n">by</span> <span class="n">brackets</span> <span class="err">&quot;</span><span class="o">[]</span>
-</pre></div>
-
-
-<p>"
-          replaced with your own identifying information. (Don't include
-          the brackets!)  The text should be enclosed in the appropriate
-          comment syntax for the file format. We also recommend that a
-          file or class name and description of purpose be included on the
-          same "printed page" as the copyright notice for easier
-          identification within third-party archives.</p>
-<div class="codehilite"><pre>   <span class="n">Copyright</span> <span class="p">[</span><span class="n">yyyy</span><span class="p">]</span>
-</pre></div>
-
-
-<p>[name of copyright owner]</p>
-<div class="codehilite"><pre>   <span class="n">Licensed</span> <span class="n">under</span> <span class="n">the</span> <span class="n">Apache</span> <span class="n">License</span><span class="p">,</span> <span class="n">Version</span> <span class="mf">2.0</span> <span class="p">(</span><span class="n">the</span> <span class="s">&quot;License&quot;</span><span class="p">);</span>
-   <span class="n">you</span> <span class="n">may</span> <span class="ow">not</span> <span class="k">use</span> <span class="n">this</span> <span class="n">file</span> <span class="n">except</span> <span class="n">in</span> <span class="n">compliance</span> <span class="n">with</span> <span class="n">the</span> <span class="n">License</span><span class="o">.</span>
-   <span class="n">You</span> <span class="n">may</span> <span class="n">obtain</span> <span class="n">a</span> <span class="n">copy</span> <span class="n">of</span> <span class="n">the</span> <span class="n">License</span> <span class="n">at</span>
-
-       <span class="n">http:</span><span class="sr">//</span><span class="n">www</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/licenses/</span><span class="n">LICENSE</span><span class="o">-</span><span class="mf">2.0</span>
-
-   <span class="n">Unless</span> <span class="n">required</span> <span class="n">by</span> <span class="n">applicable</span> <span class="n">law</span> <span class="ow">or</span> <span class="n">agreed</span> <span class="n">to</span> <span class="n">in</span> <span class="n">writing</span><span class="p">,</span> <span class="n">software</span>
-   <span class="n">distributed</span> <span class="n">under</span> <span class="n">the</span> <span class="n">License</span> <span class="n">is</span> <span class="n">distributed</span> <span class="n">on</span> <span class="n">an</span> <span class="s">&quot;AS IS&quot;</span> <span class="n">BASIS</span><span class="p">,</span>
-   <span class="n">WITHOUT</span> <span class="n">WARRANTIES</span> <span class="n">OR</span> <span class="n">CONDITIONS</span> <span class="n">OF</span> <span class="n">ANY</span> <span class="n">KIND</span><span class="p">,</span> <span class="n">either</span> <span class="n">express</span> <span class="ow">or</span> <span class="n">implied</span><span class="o">.</span>
-   <span class="n">See</span> <span class="n">the</span> <span class="n">License</span> <span class="k">for</span> <span class="n">the</span> <span class="n">specific</span> <span class="n">language</span> <span class="n">governing</span> <span class="n">permissions</span> <span class="ow">and</span>
-   <span class="n">limitations</span> <span class="n">under</span> <span class="n">the</span> <span class="n">License</span><span class="o">.</span>
-</pre></div>
-      </div>
     
         <div class="trademarkFooter"> 
 		Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.

Modified: websites/staging/sling/trunk/content/project-team.html
==============================================================================
--- websites/staging/sling/trunk/content/project-team.html (original)
+++ websites/staging/sling/trunk/content/project-team.html Sun Apr 22 17:09:56 2012
@@ -79,12 +79,10 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-		(TODO: breadcrumb here)
-      </div>
-      <h1 class="title">Project Team</h1>
-      <div>
-	    
+<a href="/">Home</a>
       </div>
+   <!--   <h1 class="title">Project Team</h1> -->
+
     
         <div class="trademarkFooter"> 
 		Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.

Modified: websites/staging/sling/trunk/content/release-management.html
==============================================================================
--- websites/staging/sling/trunk/content/release-management.html (original)
+++ websites/staging/sling/trunk/content/release-management.html Sun Apr 22 17:09:56 2012
@@ -79,543 +79,10 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-		(TODO: breadcrumb here)
+<a href="/">Home</a>
       </div>
-      <h1 class="title">Release Management</h1>
-      <div>
-	    <p><a name="ReleaseManagement-ReleaseManagement"></a></p>
-<h1 id="release-management">Release Management</h1>
-<p>Sling releases (and SNAPSHOTS) are deployed to the <a href="http://repository.apache.org">Nexus repository</a>
- instead of the traditional deployment via the Maven 2 mirros source on
-<em>people.apache.org</em>. This makes the release process much leaner and
-simpler. In addtion we can benefit from the Apache Parent POM 6, which has
-most of the release profile setup built-in.</p>
-<p>Most of the hard work of preparing and deploying the release is done by
-Maven.</p>
-<p>{toc:minLevel=2}</p>
-<p><a name="ReleaseManagement-Prerequisites"></a></p>
-<h2 id="prerequisites">Prerequisites</h2>
-<ul>
-<li>To prepare or perform a release you <em>MUST BE</em> at least be an Apache Sling
-Committer.</li>
-<li>Each and every release must be signed; therefore the public key should be
-cross signed by other Apache committers (not required but suggested) and
-this public key should be added to <a href="http://www.apache.org/dist/sling/KEYS">http://www.apache.org/dist/sling/KEYS</a>
- and either on pool.sks-keyservers.net or pgp.mit.edu (See Appendix A)</li>
-<li>When preparing the release on Mac OS X, check out Appendix B before
-trying the steps in the next chapter.</li>
-<li>Make sure you have all Apache servers defined in your <a href="http://maven.apache.org/developers/committer-settings.html">settings.xml</a></li>
-</ul>
-<p><em>Note</em>: Listing the Apache servers in the <em>settings.xml</em> file also
-requires adding the password to that file. Starting with Maven 2.1 this
-password may be encrypted and needs not be give in plaintext. Please refer
-to <a href="http://maven.apache.org/guides/mini/guide-encryption.html">Password Encryption</a>
- for more information.</p>
-<p>In the past we staged release candidates on our local machines using a
-semi-manual process. Now that we inherit from the Apache parent POM version
-6, a repository manager will automatically handle staging for you. This
-means you now only need to specify your GPG passphrase in the release
-profile of your <em>${user.home}/.m2/settings.xml</em>:</p>
-<div class="codehilite"><pre><span class="nt">&lt;settings&gt;</span>
-    ...
-    <span class="nt">&lt;profiles&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="nt">&lt;properties&gt;</span>
-        <span class="nt">&lt;gpg.passphrase&gt;</span> <span class="c">&lt;!-- YOUR KEY PASSPHRASE --&gt;</span>
-</pre></div>
+   <!--   <h1 class="title">Release Management</h1> -->
 
-
-<p></gpg.passphrase>
-            </properties>
-        </profile>
-        </profiles>
-        ...
-    </settings></p>
-<p>Everything else has been configured in the latest Sling Parent POM:</p>
-<div class="codehilite"><pre><span class="nt">&lt;parent&gt;</span>
-    <span class="nt">&lt;groupId&gt;</span>org.apache.sling<span class="nt">&lt;/groupId&gt;</span>
-    <span class="nt">&lt;artifactId&gt;</span>sling<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;version&gt;</span>6<span class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/parent&gt;</span>
-</pre></div>
-
-
-<p><a name="ReleaseManagement-StagingtheReleaseCandidates"></a></p>
-<h2 id="staging-the-release-candidates">Staging the Release Candidates</h2>
-<p>First prepare your POMs for release:</p>
-<ol>
-<li>Make sure there are no snapshots in the POMs to be released</li>
-<li>
-<p>Check that your POMs will not lose content when they are rewritten during
-the release process</p>
-<p>$ mvn release:prepare -DdryRun=true</p>
-</li>
-</ol>
-<p>Compare the original <em>pom.xml</em> with the one called <em>pom.xml.tag</em> to see
-if the license or any other info has been removed. This has been known to
-happen if the starting <em><project></em> tag is not on a single line. The only
-things that should be different between these files are the <em><version></em>
-and <em><scm></em> elements. If there are any other changes, you must fix the
-original <em>pom.xml</em> file and commit before proceeding with the release.
-1. Publish a snapshot</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">mvn</span> <span class="n">deploy</span>
-<span class="o">...</span>
-<span class="p">[</span><span class="n">INFO</span><span class="p">]</span>
-</pre></div>
-
-
-<p>[deploy:deploy]
-    [INFO]
- Retrieving previous build number from apache.snapshots.https
-    ...</p>
-<ol>
-<li>
-<ul>
-<li>If you experience an error during deployment like a HTTP 401 check your
-settings for the required server entries as outlined in the <em>Prerequisites</em></li>
-</ul>
-</li>
-<li>
-<ul>
-<li>
-<dl>
-<dt>Be sure that the generated artifacts respect the Apache release <a href="http://www.apache.org/dev/release.html">rules</a></dt>
-<dd>NOTICE and LICENSE files should be present in the META-INF directory
-within the jar. For -sources artifacts, be sure that your POM does not use
-the maven-source-plugin:2.0.3 which is broken. The recommended version at
-this time is 2.0.4</dd>
-</dl>
-</li>
-</ul>
-</li>
-<li>
-<ul>
-<li>You should verify the deployment under the <a href="https://repository.apache.org/content/groups/snapshots/org/apache/sling">snapshot</a>
- repository on Apache</li>
-</ul>
-</li>
-<li>
-<p>Prepare the release</p>
-<p>$ mvn release:clean
-$ mvn release:prepare</p>
-</li>
-<li>
-<ul>
-<li>Preparing the release will create the new tag in SVN, automatically
-checking in on your behalf</li>
-</ul>
-</li>
-<li>
-<ul>
-<li>If you get a build failure because of an SVN commit problem (namely <em>The
-specified baseline is not the latest baseline, so it may not be checked
-out.</em>), just repeat the <em>mvn release:prepare</em> command until SVN is happy.
-This is based on a known timing issue when using the European SVN mirror.</li>
-</ul>
-</li>
-<li>
-<p>Stage the release for a vote</p>
-<p>$ mvn release:perform</p>
-</li>
-<li>
-<ul>
-<li>The release will automatically be inserted into a temporary staging
-repository for you, see the Nexus <a href="http://www.sonatype.com/books/nexus-book/reference/staging.html">staging documentation</a>
- for full details</li>
-</ul>
-</li>
-<li>
-<ul>
-<li>You can continue to use <em>mvn release:prepare</em> and {{mvn
-release:perform}} on other sub-projects as necessary on the same machine
-and they will be combined in the same staging repository - this is useful
-when making a release of multiple Sling modules.</li>
-</ul>
-</li>
-<li>Close the staging repository</li>
-<li>
-<ul>
-<li>Login to <a href="https://repository.apache.org">https://repository.apache.org</a>
- using your Apache SVN credentials. Click on <em>Staging</em> on the left. Then
-click on <em>org.apache.sling</em> in the list of repositories. In the panel below
-you should see an open repository that is linked to your username and IP.
-Right click on this repository and select <em>Close</em>. This will close the
-repository from future deployments and make it available for others to
-view. If you are staging multiple releases together, skip this step until
-you have staged everything</li>
-</ul>
-</li>
-<li>Verify the staged artifacts</li>
-<li>
-<ul>
-<li>If you click on your repository, a tree view will appear below. You can
-then browse the contents to ensure the artifacts are as you expect them.
-Pay particular attention to the existence of *.asc (signature) files. If
-you don't like the content of the repository, right click your repository
-and choose <em>Drop</em>. You can then rollback your release (see <em>Canceling the
-Release</em>) and repeat the process</li>
-</ul>
-</li>
-<li>
-<ul>
-<li>Note the staging repository URL (especially the number at the end of the
-URL) you will need this in your vote email</li>
-</ul>
-</li>
-</ol>
-<p><a name="ReleaseManagement-StartingtheVote"></a></p>
-<h2 id="starting-the-vote">Starting the Vote</h2>
-<p>Propose a vote on the dev list with the closed issues, the issues left, and
-the staging repository - for example:</p>
-<div class="codehilite"><pre><span class="n">To:</span> <span class="s">&quot;Sling Developers List&quot;</span> <span class="sr">&lt;dev@sling.apache.org&gt;</span>
-<span class="n">Subject:</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span>
-</pre></div>
-
-
-<p>Release Apache Sling ABC version X.Y.Z</p>
-<div class="codehilite"><pre><span class="n">Hi</span><span class="p">,</span>
-
-<span class="n">We</span> <span class="n">solved</span> <span class="n">N</span> <span class="n">issues</span> <span class="n">in</span> <span class="n">this</span> <span class="n">release:</span>
-<span class="n">https:</span><span class="sr">//iss</span><span class="n">ues</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/jira/</span><span class="n">browse</span><span class="sr">/SLING/</span><span class="n">fixforversion</span><span class="o">/...</span>
-
-<span class="n">There</span> <span class="n">are</span> <span class="n">still</span> <span class="n">some</span> <span class="n">outstanding</span> <span class="n">issues:</span>
-<span class="n">https:</span><span class="sr">//iss</span><span class="n">ues</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/jira/</span><span class="n">browse</span><span class="sr">/SLING/com</span><span class="n">ponent</span><span class="o">/...</span>
-
-<span class="n">Staging</span> <span class="n">repository:</span>
-<span class="n">https:</span><span class="sr">//</span><span class="n">repository</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/content/</span><span class="n">repositories</span><span class="o">/</span><span class="n">orgapachesling</span><span class="o">-</span><span class="p">[</span><span class="n">YOUR</span> <span class="n">REPOSITORY</span> <span class="n">ID</span><span class="p">]</span>
-</pre></div>
-
-
-<p>/</p>
-<div class="codehilite"><pre><span class="n">You</span> <span class="n">can</span> <span class="k">use</span> <span class="n">this</span> <span class="n">UNIX</span> <span class="n">script</span> <span class="n">to</span> <span class="n">download</span> <span class="n">the</span> <span class="n">release</span> <span class="ow">and</span> <span class="n">verify</span> <span class="n">the</span>
-</pre></div>
-
-
-<p>signatures:
-    http://svn.apache.org/repos/asf/sling/trunk/check_staged_release.sh</p>
-<div class="codehilite"><pre><span class="err">Usage:</span>
-<span class="err">sh</span> <span class="err">check_staged_release.sh</span> <span class="err">[YOUR</span> <span class="err">REPOSITORY</span> <span class="err">ID]</span>
-</pre></div>
-
-
-<p>/tmp/sling-staging</p>
-<div class="codehilite"><pre><span class="n">Please</span> <span class="n">vote</span> <span class="n">to</span> <span class="n">approve</span> <span class="n">this</span> <span class="n">release:</span>
-
- <span class="p">[</span> <span class="p">]</span>
-</pre></div>
-
-
-<p>+1 Approve the release
-     [ ]
-  0 Don't care
-     [ ]
- -1 Don't release, because ...</p>
-<div class="codehilite"><pre><span class="n">This</span> <span class="n">vote</span> <span class="n">will</span> <span class="n">be</span> <span class="nb">open</span> <span class="k">for</span> <span class="mi">72</span> <span class="n">hours</span><span class="o">.</span>
-</pre></div>
-
-
-<p><a name="ReleaseManagement-WaitfortheResults"></a></p>
-<h2 id="wait-for-the-results">Wait for the Results</h2>
-<p>From <a href="http://www.apache.org/foundation/voting.html">Votes on Package Releases</a>
-:</p>
-<p>{quote}Votes on whether a package is ready to be released follow a format
-similar to majority approval -- except that the decision is officially
-determined solely by whether at least three +1 votes were registered.
-Releases may not be vetoed. Generally the community will table the vote to
-release if anyone identifies serious problems, but in most cases the
-ultimate decision, once three or more positive votes have been garnered,
-lies with the individual serving as release manager. The specifics of the
-process may vary from project to project, but the 'minimum of three +1
-votes' rule is universal.{quote}</p>
-<p>The list of binding voters is available on the <a href="project-team.html">Project Team</a>
- page.</p>
-<p>If the vote is successful, post the result to the dev list - for example:</p>
-<div class="codehilite"><pre><span class="n">To:</span> <span class="s">&quot;Sling Developers List&quot;</span> <span class="sr">&lt;dev@sling.apache.org&gt;</span>
-<span class="n">Subject:</span> <span class="p">[</span><span class="n">RESULT</span><span class="p">]</span>
-</pre></div>
-
-
-<p>[VOTE]
- Release Apache Sling ABC version X.Y.Z</p>
-<div class="codehilite"><pre><span class="n">Hi</span><span class="p">,</span>
-
-<span class="n">The</span> <span class="n">vote</span> <span class="n">has</span> <span class="n">passed</span> <span class="n">with</span> <span class="n">the</span> <span class="n">following</span> <span class="n">result</span> <span class="p">:</span>
-
-<span class="o">+</span><span class="mi">1</span> <span class="p">(</span><span class="n">binding</span><span class="p">):</span> <span class="o">&lt;&lt;</span><span class="n">list</span> <span class="n">of</span> <span class="n">names</span><span class="o">&gt;&gt;</span>
-<span class="o">+</span><span class="mi">1</span> <span class="p">(</span><span class="n">non</span> <span class="n">binding</span><span class="p">):</span> <span class="o">&lt;&lt;</span><span class="n">list</span> <span class="n">of</span> <span class="n">names</span><span class="o">&gt;&gt;</span>
-
-<span class="n">I</span> <span class="n">will</span> <span class="n">copy</span> <span class="n">this</span> <span class="n">release</span> <span class="n">to</span> <span class="n">the</span> <span class="n">Sling</span> <span class="n">dist</span> <span class="n">directory</span> <span class="ow">and</span>
-<span class="n">promote</span> <span class="n">the</span> <span class="n">artifacts</span> <span class="n">to</span> <span class="n">the</span> <span class="n">central</span> <span class="n">Maven</span> <span class="n">repository</span><span class="o">.</span>
-</pre></div>
-
-
-<p>Be sure to include all votes in the list and indicate which votes were
-binding. Consider -1 votes very carefully. While there is technically no
-veto on release votes, there may be reasons for people to vote -1. So
-sometimes it may be better to cancel a release when someone, especially a
-member of the PMC, votes -1.</p>
-<p>If the vote is unsuccessful, you need to fix the issues and restart the
-process - see <em>Canceling the Release</em>.</p>
-<p>If the vote is successful, you need to promote and distribute the release -
-see <em>Promoting the Release</em>.</p>
-<p><a name="ReleaseManagement-CancelingtheRelease"></a></p>
-<h2 id="canceling-the-release">Canceling the Release</h2>
-<p>If the vote fails, or you decide to redo the release:</p>
-<ol>
-<li>Remove the release tag from Subversion (<em>svn del ...</em>)</li>
-<li>Login to <a href="https://repository.apache.org">https://repository.apache.org</a>
- using your Apache SVN credentials. Click on <em>Staging</em> on the left. Then
-click on <em>org.apache.sling</em> in the list of repositories. In the panel below
-you should see a closed repository that is linked to your username and IP
-(if it's not yet closed you need to right click and select <em>Close</em>). Right
-click on this repository and select <em>Drop</em>.</li>
-<li>Rollback the version in the <em>pom.xml</em> and commit any fixes you need to
-make</li>
-</ol>
-<p><a name="ReleaseManagement-PromotingtheRelease"></a></p>
-<h2 id="promoting-the-release">Promoting the Release</h2>
-<p>If the vote passes:</p>
-<ol>
-<li>Copy the released artifacts to the Sling dist directory
-(<em>/x1/www/www.apache.org/dist/sling</em>) on <em>people.apache.org</em>. This
-folder is replicated to <a href="http://www.apache.org/dist/sling/">http://www.apache.org/dist/sling/</a>
- a few times a day.</li>
-<li>Delete the old release from the Sling dist directory (it's archived)</li>
-<li>Login to <a href="https://repository.apache.org">https://repository.apache.org</a>
- with your Apache SVN credentials. Click on <em>Staging</em>. Find your closed
-staging repository and select it by checking the select box. Select the
-<em>Releases</em> repository from the drop-down list and click <em>Release</em> from the
-menu above.</li>
-<li>Once the release is promoted click on <em>Repositories</em>, select the
-<em>Releases</em> repository and validate that your artifacts are all there.</li>
-<li>If you're releasing bundles, you should also add them to the Sling
-Release OBR (see <em>Appendix C</em>).</li>
-<li>Update the news section on the website at <a href="news.html">news</a>
-.</li>
-<li>Update the download page on the website at <a href="downloads.html">downloads</a>
- to point to the new release.</li>
-</ol>
-<p>For the last two tasks, it's better to give the mirrors some time to
-distribute the uploaded artifacts (one day should be fine). This ensures
-that once the website (news and download page) is updated, people can
-actually download the artifacts.</p>
-<p><a name="ReleaseManagement-UpdateJIRA"></a></p>
-<h2 id="update-jira">Update JIRA</h2>
-<p>Go to <a href="https://issues.apache.org/jira/plugins/servlet/project-config/SLING/versions">Manage Versions</a>
- section on the SLING JIRA and mark the X.Y.Z version as released setting
-the release date to the date the vote has been closed.</p>
-<p>Also create a new version X.Y.Z+2, if that hasn't already been done.</p>
-<p><a name="ReleaseManagement-CreateanAnnouncement"></a></p>
-<h2 id="create-an-announcement">Create an Announcement</h2>
-<div class="codehilite"><pre><span class="n">To:</span> <span class="s">&quot;Sling Developers List&quot;</span> <span class="sr">&lt;dev@sling.apache.org&gt;</span><span class="p">,</span> <span class="s">&quot;Apache Announcements&quot;</span>
-</pre></div>
-
-
-<p><a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#97;&#110;&#110;&#111;&#117;&#110;&#99;&#101;&#64;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#97;&#110;&#110;&#111;&#117;&#110;&#99;&#101;&#64;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>
-    Subject: [ANN]
- Apache Sling ABC version X.Y.Z Released</p>
-<div class="codehilite"><pre><span class="n">The</span> <span class="n">Apache</span> <span class="n">Sling</span> <span class="n">team</span> <span class="n">is</span> <span class="n">pleased</span> <span class="n">to</span> <span class="n">announce</span> <span class="n">the</span> <span class="n">release</span> <span class="n">of</span> <span class="n">Apache</span> <span class="n">Sling</span>
-</pre></div>
-
-
-<p>ABC version X.Y.Z</p>
-<div class="codehilite"><pre><span class="n">Apache</span> <span class="n">Sling</span> <span class="n">is</span> <span class="n">a</span> <span class="n">web</span> <span class="n">framework</span> <span class="n">that</span> <span class="n">uses</span> <span class="n">a</span> <span class="n">Java</span> <span class="n">Content</span> <span class="n">Repository</span><span class="p">,</span> <span class="n">such</span>
-</pre></div>
-
-
-<p>as Apache Jackrabbit, to store and manage content. Sling applications use
-either scripts or Java servlets, selected based on simple name conventions,
-to process HTTP requests in a RESTful way.</p>
-<div class="codehilite"><pre><span class="o">&lt;&lt;</span><span class="n">insert</span> <span class="n">short</span> <span class="n">description</span> <span class="n">of</span> <span class="n">the</span> <span class="n">sub</span><span class="o">-</span><span class="n">project</span><span class="o">&gt;&gt;</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">/site/</span><span class="n">apache</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">ABC</span><span class="o">.</span><span class="n">html</span>
-
-<span class="n">This</span> <span class="n">release</span> <span class="n">is</span> <span class="n">available</span> <span class="n">from</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">/site/</span><span class="n">downloads</span><span class="o">.</span><span class="n">cgi</span>
-</pre></div>
-
-
-<p>and Maven:</p>
-<div class="codehilite"><pre><span class="nt">&lt;dependency&gt;</span>
-    <span class="nt">&lt;groupId&gt;</span>org.apache.sling<span class="nt">&lt;/groupId&gt;</span>
-    <span class="nt">&lt;artifactId&gt;</span>org.apache.sling.ABC<span class="nt">&lt;/artifactId&gt;</span>
-    <span class="nt">&lt;version&gt;</span>X.Y.Z<span class="nt">&lt;/version&gt;</span>
-<span class="nt">&lt;/dependency&gt;</span>
-
-Release Notes:
-
-<span class="err">&lt;</span><span class="nt">&lt;insert</span> <span class="err">release</span> <span class="err">notes</span> <span class="err">in</span> <span class="err">text</span> <span class="err">format</span> <span class="err">from</span> <span class="err">JIRA</span><span class="nt">&gt;</span>&gt;
-
-Enjoy!
-
--The Sling team
-</pre></div>
-
-
-<p><em>Important</em>: Add the release to the Software section of the next board
-report below <a href="https://cwiki.apache.org/confluence/display/SLING/Reports">Reports</a>
-.</p>
-<p><a name="ReleaseManagement-RelatedLinks"></a></p>
-<h2 id="related-links">Related Links</h2>
-<ol>
-<li><a href="http://www.apache.org/dev/release-signing.html">http://www.apache.org/dev/release-signing.html</a></li>
-<li><a href="http://wiki.apache.org/incubator/SigningReleases">http://wiki.apache.org/incubator/SigningReleases</a></li>
-</ol>
-<p><a name="ReleaseManagement-AppendixA:CreateandAddyourkeyto<a href="http://www.apache.org/dist/sling/KEYS">http://www.apache.org/dist/sling/KEYS</a>"></a></p>
-<h2 id="appendix-a-create-and-add-your-key-to-httpwwwapacheorgdistslingkeys">Appendix A: Create and Add your key to [http://www.apache.org/dist/sling/KEYS]</h2>
-<p>Considering that you are using a *nix system with a working OpenSSH,
-GnuPG, and bash you can create and add your own key with the following
-command:</p>
-<ol>
-<li>
-<p><em>Create a public/private pair key</em>:</p>
-<p>$ gpg --gen-key</p>
-</li>
-</ol>
-<p>When gpg asks for e-mail linked the key you <em>MUST USE</em> the
-<committer>@apache.org one
-When gpg asks for comment linked the key you <em>SHOULD USE</em> "CODE SIGNING
-KEY"
-1. <em>Add the key to</em> <a href="http://www.apache.org/dist/sling/KEYS:">http://www.apache.org/dist/sling/KEYS:</a>
- type the following command replacing the word e-mail with your Apache's
-one (<committer>@apache.org).</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="err">(</span><span class="nv">gpg</span> <span class="o">--</span><span class="n">list</span><span class="o">-</span><span class="n">sigs</span> <span class="n">e</span><span class="o">-</span><span class="n">mail</span> <span class="o">&amp;&amp;</span> <span class="n">gpg</span> <span class="o">--</span><span class="n">export</span> <span class="o">--</span><span class="n">armor</span> <span class="n">e</span><span class="o">-</span><span class="n">mail</span><span class="p">)</span> <span class="o">&gt;</span> <span class="n">toadd</span><span class="o">.</span><span class="n">key</span>
-<span class="nv">$</span> <span class="nv">scp</span> <span class="n">toadd</span><span class="o">.</span><span class="n">key</span> <span class="n">people</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org:</span>
-<span class="nv">$</span> <span class="nv">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="err">&quot;</span><span class="n">cat</span> <span class="n">toadd</span><span class="o">.</span><span class="n">key</span> <span class="o">&gt;&gt;</span>
-</pre></div>
-
-
-<p>/x1/www/www.apache.org/dist/sling/KEYS"</p>
-<ol>
-<li>You are <em>DONE</em>, but to see the changes on <a href="http://www.apache.org/dist/sling/KEYS">http://www.apache.org/dist/sling/KEYS</a>
- you must wait 2 hours</li>
-</ol>
-<p>You also have to add your public key either on pool.sks-keyservers.net or
-pgp.mit.edu (for the statging repository).</p>
-<p><a name="ReleaseManagement-AppendixB:preparingreleasesonMacOSX"></a></p>
-<h2 id="appendix-b-preparing-releases-on-mac-os-x">Appendix B: preparing releases on Mac OS X</h2>
-<p>When running the <em>mvn release:prepare</em> command on Mac OS X, you might see
-the following error:</p>
-<div class="codehilite"><pre><span class="p">[</span><span class="n">INFO</span><span class="p">]</span>
-</pre></div>
-
-
-<p>Working directory: /homedir/dev/sling/dependencymanager
-    [INFO]</p>
-<hr />
-<div class="codehilite"><pre><span class="p">[</span><span class="n">ERROR</span><span class="p">]</span>
-</pre></div>
-
-
-<p>BUILD FAILURE
-    [INFO]</p>
-<hr />
-<div class="codehilite"><pre><span class="p">[</span><span class="n">INFO</span><span class="p">]</span>
-</pre></div>
-
-
-<p>Unable to commit files
-    Provider message:
-    The svn command failed.
-    Command output:
-    svn: Commit failed (details follow):
-    svn: MKACTIVITY of
-'/repos/asf/!svn/act/4f11ad5d-9161-0410-b4dd-cb727141ea8c': authorization
-failed (https://svn.apache.org){code}</p>
-<div class="codehilite"><pre><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>
-</pre></div>
-
-
-<p>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>
-<div class="codehilite"><pre><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>
-</pre></div>
-
-
-<p>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>
-<div class="codehilite"><pre><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>
-</pre></div>
-
-
-<p>prepares the bundle descriptor to be added to the OBR file. Follow these
-steps to update the OBR:</p>
-<div class="codehilite"><pre><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="p">{{</span><span class="n">https</span><span class="p">}}</span> <span class="n">URL</span><span class="p">,</span> <span class="n">otherwise</span>
-</pre></div>
-
-
-<p>you will not be able to commit the changes later.</p>
-<div class="codehilite"><pre><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>
-</pre></div>
-
-
-<p>and run maven</p>
-<p>$ svn checkout http://svn.apache.org/repos/asf/sling/tags/the_module_tag
-$ mvn clean install \
-    org.apache.felix:maven-bundle-plugin:deploy \
-    -DprefixUrl=http://repo1.maven.org/maven2 \
-    -DremoteOBR=sling.xml \</p>
-<p>-DaltDeploymentRepository=apache.releases::default::file:///path_to_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="p">{{</span><span class="n">sling</span><span class="o">.</span><span class="n">xml</span><span class="p">}}</span> <span class="n">file</span>
-</pre></div>
-
-
-<p>of your site checkout.</p>
-<div class="codehilite"><pre><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>
-</pre></div>
-
-
-<p>the {{deploy-file}} goal of the Maven Bundle Plugin:</p>
-<p>$ wget
-http://repo1.maven.org/maven2/org/apache/sling/the_module/version/the_module-version.jar
-$ wget
-http://repo1.maven.org/maven2/org/apache/sling/the_module/version/the_module-version.pom
-$ mvn org.apache.felix:maven-bundle-plugin:deploy-file \
-    -Dfile=the_module-version.jar -DpomFile=the_module-version.pom \</p>
-<p>-DbundleUrl=http://repo1.maven.org/maven2/org/apache/sling/the_module/version/the_module-version.jar
-\
-    -Durl=file:///path_to_site_checkout/obr \
-    -DprefixUrl=http://repo1.maven.org/maven2 \
-    -DremoteOBR=sling.xml
-$ rm the_module-version.jar the_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="p">{{</span><span class="n">obr</span><span class="o">/</span><span class="n">sling</span><span class="o">.</span><span class="n">xml</span><span class="p">}}</span>
-</pre></div>
-
-
-<p>files (you may also review the changes using the {{svn diff}} command).</p>
-<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="o">*</span><span class="p">}</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="p">{</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>
-</pre></div>
-
-
-<p>getting mirrored to the web servers on {{people.apache.org}}</p>
-<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>
-</pre></div>
-
-
-<p>the changes are visible on the web.</p>
-      </div>
     
         <div class="trademarkFooter"> 
 		Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.